3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 05:59:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Approvals for Matcher change (added comma)

Browse Source
This commit is contained in:
Phil Nash
2015-12-10 18:16:30 +00:00
parent 506b915f7f
commit 36cee598cf
3 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -680,7 +680,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() Contains( "not there" ) ) CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" contains: "not there" "this string contains 'abc' as a substring" contains: "not there"
@@ -691,7 +691,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() StartsWith( "string" ) ) CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" starts with: "string" "this string contains 'abc' as a substring" starts with: "string"
@@ -702,7 +702,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() EndsWith( "this" ) ) CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ends with: "this" "this string contains 'abc' as a substring" ends with: "this"
@@ -713,7 +713,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() Equals( "something else" ) ) CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" equals: "something else" "this string contains 'abc' as a substring" equals: "something else"
@@ -724,7 +724,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( ( contains: "string" or "this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "random" ) contains: "different" ) and contains: "random" )
@@ -736,7 +736,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() !Contains( "substring" ) ) CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" not contains: "substring" "this string contains 'abc' as a substring" not contains: "substring"

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

@@ -1984,25 +1984,25 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE_THAT( testStringForMatching() Contains( "string" ) ) REQUIRE_THAT( testStringForMatching(), Contains( "string" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" contains: "string" "this string contains 'abc' as a substring" contains: "string"
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() Contains( "abc" ) ) CHECK_THAT( testStringForMatching(), Contains( "abc" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" contains: "abc" "this string contains 'abc' as a substring" contains: "abc"
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() StartsWith( "this" ) ) CHECK_THAT( testStringForMatching(), StartsWith( "this" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" starts with: "this" "this string contains 'abc' as a substring" starts with: "this"
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() EndsWith( "substring" ) ) CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ends with: "substring" "this string contains 'abc' as a substring" ends with: "substring"
@@ -2013,7 +2013,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() Contains( "not there" ) ) CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" contains: "not there" "this string contains 'abc' as a substring" contains: "not there"
@@ -2024,7 +2024,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() StartsWith( "string" ) ) CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" starts with: "string" "this string contains 'abc' as a substring" starts with: "string"
@@ -2035,7 +2035,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() EndsWith( "this" ) ) CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ends with: "this" "this string contains 'abc' as a substring" ends with: "this"
@@ -2046,7 +2046,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() Equals( "something else" ) ) CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" equals: "something else" "this string contains 'abc' as a substring" equals: "something else"
@@ -2058,7 +2058,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE_THAT( "" Equals(nullptr) ) REQUIRE_THAT( "", Equals(nullptr) )
with expansion: with expansion:
"" equals: "" "" equals: ""
@@ -2070,7 +2070,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) ) CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( contains: "string" and "this string contains 'abc' as a substring" ( contains: "string" and
contains: "abc" ) contains: "abc" )
@@ -2083,14 +2083,14 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) ) CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( contains: "string" or contains: "this string contains 'abc' as a substring" ( contains: "string" or contains:
"not there" ) "not there" )
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( contains: "not there" or "this string contains 'abc' as a substring" ( contains: "not there" or
contains: "string" ) contains: "string" )
@@ -2103,7 +2103,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) ) CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" equals: "this string contains "this string contains 'abc' as a substring" equals: "this string contains
'abc' as a substring" 'abc' as a substring"
@@ -2116,7 +2116,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) ) CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( contains: "string" and "this string contains 'abc' as a substring" ( contains: "string" and
contains: "abc" and contains: "substring" and contains: "contains" ) contains: "abc" and contains: "substring" and contains: "contains" )
@@ -2129,14 +2129,14 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( contains: "string" or contains: "this string contains 'abc' as a substring" ( contains: "string" or contains:
"different" or contains: "random" ) "different" or contains: "random" )
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
with expansion: with expansion:
"some completely different text that contains one common word" ( contains: "some completely different text that contains one common word" ( contains:
"string" or contains: "different" or contains: "random" ) "string" or contains: "different" or contains: "random" )
@@ -2149,7 +2149,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) ) CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( ( contains: "string" or "this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "substring" ) contains: "different" ) and contains: "substring" )
@@ -2161,7 +2161,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" ( ( contains: "string" or "this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "random" ) contains: "different" ) and contains: "random" )
@@ -2174,7 +2174,7 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( testStringForMatching() !Contains( "different" ) ) CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" not contains: "different" "this string contains 'abc' as a substring" not contains: "different"
@@ -2185,7 +2185,7 @@ MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: FAILED: MiscTests.cpp:<line number>: FAILED:
CHECK_THAT( testStringForMatching() !Contains( "substring" ) ) CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
with expansion: with expansion:
"this string contains 'abc' as a substring" not contains: "substring" "this string contains 'abc' as a substring" not contains: "substring"
@@ -2904,7 +2904,7 @@ TestMain.cpp:<line number>
TestMain.cpp:<line number>: TestMain.cpp:<line number>:
PASSED: PASSED:
REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) )
with expansion: with expansion:
"Value after -x or --abortAfter must be greater than zero "Value after -x or --abortAfter must be greater than zero
- while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero" - while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero"
@@ -2919,7 +2919,7 @@ TestMain.cpp:<line number>
TestMain.cpp:<line number>: TestMain.cpp:<line number>:
PASSED: PASSED:
REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) ) REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) )
with expansion: with expansion:
"Unable to convert oops to destination type "Unable to convert oops to destination type
- while parsing: (-x, --abortx <no. failures>)" contains: "-x" - while parsing: (-x, --abortx <no. failures>)" contains: "-x"
@@ -3680,7 +3680,7 @@ TestMain.cpp:<line number>
TestMain.cpp:<line number>: TestMain.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( t.toString() EndsWith( "... message truncated due to excessive size" ) ) CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) )
with expansion: with expansion:
"***************************************************************************- "***************************************************************************-
***- ***-
@@ -7463,7 +7463,7 @@ TagAliasTests.cpp:<line number>
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what Contains( "[@zzz]" ) ) CHECK_THAT( what, Contains( "[@zzz]" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
First seen at file:2 First seen at file:2
@@ -7472,7 +7472,7 @@ with expansion:
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what Contains( "file" ) ) CHECK_THAT( what, Contains( "file" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
First seen at file:2 First seen at file:2
@@ -7481,7 +7481,7 @@ with expansion:
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what Contains( "2" ) ) CHECK_THAT( what, Contains( "2" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
First seen at file:2 First seen at file:2
@@ -7490,7 +7490,7 @@ with expansion:
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what Contains( "10" ) ) CHECK_THAT( what, Contains( "10" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
First seen at file:2 First seen at file:2

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

@@ -2294,7 +2294,7 @@
<TestCase name="String matchers"> <TestCase name="String matchers">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Contains( "string" ) testStringForMatching(), Contains( "string" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" contains: "string" "this string contains 'abc' as a substring" contains: "string"
@@ -2302,7 +2302,7 @@
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Contains( "abc" ) testStringForMatching(), Contains( "abc" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" contains: "abc" "this string contains 'abc' as a substring" contains: "abc"
@@ -2310,7 +2310,7 @@
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() StartsWith( "this" ) testStringForMatching(), StartsWith( "this" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" starts with: "this" "this string contains 'abc' as a substring" starts with: "this"
@@ -2318,7 +2318,7 @@
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() EndsWith( "substring" ) testStringForMatching(), EndsWith( "substring" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ends with: "substring" "this string contains 'abc' as a substring" ends with: "substring"
@@ -2329,7 +2329,7 @@
<TestCase name="Contains string matcher"> <TestCase name="Contains string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Contains( "not there" ) testStringForMatching(), Contains( "not there" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" contains: "not there" "this string contains 'abc' as a substring" contains: "not there"
@@ -2340,7 +2340,7 @@
<TestCase name="StartsWith string matcher"> <TestCase name="StartsWith string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() StartsWith( "string" ) testStringForMatching(), StartsWith( "string" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" starts with: "string" "this string contains 'abc' as a substring" starts with: "string"
@@ -2351,7 +2351,7 @@
<TestCase name="EndsWith string matcher"> <TestCase name="EndsWith string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() EndsWith( "this" ) testStringForMatching(), EndsWith( "this" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ends with: "this" "this string contains 'abc' as a substring" ends with: "this"
@@ -2362,7 +2362,7 @@
<TestCase name="Equals string matcher"> <TestCase name="Equals string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Equals( "something else" ) testStringForMatching(), Equals( "something else" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" equals: "something else" "this string contains 'abc' as a substring" equals: "something else"
@@ -2373,7 +2373,7 @@
<TestCase name="Equals string matcher, with NULL"> <TestCase name="Equals string matcher, with NULL">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
"" Equals(nullptr) "", Equals(nullptr)
</Original> </Original>
<Expanded> <Expanded>
"" equals: "" "" equals: ""
@@ -2384,7 +2384,7 @@
<TestCase name="AllOf matcher"> <TestCase name="AllOf matcher">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
@@ -2395,7 +2395,7 @@
<TestCase name="AnyOf matcher"> <TestCase name="AnyOf matcher">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
@@ -2403,7 +2403,7 @@
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
@@ -2414,7 +2414,7 @@
<TestCase name="Equals"> <TestCase name="Equals">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Equals( "this string contains 'abc' as a substring" ) testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
@@ -2425,7 +2425,7 @@
<TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator"> <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" ) testStringForMatching(), Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" ) "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" )
@@ -2436,7 +2436,7 @@
<TestCase name="Matchers can be (AnyOf) composed with the || operator"> <TestCase name="Matchers can be (AnyOf) composed with the || operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" ) "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
@@ -2444,7 +2444,7 @@
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
</Original> </Original>
<Expanded> <Expanded>
"some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" ) "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" )
@@ -2455,7 +2455,7 @@
<TestCase name="Matchers can be composed with both &amp;&amp; and ||"> <TestCase name="Matchers can be composed with both &amp;&amp; and ||">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" ) testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" ) "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" )
@@ -2466,7 +2466,7 @@
<TestCase name="Matchers can be composed with both &amp;&amp; and || - failing"> <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" ) testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" ) "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )
@@ -2477,7 +2477,7 @@
<TestCase name="Matchers can be negated (Not) with the ! operator"> <TestCase name="Matchers can be negated (Not) with the ! operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() !Contains( "different" ) testStringForMatching(), !Contains( "different" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" not contains: "different" "this string contains 'abc' as a substring" not contains: "different"
@@ -2488,7 +2488,7 @@
<TestCase name="Matchers can be negated (Not) with the ! operator - failing"> <TestCase name="Matchers can be negated (Not) with the ! operator - failing">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original> <Original>
testStringForMatching() !Contains( "substring" ) testStringForMatching(), !Contains( "substring" )
</Original> </Original>
<Expanded> <Expanded>
"this string contains 'abc' as a substring" not contains: "substring" "this string contains 'abc' as a substring" not contains: "substring"
@@ -3241,7 +3241,7 @@
<Section name="-x must be greater than zero"> <Section name="-x must be greater than zero">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" > <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original> <Original>
parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" )
</Original> </Original>
<Expanded> <Expanded>
"Value after -x or --abortAfter must be greater than zero "Value after -x or --abortAfter must be greater than zero
@@ -3256,7 +3256,7 @@
<Section name="-x must be numeric"> <Section name="-x must be numeric">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" > <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original> <Original>
parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) parseIntoConfigAndReturnError( argv, config ), Contains( "-x" )
</Original> </Original>
<Expanded> <Expanded>
"Unable to convert oops to destination type "Unable to convert oops to destination type
@@ -4102,7 +4102,7 @@ there"
<TestCase name="Long text is truncted"> <TestCase name="Long text is truncted">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original> <Original>
t.toString() EndsWith( "... message truncated due to excessive size" ) t.toString(), EndsWith( "... message truncated due to excessive size" )
</Original> </Original>
<Expanded> <Expanded>
"******************************************************************************- "******************************************************************************-
@@ -8080,7 +8080,7 @@ there"
<Section name="The same tag alias can only be registered once"> <Section name="The same tag alias can only be registered once">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original> <Original>
what Contains( "[@zzz]" ) what, Contains( "[@zzz]" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
@@ -8090,7 +8090,7 @@ there"
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original> <Original>
what Contains( "file" ) what, Contains( "file" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
@@ -8100,7 +8100,7 @@ there"
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original> <Original>
what Contains( "2" ) what, Contains( "2" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.
@@ -8110,7 +8110,7 @@ there"
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original> <Original>
what Contains( "10" ) what, Contains( "10" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, "[@zzz]" already registered.