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
Update approvals after removing deprecated matcher helpers
- Commit
4e4a13dfb4b0e7dc60aacd2c8da01493ccb9b2d3- Author
- Martin Hořeňovský ·
- Parents
e8ec6bd73c30
Changes
.../SelfTest/Baselines/console.std.approved.txt | 4 +-- .../SelfTest/Baselines/console.sw.approved.txt | 37 ++-------------------- projects/SelfTest/Baselines/junit.sw.approved.txt | 4 +-- projects/SelfTest/Baselines/xml.sw.approved.txt | 34 ++------------------ 4 files changed, 7 insertions(+), 72 deletions(-) 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:<line number> -............................................................................... - -MatchersTests.cpp:<line number>: -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:<line number> -............................................................................... - -MatchersTests.cpp:<line number>: -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:<line number>: -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:<line number>: 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 @@ <?xml version="1.0" encoding="UTF-8"?> <testsuitesloose text artifact > - <testsuite name="<exe-name>" errors="15" failures="88" tests="887" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> + <testsuite name="<exe-name>" errors="15" failures="88" tests="884" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/> <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}"> @@ -92,7 +92,6 @@ TrickyTests.cpp:<line number> </failure> </testcase> <testcase classname="<exe-name>.global" name="Absolute margin" time="{duration}"/> - <testcase classname="<exe-name>.global" name="AllOf matcher" time="{duration}"/> <testcase classname="<exe-name>.global" name="An expression with side-effects should only be evaluated once" time="{duration}"/> <testcase classname="<exe-name>.global" name="An unchecked exception reports the line of the last assertion" time="{duration}"> <error message="{Unknown expression after the reported line}"> @@ -101,7 +100,6 @@ ExceptionTests.cpp:<line number> </error> </testcase> <testcase classname="<exe-name>.global" name="Anonymous test case 1" time="{duration}"/> - <testcase classname="<exe-name>.global" name="AnyOf matcher" time="{duration}"/> <testcase classname="<exe-name>.global" name="Approximate PI" time="{duration}"/> <testcase classname="<exe-name>.global" name="Approximate comparisons with different epsilons" time="{duration}"/> <testcase classname="<exe-name>.global" name="Approximate comparisons with floats" time="{duration}"/> 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 @@ </Expression> <OverallResult success="true"/> </TestCase> - <TestCase name="AllOf matcher" tags="[matchers]" filename="projects/<exe-name>/MatchersTests.cpp" > - <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MatchersTests.cpp" > - <Original> - testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) - </Original> - <Expanded> - "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> <TestCase name="An empty test with no assertions" tags="[empty]" filename="projects/<exe-name>/MiscTests.cpp" > <OverallResult success="true"/> </TestCase> @@ -579,25 +568,6 @@ <TestCase name="Anonymous test case 1" filename="projects/<exe-name>/VariadicMacrosTests.cpp" > <OverallResult success="true"/> </TestCase> - <TestCase name="AnyOf matcher" tags="[matchers]" filename="projects/<exe-name>/MatchersTests.cpp" > - <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MatchersTests.cpp" > - <Original> - testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) - </Original> - <Expanded> - "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) - </Expanded> - </Expression> - <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/MatchersTests.cpp" > - <Original> - testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) - </Original> - <Expanded> - "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> <TestCase name="Approximate PI" tags="[Approx][PI]" filename="projects/<exe-name>/ApproxTests.cpp" > <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" > <Original> @@ -8306,7 +8276,7 @@ loose text artifact </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="763" failures="103" expectedFailures="21"/> + <OverallResults successes="760" failures="103" expectedFailures="21"/> </Group> - <OverallResults successes="763" failures="102" expectedFailures="21"/> + <OverallResults successes="760" failures="102" expectedFailures="21"/> </Catch>