diff options
| author | Martin Hořeňovský | 2018-07-02 11:13:07 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2018-07-02 17:36:13 +0200 |
| commit | e1d81174dba1a7d81eb348490005dfc02a648c7e (patch) | |
| tree | 946dd410cd355691d62b93b52cf61b7c45577370 /projects/SelfTest/UsageTests/EnumToString.tests.cpp | |
| parent | 4846ad59e10e6174df1c4679cfef5bc80fe3f5d7 (diff) | |
| download | catch3-e1d81174dba1a7d81eb348490005dfc02a648c7e.tar.gz | |
Add -Wmissing-declarations to the SelfTest project
This required some clean-up in our test files
Diffstat (limited to 'projects/SelfTest/UsageTests/EnumToString.tests.cpp')
| -rw-r--r-- | projects/SelfTest/UsageTests/EnumToString.tests.cpp | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/projects/SelfTest/UsageTests/EnumToString.tests.cpp b/projects/SelfTest/UsageTests/EnumToString.tests.cpp index 7d18a292..0b188a82 100644 --- a/projects/SelfTest/UsageTests/EnumToString.tests.cpp +++ b/projects/SelfTest/UsageTests/EnumToString.tests.cpp @@ -1,22 +1,24 @@ #include "catch.hpp" +namespace { // Enum without user-provided stream operator enum Enum1 { Enum1Value0, Enum1Value1 }; -TEST_CASE( "toString(enum)", "[toString][enum]" ) { - Enum1 e0 = Enum1Value0; - CHECK( ::Catch::Detail::stringify(e0) == "0" ); - Enum1 e1 = Enum1Value1; - CHECK( ::Catch::Detail::stringify(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) << "}"; } +} // end anonymous namespace + +TEST_CASE( "toString(enum)", "[toString][enum]" ) { + Enum1 e0 = Enum1Value0; + CHECK( ::Catch::Detail::stringify(e0) == "0" ); + Enum1 e1 = Enum1Value1; + CHECK( ::Catch::Detail::stringify(e1) == "1" ); +} TEST_CASE( "toString(enum w/operator<<)", "[toString][enum]" ) { Enum2 e0 = Enum2Value0; @@ -26,17 +28,11 @@ TEST_CASE( "toString(enum w/operator<<)", "[toString][enum]" ) { } // Enum class without user-provided stream operator +namespace { enum class EnumClass1 { EnumClass1Value0, EnumClass1Value1 }; -TEST_CASE( "toString(enum class)", "[toString][enum][enumClass]" ) { - EnumClass1 e0 = EnumClass1::EnumClass1Value0; - CHECK( ::Catch::Detail::stringify(e0) == "0" ); - EnumClass1 e1 = EnumClass1::EnumClass1Value1; - CHECK( ::Catch::Detail::stringify(e1) == "1" ); -} - // Enum class with user-provided stream operator -enum class EnumClass2 : short { EnumClass2Value0, EnumClass2Value1 }; +enum class EnumClass2 { EnumClass2Value0, EnumClass2Value1 }; std::ostream& operator<<( std::ostream& os, EnumClass2 e2 ) { switch( static_cast<int>( e2 ) ) { @@ -49,6 +45,16 @@ std::ostream& operator<<( std::ostream& os, EnumClass2 e2 ) { } } +} // end anonymous namespace + +TEST_CASE( "toString(enum class)", "[toString][enum][enumClass]" ) { + EnumClass1 e0 = EnumClass1::EnumClass1Value0; + CHECK( ::Catch::Detail::stringify(e0) == "0" ); + EnumClass1 e1 = EnumClass1::EnumClass1Value1; + CHECK( ::Catch::Detail::stringify(e1) == "1" ); +} + + TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" ) { EnumClass2 e0 = EnumClass2::EnumClass2Value0; CHECK( ::Catch::Detail::stringify(e0) == "E2/V0" ); @@ -58,4 +64,3 @@ TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" ) EnumClass2 e3 = static_cast<EnumClass2>(10); CHECK( ::Catch::Detail::stringify(e3) == "Unknown enum value 10" ); } - |