diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index bec5712c..ab0a83de 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -829,6 +829,6 @@ with expansion: "first" == "second" =============================================================================== -test cases: 161 | 117 passed | 42 failed | 2 failed as expected -assertions: 932 | 836 passed | 78 failed | 18 failed as expected +test cases: 160 | 116 passed | 42 failed | 2 failed as expected +assertions: 931 | 835 passed | 78 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 4a4d9a38..5aff4b8c 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -1054,18 +1054,6 @@ MiscTests.cpp:: FAILED: with expansion: "this string contains 'abc' as a substring" equals: "something else" -------------------------------------------------------------------------------- -Equals string matcher, with NULL -------------------------------------------------------------------------------- -MiscTests.cpp: -............................................................................... - -MiscTests.cpp:: -PASSED: - REQUIRE_THAT( "", Equals(0) ) -with expansion: - "" equals: "" - ------------------------------------------------------------------------------- Exception messages can be tested for exact match @@ -9164,6 +9152,6 @@ MiscTests.cpp:: PASSED: =============================================================================== -test cases: 161 | 116 passed | 43 failed | 2 failed as expected -assertions: 934 | 836 passed | 80 failed | 18 failed as expected +test cases: 160 | 115 passed | 43 failed | 2 failed as expected +assertions: 933 | 835 passed | 80 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 4a1cb048..c619c366 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,6 +1,6 @@ - + @@ -167,7 +167,6 @@ ConditionTests.cpp: MiscTests.cpp: - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index cfa7b1c5..9e72288c 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -1182,17 +1182,6 @@ - - - - "", Equals(0) - - - "" equals: "" - - - -
@@ -9693,7 +9682,7 @@ spanner
- + - + diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp index 8eaf99bc..73c4ccc0 100644 --- a/projects/SelfTest/MiscTests.cpp +++ b/projects/SelfTest/MiscTests.cpp @@ -243,10 +243,7 @@ TEST_CASE("Equals string matcher", "[.][failing][matchers]") { CHECK_THAT( testStringForMatching(), Equals( "something else" ) ); } -TEST_CASE("Equals string matcher, with NULL", "[matchers]") -{ - REQUIRE_THAT("", Equals(CATCH_NULL)); -} + TEST_CASE("AllOf matcher", "[matchers]") { CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) );