mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Cleanup how configuration-dependent test macros are defined
This commit is contained in:
parent
783ab5ef87
commit
0fdeb10c65
@ -13,10 +13,12 @@
|
|||||||
#include <catch2/internal/catch_section.hpp>
|
#include <catch2/internal/catch_section.hpp>
|
||||||
#include <catch2/internal/catch_test_registry.hpp>
|
#include <catch2/internal/catch_test_registry.hpp>
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE)
|
// All of our user-facing macros support configuration toggle, that
|
||||||
//////
|
// forces them to be defined prefixed with CATCH_. We also like to
|
||||||
// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
|
// support another toggle that can minimize (disable) their implementation.
|
||||||
#ifdef CATCH_CONFIG_PREFIX_ALL
|
// Given this, we have 4 different configuration options below
|
||||||
|
|
||||||
|
#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
|
||||||
|
|
||||||
#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
|
#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
|
||||||
@ -65,9 +67,49 @@
|
|||||||
#define CATCH_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
|
#define CATCH_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
|
||||||
#define CATCH_AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
|
#define CATCH_AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
|
||||||
|
|
||||||
|
#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE) // ^^ prefixed, implemented | vv prefixed, disabled
|
||||||
|
|
||||||
// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
|
#define CATCH_REQUIRE( ... ) (void)(0)
|
||||||
#else
|
#define CATCH_REQUIRE_FALSE( ... ) (void)(0)
|
||||||
|
|
||||||
|
#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
|
||||||
|
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
|
#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
|
#define CATCH_CHECK( ... ) (void)(0)
|
||||||
|
#define CATCH_CHECK_FALSE( ... ) (void)(0)
|
||||||
|
#define CATCH_CHECKED_IF( ... ) if (__VA_ARGS__)
|
||||||
|
#define CATCH_CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
|
||||||
|
#define CATCH_CHECK_NOFAIL( ... ) (void)(0)
|
||||||
|
|
||||||
|
#define CATCH_CHECK_THROWS( ... ) (void)(0)
|
||||||
|
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
|
#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
|
#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
||||||
|
#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
||||||
|
#define CATCH_METHOD_AS_TEST_CASE( method, ... )
|
||||||
|
#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
|
||||||
|
#define CATCH_SECTION( ... )
|
||||||
|
#define CATCH_DYNAMIC_SECTION( ... )
|
||||||
|
#define CATCH_FAIL( ... ) (void)(0)
|
||||||
|
#define CATCH_FAIL_CHECK( ... ) (void)(0)
|
||||||
|
#define CATCH_SUCCEED( ... ) (void)(0)
|
||||||
|
|
||||||
|
#define CATCH_STATIC_REQUIRE( ... ) (void)(0)
|
||||||
|
#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
|
||||||
|
|
||||||
|
// "BDD-style" convenience wrappers
|
||||||
|
#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
||||||
|
#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
|
||||||
|
#define CATCH_GIVEN( desc )
|
||||||
|
#define CATCH_AND_GIVEN( desc )
|
||||||
|
#define CATCH_WHEN( desc )
|
||||||
|
#define CATCH_AND_WHEN( desc )
|
||||||
|
#define CATCH_THEN( desc )
|
||||||
|
#define CATCH_AND_THEN( desc )
|
||||||
|
|
||||||
|
#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE) // ^^ prefixed, disabled | vv unprefixed, implemented
|
||||||
|
|
||||||
#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
|
#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
|
||||||
@ -105,14 +147,9 @@
|
|||||||
#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
|
#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
|
|
||||||
|
|
||||||
// "BDD-style" convenience wrappers
|
// "BDD-style" convenience wrappers
|
||||||
#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
|
#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
|
||||||
#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
|
#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
|
||||||
|
|
||||||
#define GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Given: " << desc )
|
#define GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Given: " << desc )
|
||||||
#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
|
#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
|
||||||
#define WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " When: " << desc )
|
#define WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " When: " << desc )
|
||||||
@ -120,54 +157,7 @@
|
|||||||
#define THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
|
#define THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " Then: " << desc )
|
||||||
#define AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
|
#define AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( " And: " << desc )
|
||||||
|
|
||||||
#else // CATCH_CONFIG_DISABLE
|
#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE) // ^^ unprefixed, implemented | vv unprefixed, disabled
|
||||||
|
|
||||||
//////
|
|
||||||
// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
|
|
||||||
#ifdef CATCH_CONFIG_PREFIX_ALL
|
|
||||||
|
|
||||||
#define CATCH_REQUIRE( ... ) (void)(0)
|
|
||||||
#define CATCH_REQUIRE_FALSE( ... ) (void)(0)
|
|
||||||
|
|
||||||
#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
|
|
||||||
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
|
||||||
#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
|
|
||||||
|
|
||||||
#define CATCH_CHECK( ... ) (void)(0)
|
|
||||||
#define CATCH_CHECK_FALSE( ... ) (void)(0)
|
|
||||||
#define CATCH_CHECKED_IF( ... ) if (__VA_ARGS__)
|
|
||||||
#define CATCH_CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
|
|
||||||
#define CATCH_CHECK_NOFAIL( ... ) (void)(0)
|
|
||||||
|
|
||||||
#define CATCH_CHECK_THROWS( ... ) (void)(0)
|
|
||||||
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
|
||||||
#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
|
|
||||||
|
|
||||||
#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
|
||||||
#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
|
||||||
#define CATCH_METHOD_AS_TEST_CASE( method, ... )
|
|
||||||
#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
|
|
||||||
#define CATCH_SECTION( ... )
|
|
||||||
#define CATCH_DYNAMIC_SECTION( ... )
|
|
||||||
#define CATCH_FAIL( ... ) (void)(0)
|
|
||||||
#define CATCH_FAIL_CHECK( ... ) (void)(0)
|
|
||||||
#define CATCH_SUCCEED( ... ) (void)(0)
|
|
||||||
|
|
||||||
// "BDD-style" convenience wrappers
|
|
||||||
#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
|
|
||||||
#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
|
|
||||||
#define CATCH_GIVEN( desc )
|
|
||||||
#define CATCH_AND_GIVEN( desc )
|
|
||||||
#define CATCH_WHEN( desc )
|
|
||||||
#define CATCH_AND_WHEN( desc )
|
|
||||||
#define CATCH_THEN( desc )
|
|
||||||
#define CATCH_AND_THEN( desc )
|
|
||||||
|
|
||||||
#define CATCH_STATIC_REQUIRE( ... ) (void)(0)
|
|
||||||
#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
|
|
||||||
|
|
||||||
// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define REQUIRE( ... ) (void)(0)
|
#define REQUIRE( ... ) (void)(0)
|
||||||
#define REQUIRE_FALSE( ... ) (void)(0)
|
#define REQUIRE_FALSE( ... ) (void)(0)
|
||||||
@ -199,10 +189,6 @@
|
|||||||
#define STATIC_REQUIRE( ... ) (void)(0)
|
#define STATIC_REQUIRE( ... ) (void)(0)
|
||||||
#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
|
#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
|
|
||||||
|
|
||||||
// "BDD-style" convenience wrappers
|
// "BDD-style" convenience wrappers
|
||||||
#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
|
#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
|
||||||
#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
|
#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
|
||||||
@ -214,6 +200,15 @@
|
|||||||
#define THEN( desc )
|
#define THEN( desc )
|
||||||
#define AND_THEN( desc )
|
#define AND_THEN( desc )
|
||||||
|
|
||||||
|
#endif // ^^ unprefixed, disabled
|
||||||
|
|
||||||
|
// This macro is always prefixed
|
||||||
|
#if !defined(CATCH_CONFIG_DISABLE)
|
||||||
|
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
|
||||||
|
#else
|
||||||
|
#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// end of user facing macros
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
|
#endif // TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
|
||||||
|
Loading…
Reference in New Issue
Block a user