mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 12:17:11 +01:00 
			
		
		
		
	Fix & extend tests for comparing const instances of zero lit types
This commit is contained in:
		| @@ -405,14 +405,26 @@ TEST_CASE( "#2555 - types that can only be compared with 0 literal implemented a | ||||
| // have the ambiguity issue) for `==` and `!=`. | ||||
| TEST_CASE( "Comparing const instances of type registered with capture_by_value", | ||||
|            "[regression][approvals][compilation]" ) { | ||||
|     auto const const_Lit0Type_1 = TypeWithLit0Comparisons{}; | ||||
|     auto const const_Lit0Type_2 = TypeWithLit0Comparisons{}; | ||||
|     REQUIRE( const_Lit0Type_1 == const_Lit0Type_2 ); | ||||
|     REQUIRE( const_Lit0Type_1 <= const_Lit0Type_2 ); | ||||
|     REQUIRE( const_Lit0Type_1 < const_Lit0Type_2 ); | ||||
|     REQUIRE( const_Lit0Type_1 >= const_Lit0Type_2 ); | ||||
|     REQUIRE( const_Lit0Type_1 > const_Lit0Type_2 ); | ||||
|     REQUIRE_FALSE( const_Lit0Type_1 != const_Lit0Type_2 ); | ||||
|     SECTION("Type with consteval-int constructor") { | ||||
|         auto const const_Lit0Type_1 = TypeWithConstevalLit0Comparison{}; | ||||
|         auto const const_Lit0Type_2 = TypeWithConstevalLit0Comparison{}; | ||||
|         REQUIRE( const_Lit0Type_1 == const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 <= const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 < const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 >= const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 > const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 != const_Lit0Type_2 ); | ||||
|     } | ||||
|     SECTION("Type with constexpr-int constructor") { | ||||
|         auto const const_Lit0Type_1 = TypeWithLit0Comparisons{}; | ||||
|         auto const const_Lit0Type_2 = TypeWithLit0Comparisons{}; | ||||
|         REQUIRE( const_Lit0Type_1 == const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 <= const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 < const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 >= const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 > const_Lit0Type_2 ); | ||||
|         REQUIRE( const_Lit0Type_1 != const_Lit0Type_2 ); | ||||
|     } | ||||
| } | ||||
|  | ||||
| #endif // C++20 consteval | ||||
|   | ||||
| @@ -26,14 +26,20 @@ struct ZeroLiteralAsPointer { | ||||
|  | ||||
|  | ||||
| struct TypeWithLit0Comparisons { | ||||
| #define DEFINE_COMP_OP( op )                                       \ | ||||
|     constexpr friend bool operator op( TypeWithLit0Comparisons,    \ | ||||
|                                        ZeroLiteralAsPointer ) {    \ | ||||
|         return true;                                               \ | ||||
|     }                                                              \ | ||||
|     constexpr friend bool operator op( ZeroLiteralAsPointer,       \ | ||||
|                                        TypeWithLit0Comparisons ) { \ | ||||
|         return false;                                              \ | ||||
| #define DEFINE_COMP_OP( op )                                          \ | ||||
|     constexpr friend bool operator op( TypeWithLit0Comparisons,       \ | ||||
|                                        ZeroLiteralAsPointer ) {       \ | ||||
|         return true;                                                  \ | ||||
|     }                                                                 \ | ||||
|     constexpr friend bool operator op( ZeroLiteralAsPointer,          \ | ||||
|                                        TypeWithLit0Comparisons ) {    \ | ||||
|         return false;                                                 \ | ||||
|     }                                                                 \ | ||||
|     /* std::orderings only have these for ==, but we add them for all \ | ||||
|        operators so we can test all overloads for decomposer */       \ | ||||
|     constexpr friend bool operator op( TypeWithLit0Comparisons,       \ | ||||
|                                        TypeWithLit0Comparisons ) {    \ | ||||
|         return true;                                                  \ | ||||
|     } | ||||
|  | ||||
|     DEFINE_COMP_OP( < ) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský