Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest/UsageTests/EnumToString.tests.cpp
diff options
context:
space:
mode:
authorPhil nash2019-04-25 10:13:11 +0100
committerPhil nash2019-04-25 10:13:11 +0100
commitf2ee4f17ad7040160eea73b326d431b4112ad25b (patch)
tree3d0f0da892d54d746eb7a890daa3f07438659d77 /projects/SelfTest/UsageTests/EnumToString.tests.cpp
parente02d9e788fe201094ed365a140a8beb39cfb97c5 (diff)
downloadcatch3-f2ee4f17ad7040160eea73b326d431b4112ad25b.tar.gz
Moved enum tests that depend on internals to IntrospectiveTests.
- also factored out makeEnumInfo, so tests don't need to touch registry - and added usage test that involves namespace
Diffstat (limited to 'projects/SelfTest/UsageTests/EnumToString.tests.cpp')
-rw-r--r--projects/SelfTest/UsageTests/EnumToString.tests.cpp49
1 files changed, 14 insertions, 35 deletions
diff --git a/projects/SelfTest/UsageTests/EnumToString.tests.cpp b/projects/SelfTest/UsageTests/EnumToString.tests.cpp
index ee68968c..81ec5937 100644
--- a/projects/SelfTest/UsageTests/EnumToString.tests.cpp
+++ b/projects/SelfTest/UsageTests/EnumToString.tests.cpp
@@ -61,7 +61,7 @@ TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" )
EnumClass2 e1 = EnumClass2::EnumClass2Value1;
CHECK( ::Catch::Detail::stringify(e1) == "E2/V1" );
- EnumClass2 e3 = static_cast<EnumClass2>(10);
+ auto e3 = static_cast<EnumClass2>(10);
CHECK( ::Catch::Detail::stringify(e3) == "Unknown enum value 10" );
}
@@ -70,7 +70,7 @@ enum class EnumClass3 { Value1, Value2, Value3, Value4 };
CATCH_REGISTER_ENUM( EnumClass3, EnumClass3::Value1, EnumClass3::Value2, EnumClass3::Value3 )
-TEST_CASE( "REGISTER_ENUM" ) {
+TEST_CASE( "Enums can quickly have stringification enabled using REGISTER_ENUM" ) {
using Catch::Detail::stringify;
REQUIRE( stringify( EnumClass3::Value1 ) == "Value1" );
REQUIRE( stringify( EnumClass3::Value2 ) == "Value2" );
@@ -81,40 +81,19 @@ TEST_CASE( "REGISTER_ENUM" ) {
REQUIRE( stringify( ec3 ) == "Value2" );
}
-#include "internal/catch_interfaces_enum_values_registry.h"
-
-TEST_CASE( "EnumInfo" ) {
-
- auto& hub = Catch::getMutableRegistryHub();
- auto& reg = hub.getMutableEnumValuesRegistry();
- auto const& enumInfo = reg.registerEnum( "EnumName", "EnumName::Value1, EnumName::Value2", {0, 1} );
-
- CHECK( enumInfo.lookup(0) == "Value1" );
- CHECK( enumInfo.lookup(1) == "Value2" );
- CHECK( enumInfo.lookup(3) == "{** unexpected enum value **}" );
+namespace Bikeshed {
+ enum class Colours { Red, Green, Blue };
}
-#include "internal/catch_enum_values_registry.h"
-
-TEST_CASE( "parseEnums", "[Strings][enums]" ) {
- using namespace Catch::Matchers;
- using Catch::Detail::parseEnums;
-
- SECTION( "No enums" )
- CHECK_THAT( parseEnums( "" ), Equals( std::vector<std::string>{} ) );
+// Important!: This macro must appear at top level scope - not inside a namespace
+// You can fully qualify the names, or use a using if you prefer
+CATCH_REGISTER_ENUM( Bikeshed::Colours,
+ Bikeshed::Colours::Red,
+ Bikeshed::Colours::Green,
+ Bikeshed::Colours::Blue );
- SECTION( "One enum value" ) {
- CHECK_THAT( parseEnums( "ClassName::EnumName::Value1" ), Equals(std::vector<std::string>{"Value1"} ) );
- CHECK_THAT( parseEnums( "Value1" ), Equals( std::vector<std::string>{"Value1"} ) );
- CHECK_THAT( parseEnums( "EnumName::Value1" ), Equals(std::vector<std::string>{"Value1"} ) );
- }
-
- SECTION( "Multiple enum values" ) {
- CHECK_THAT( parseEnums( "ClassName::EnumName::Value1, ClassName::EnumName::Value2" ),
- Equals( std::vector<std::string>{"Value1", "Value2"} ) );
- CHECK_THAT( parseEnums( "ClassName::EnumName::Value1, ClassName::EnumName::Value2, ClassName::EnumName::Value3" ),
- Equals( std::vector<std::string>{"Value1", "Value2", "Value3"} ) );
- CHECK_THAT( parseEnums( "ClassName::EnumName::Value1,ClassName::EnumName::Value2 , ClassName::EnumName::Value3" ),
- Equals( std::vector<std::string>{"Value1", "Value2", "Value3"} ) );
- }
+TEST_CASE( "Enums in namespaces can quickly have stringification enabled using REGISTER_ENUM" ) {
+ using Catch::Detail::stringify;
+ REQUIRE( stringify( Bikeshed::Colours::Red ) == "Red" );
+ REQUIRE( stringify( Bikeshed::Colours::Blue ) == "Blue" );
}