diff --git a/projects/SelfTest/Baselines/compact.sw.approved.txt b/projects/SelfTest/Baselines/compact.sw.approved.txt index 89db0837..7780a5cc 100644 --- a/projects/SelfTest/Baselines/compact.sw.approved.txt +++ b/projects/SelfTest/Baselines/compact.sw.approved.txt @@ -520,7 +520,6 @@ CmdLine.tests.cpp:: passed: spec.matches( tcA ) == false for: false CmdLine.tests.cpp:: passed: spec.matches( tcB ) == false for: false == false CmdLine.tests.cpp:: passed: spec.matches( tcC ) == false for: false == false CmdLine.tests.cpp:: passed: spec.matches( tcD ) == true for: true == true -Tricky.tests.cpp:: passed: (std::pair( 1, 2 )) == aNicePair for: {?} == {?} Condition.tests.cpp:: passed: p == 0 for: 0 == 0 Condition.tests.cpp:: passed: p == pNULL for: 0 == 0 Condition.tests.cpp:: passed: p != 0 for: 0x != 0 diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 4a2554c2..208b1afd 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -1096,6 +1096,6 @@ due to unexpected exception with message: Why would you throw a std::string? =============================================================================== -test cases: 208 | 155 passed | 49 failed | 4 failed as expected -assertions: 1074 | 945 passed | 108 failed | 21 failed as expected +test cases: 207 | 154 passed | 49 failed | 4 failed as expected +assertions: 1073 | 944 passed | 108 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 161fa23f..123abae5 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -3993,18 +3993,6 @@ PASSED: with expansion: true == true -------------------------------------------------------------------------------- -Parsing a std::pair -------------------------------------------------------------------------------- -Tricky.tests.cpp: -............................................................................... - -Tricky.tests.cpp:: -PASSED: - REQUIRE( (std::pair( 1, 2 )) == aNicePair ) -with expansion: - {?} == {?} - ------------------------------------------------------------------------------- Pointers can be compared to null ------------------------------------------------------------------------------- @@ -9110,6 +9098,6 @@ Misc.tests.cpp:: PASSED: =============================================================================== -test cases: 208 | 142 passed | 62 failed | 4 failed as expected -assertions: 1088 | 945 passed | 122 failed | 21 failed as expected +test cases: 207 | 141 passed | 62 failed | 4 failed as expected +assertions: 1087 | 944 passed | 122 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 8dd50adf..c5ad4596 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,7 +1,7 @@ - + @@ -467,7 +467,6 @@ Message.tests.cpp: - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index 43534b18..268537cb 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -4650,17 +4650,6 @@ - - - - (std::pair<int, int>( 1, 2 )) == aNicePair - - - {?} == {?} - - - - @@ -10035,7 +10024,7 @@ loose text artifact - + - + diff --git a/projects/SelfTest/UsageTests/Tricky.tests.cpp b/projects/SelfTest/UsageTests/Tricky.tests.cpp index 180ad00e..b0363d42 100644 --- a/projects/SelfTest/UsageTests/Tricky.tests.cpp +++ b/projects/SelfTest/UsageTests/Tricky.tests.cpp @@ -20,26 +20,6 @@ #include #include -namespace Catch { - std::string toString( const std::pair& value ) { - std::ostringstream oss; - oss << "std::pair( " << value.first << ", " << value.second << " )"; - return oss.str(); - } -} - -/////////////////////////////////////////////////////////////////////////////// -TEST_CASE -( - "Parsing a std::pair", - "[Tricky][std::pair]" -) -{ - std::pair aNicePair( 1, 2 ); - - REQUIRE( (std::pair( 1, 2 )) == aNicePair ); -} - /////////////////////////////////////////////////////////////////////////////// TEST_CASE ( @@ -175,7 +155,7 @@ namespace ObjectWithConversions /////////////////////////////////////////////////////////////////////////////// TEST_CASE ( - "Operators at different namespace levels not hijacked by Koenig lookup", + "Implicit conversions are supported inside assertion macros", "[Tricky][approvals]" ) {