3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed test for invoking String Matcher with NULL (this will no longer be supported)

This commit is contained in:
Phil Nash 2017-02-08 15:20:39 +00:00
parent 29fa1edcc7
commit 5530303be7
5 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -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

16
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@ -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

3
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@ -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}"/>

15
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@ -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>

5
projects/SelfTest/MiscTests.cpp
View File

@ -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" ) ) );