mirror of https://github.com/catchorg/Catch2.git
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
This commit is contained in:
parent
e02d9e788f
commit
f2ee4f17ad
|
@ -38,9 +38,10 @@ namespace Catch {
|
||||||
return "{** unexpected enum value **}";
|
return "{** unexpected enum value **}";
|
||||||
}
|
}
|
||||||
|
|
||||||
EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
|
std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
|
||||||
std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
|
std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
|
||||||
enumInfo->m_name = enumName;
|
enumInfo->m_name = enumName;
|
||||||
|
enumInfo->m_values.reserve( values.size() );
|
||||||
|
|
||||||
const auto valueNames = Catch::Detail::parseEnums( allValueNames );
|
const auto valueNames = Catch::Detail::parseEnums( allValueNames );
|
||||||
assert( valueNames.size() == values.size() );
|
assert( valueNames.size() == values.size() );
|
||||||
|
@ -48,6 +49,11 @@ namespace Catch {
|
||||||
for( auto value : values )
|
for( auto value : values )
|
||||||
enumInfo->m_values.push_back({ value, valueNames[i++] });
|
enumInfo->m_values.push_back({ value, valueNames[i++] });
|
||||||
|
|
||||||
|
return enumInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
|
||||||
|
auto enumInfo = makeEnumInfo( enumName, allValueNames, values );
|
||||||
EnumInfo* raw = enumInfo.get();
|
EnumInfo* raw = enumInfo.get();
|
||||||
m_enumInfos.push_back( std::move( enumInfo ) );
|
m_enumInfos.push_back( std::move( enumInfo ) );
|
||||||
return *raw;
|
return *raw;
|
||||||
|
|
|
@ -16,6 +16,8 @@ namespace Catch {
|
||||||
|
|
||||||
namespace Detail {
|
namespace Detail {
|
||||||
|
|
||||||
|
std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
|
||||||
|
|
||||||
class EnumValuesRegistry : public IMutableEnumValuesRegistry {
|
class EnumValuesRegistry : public IMutableEnumValuesRegistry {
|
||||||
|
|
||||||
std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
|
std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
|
||||||
|
|
|
@ -22,6 +22,7 @@ set(TEST_SOURCES
|
||||||
${SELF_TEST_DIR}/IntrospectiveTests/Tag.tests.cpp
|
${SELF_TEST_DIR}/IntrospectiveTests/Tag.tests.cpp
|
||||||
${SELF_TEST_DIR}/IntrospectiveTests/String.tests.cpp
|
${SELF_TEST_DIR}/IntrospectiveTests/String.tests.cpp
|
||||||
${SELF_TEST_DIR}/IntrospectiveTests/Xml.tests.cpp
|
${SELF_TEST_DIR}/IntrospectiveTests/Xml.tests.cpp
|
||||||
|
${SELF_TEST_DIR}/IntrospectiveTests/ToString.tests.cpp
|
||||||
${SELF_TEST_DIR}/UsageTests/Approx.tests.cpp
|
${SELF_TEST_DIR}/UsageTests/Approx.tests.cpp
|
||||||
${SELF_TEST_DIR}/UsageTests/BDD.tests.cpp
|
${SELF_TEST_DIR}/UsageTests/BDD.tests.cpp
|
||||||
${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp
|
${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
#include "catch.hpp"
|
||||||
|
|
||||||
|
#include "internal/catch_enum_values_registry.h"
|
||||||
|
|
||||||
|
enum class EnumClass3 { Value1, Value2, Value3, Value4 };
|
||||||
|
|
||||||
|
|
||||||
|
TEST_CASE( "parseEnums", "[Strings][enums]" ) {
|
||||||
|
using namespace Catch::Matchers;
|
||||||
|
using Catch::Detail::parseEnums;
|
||||||
|
|
||||||
|
SECTION( "No enums" )
|
||||||
|
CHECK_THAT( parseEnums( "" ), Equals( std::vector<std::string>{} ) );
|
||||||
|
|
||||||
|
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( "Directly creating an EnumInfo" ) {
|
||||||
|
|
||||||
|
using namespace Catch::Detail;
|
||||||
|
std::unique_ptr<EnumInfo> enumInfo = makeEnumInfo( "EnumName", "EnumName::Value1, EnumName::Value2", {0, 1} );
|
||||||
|
|
||||||
|
CHECK( enumInfo->lookup(0) == "Value1" );
|
||||||
|
CHECK( enumInfo->lookup(1) == "Value2" );
|
||||||
|
CHECK( enumInfo->lookup(3) == "{** unexpected enum value **}" );
|
||||||
|
}
|
|
@ -61,7 +61,7 @@ TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" )
|
||||||
EnumClass2 e1 = EnumClass2::EnumClass2Value1;
|
EnumClass2 e1 = EnumClass2::EnumClass2Value1;
|
||||||
CHECK( ::Catch::Detail::stringify(e1) == "E2/V1" );
|
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" );
|
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 )
|
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;
|
using Catch::Detail::stringify;
|
||||||
REQUIRE( stringify( EnumClass3::Value1 ) == "Value1" );
|
REQUIRE( stringify( EnumClass3::Value1 ) == "Value1" );
|
||||||
REQUIRE( stringify( EnumClass3::Value2 ) == "Value2" );
|
REQUIRE( stringify( EnumClass3::Value2 ) == "Value2" );
|
||||||
|
@ -81,40 +81,19 @@ TEST_CASE( "REGISTER_ENUM" ) {
|
||||||
REQUIRE( stringify( ec3 ) == "Value2" );
|
REQUIRE( stringify( ec3 ) == "Value2" );
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "internal/catch_interfaces_enum_values_registry.h"
|
namespace Bikeshed {
|
||||||
|
enum class Colours { Red, Green, Blue };
|
||||||
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 **}" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "internal/catch_enum_values_registry.h"
|
// 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 );
|
||||||
|
|
||||||
TEST_CASE( "parseEnums", "[Strings][enums]" ) {
|
TEST_CASE( "Enums in namespaces can quickly have stringification enabled using REGISTER_ENUM" ) {
|
||||||
using namespace Catch::Matchers;
|
using Catch::Detail::stringify;
|
||||||
using Catch::Detail::parseEnums;
|
REQUIRE( stringify( Bikeshed::Colours::Red ) == "Red" );
|
||||||
|
REQUIRE( stringify( Bikeshed::Colours::Blue ) == "Blue" );
|
||||||
SECTION( "No enums" )
|
|
||||||
CHECK_THAT( parseEnums( "" ), Equals( std::vector<std::string>{} ) );
|
|
||||||
|
|
||||||
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"} ) );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue