catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Removed test for invoking String Matcher with NULL (this will no longer be supported)
- Commit
5530303be762d10c2c6e96f51a1465b57971eabe- Author
- Phil Nash ·
- Parents
29fa1edcc72c
Changes
projects/SelfTest/Baselines/console.std.approved.txt | 4 ++-- projects/SelfTest/Baselines/console.sw.approved.txt | 16 ++-------------- projects/SelfTest/Baselines/junit.sw.approved.txt | 3 +-- projects/SelfTest/Baselines/xml.sw.approved.txt | 15 ++------------- projects/SelfTest/MiscTests.cpp | 5 +---- 5 files changed, 8 insertions(+), 35 deletions(-) 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:<line number>: FAILED: with expansion: "this string contains 'abc' as a substring" equals: "something else" -------------------------------------------------------------------------------- -Equals string matcher, with NULL -------------------------------------------------------------------------------- -MiscTests.cpp:<line number> -............................................................................... - -MiscTests.cpp:<line number>: -PASSED: - REQUIRE_THAT( "", Equals(0) ) -with expansion: - "" equals: "" - ------------------------------------------------------------------------------- Exception messages can be tested for exact match @@ -9164,6 +9152,6 @@ MiscTests.cpp:<line number>: 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 @@ <?xml version="1.0" encoding="UTF-8"?> <testsuitesspanner> - <testsuite name="<exe-name>" errors="13" failures="68" tests="935" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> + <testsuite name="<exe-name>" errors="13" failures="68" tests="934" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="global" name="#542" time="{duration}"/> <testcase classname="global" name="#809" time="{duration}"/> @@ -167,7 +167,6 @@ ConditionTests.cpp:<line number> MiscTests.cpp:<line number> </failure> </testcase> - <testcase classname="global" name="Equals string matcher, with NULL" time="{duration}"/> <testcase classname="Exception messages can be tested for" name="exact match" time="{duration}"/> <testcase classname="Exception messages can be tested for" name="different case" time="{duration}"/> <testcase classname="Exception messages can be tested for" name="wildcarded" time="{duration}"/> 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 @@ </Expression> <OverallResult success="false"/> </TestCase> - <TestCase name="Equals string matcher, with NULL" tags="[matchers]"> - <Expression success="true" type="REQUIRE_THAT" filename="projects/<exe-name>/MiscTests.cpp" > - <Original> - "", Equals(0) - </Original> - <Expanded> - "" equals: "" - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> <TestCase name="Exception messages can be tested for" tags="[!throws]"> <Section name="exact match"> <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/<exe-name>/ExceptionTests.cpp" > @@ -9693,7 +9682,7 @@ spanner <OverallResult success="true"/> </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="836" failures="81" expectedFailures="18"/> + <OverallResults successes="835" failures="81" expectedFailures="18"/> </Group> - <OverallResults successes="836" failures="80" expectedFailures="18"/> + <OverallResults successes="835" failures="80" expectedFailures="18"/> </Catch> 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" ) ) );