diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 11df0389..42d62c9c 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -1020,6 +1020,6 @@ with expansion: "{?}" == "1" =============================================================================== -test cases: 184 | 133 passed | 47 failed | 4 failed as expected -assertions: 884 | 767 passed | 96 failed | 21 failed as expected +test cases: 182 | 131 passed | 47 failed | 4 failed as expected +assertions: 881 | 764 passed | 96 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 14fdcd9d..02ec81d7 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -508,19 +508,6 @@ PASSED: with expansion: 100.3 == Approx( 100.0 ) -------------------------------------------------------------------------------- -AllOf matcher -------------------------------------------------------------------------------- -MatchersTests.cpp: -............................................................................... - -MatchersTests.cpp:: -PASSED: - CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) ) -with expansion: - "this string contains 'abc' as a substring" ( contains: "string" and - contains: "abc" ) - ------------------------------------------------------------------------------- An expression with side-effects should only be evaluated once ------------------------------------------------------------------------------- @@ -565,26 +552,6 @@ PASSED: with message: anonymous test case -------------------------------------------------------------------------------- -AnyOf matcher -------------------------------------------------------------------------------- -MatchersTests.cpp: -............................................................................... - -MatchersTests.cpp:: -PASSED: - CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) ) -with expansion: - "this string contains 'abc' as a substring" ( contains: "string" or contains: - "not there" ) - -MatchersTests.cpp:: -PASSED: - CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) -with expansion: - "this string contains 'abc' as a substring" ( contains: "not there" or - contains: "string" ) - ------------------------------------------------------------------------------- Approximate PI ------------------------------------------------------------------------------- @@ -7554,6 +7521,6 @@ MiscTests.cpp:: PASSED: =============================================================================== -test cases: 184 | 130 passed | 50 failed | 4 failed as expected -assertions: 886 | 763 passed | 102 failed | 21 failed as expected +test cases: 182 | 128 passed | 50 failed | 4 failed as expected +assertions: 883 | 760 passed | 102 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 15fa38f0..9c693386 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,7 +1,7 @@ - + @@ -92,7 +92,6 @@ TrickyTests.cpp: - @@ -101,7 +100,6 @@ ExceptionTests.cpp: - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index 7f2b4b03..1acc1d74 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -521,17 +521,6 @@ - - - - testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) - - - "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) - - - - @@ -579,25 +568,6 @@ - - - - testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) - - - "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) - - - - - testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) - - - "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) - - - - @@ -8306,7 +8276,7 @@ loose text artifact - + - +