From 142f8f4b1e7f75aadae7df54ffd5f0a384bd70c0 Mon Sep 17 00:00:00 2001
From: Andy Sawyer <git@pureabstract.org>
Date: Mon, 1 Sep 2014 17:24:10 +0100
Subject: [PATCH] SelfTest: Build as C++11, add EnumToString tests

Note: EnumToString tests currently fail - haven't made the changes to
catch_tostring yet.
---
 projects/SelfTest/EnumToString.cpp | 71 ++++++++++++++++++++++++++++++
 projects/SelfTest/makefile         |  5 ++-
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 projects/SelfTest/EnumToString.cpp

diff --git a/projects/SelfTest/EnumToString.cpp b/projects/SelfTest/EnumToString.cpp
new file mode 100644
index 00000000..53738028
--- /dev/null
+++ b/projects/SelfTest/EnumToString.cpp
@@ -0,0 +1,71 @@
+#include "catch.hpp"
+
+/*
+  TODO: maybe ought to check that user-provided specialisations of
+ Catch::toString also do the right thing
+*/
+
+// Enum without user-provided stream operator
+enum Enum1 { Enum1Value0, Enum1Value1 };
+
+TEST_CASE( "toString(enum)", "[toString][enum]" )
+{
+    Enum1 e0 = Enum1Value0;
+    CHECK( Catch::toString(e0) == "0" );
+    Enum1 e1 = Enum1Value1;
+    CHECK( Catch::toString(e1) == "1" );
+}
+
+// Enum with user-provided stream operator
+enum Enum2 { Enum2Value0, Enum2Value1 };
+
+std::ostream& operator<<( std::ostream& os, Enum2 v )
+{
+    return os << "E2{" << static_cast<int>(v) << "}";
+}
+
+TEST_CASE( "toString(enum w/operator<<)", "[toString][enum]" )
+{
+    Enum2 e0 = Enum2Value0;
+    CHECK( Catch::toString(e0) == "E2{0}" );
+    Enum2 e1 = Enum2Value1;
+    CHECK( Catch::toString(e1) == "E2{1}" );
+}
+
+#if defined(CATCH_CPP11_OR_GREATER)
+// Enum class without user-provided stream operator
+enum class EnumClass1 { EnumClass1Value0, EnumClass1Value1 };
+
+TEST_CASE( "toString(enum class)", "[toString][enum][enumClass]" )
+{
+    EnumClass1 e0 = EnumClass1::EnumClass1Value0;
+    CHECK( Catch::toString(e0) == "0" );
+    EnumClass1 e1 = EnumClass1::EnumClass1Value1;
+    CHECK( Catch::toString(e1) == "1" );
+}
+
+// Enum class with user-provided stream operator
+enum class EnumClass2 : short { EnumClass2Value0, EnumClass2Value1 };
+
+std::ostream& operator<<( std::ostream& os, EnumClass2 e2 )
+{
+    switch( e2 )
+    {
+      case EnumClass2::EnumClass2Value0:
+          return os << "E2/V0";
+      case EnumClass2::EnumClass2Value1:
+          return os << "E2/V1";
+    }
+    return os << "unexpected...";
+}
+
+TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" )
+{
+    EnumClass2 e0 = EnumClass2::EnumClass2Value0;
+    CHECK( Catch::toString(e0) == "E2/V0" );
+    EnumClass2 e1 = EnumClass2::EnumClass2Value1;
+    CHECK( Catch::toString(e1) == "E2/V1" );
+}
+
+#endif
+
diff --git a/projects/SelfTest/makefile b/projects/SelfTest/makefile
index 458b3dea..e9f64855 100644
--- a/projects/SelfTest/makefile
+++ b/projects/SelfTest/makefile
@@ -8,12 +8,13 @@ SOURCES = ApproxTests.cpp \
           TestMain.cpp \
           TrickyTests.cpp \
           BDDTests.cpp \
-          VariadicMacrosTests.cpp
+          VariadicMacrosTests.cpp \
+          EnumToString.cpp
 
 
 OBJECTS    = $(patsubst %.cpp, %.o, $(SOURCES))
 CXX = g++
-CXXFLAGS  = -I../../include
+CXXFLAGS  = -I../../include -std=c++11
 
 CatchSelfTest: $(OBJECTS)
 	$(CXX) -o $@ $^