Approvals for Matcher change (added comma)
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 976a710..7bbae96 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -680,7 +680,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() Contains( "not there" ) )
+ CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
with expansion:
"this string contains 'abc' as a substring" contains: "not there"
@@ -691,7 +691,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
+ CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
with expansion:
"this string contains 'abc' as a substring" starts with: "string"
@@ -702,7 +702,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
+ CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
with expansion:
"this string contains 'abc' as a substring" ends with: "this"
@@ -713,7 +713,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() Equals( "something else" ) )
+ CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
with expansion:
"this string contains 'abc' as a substring" equals: "something else"
@@ -724,7 +724,7 @@
...............................................................................
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:
"this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "random" )
@@ -736,7 +736,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() !Contains( "substring" ) )
+ CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
with expansion:
"this string contains 'abc' as a substring" not contains: "substring"
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 4f3800b..d8c0b9b 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -3304,25 +3304,25 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
+ REQUIRE_THAT( testStringForMatching(), Contains( "string" ) )
with expansion:
"this string contains 'abc' as a substring" contains: "string"
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() Contains( "abc" ) )
+ CHECK_THAT( testStringForMatching(), Contains( "abc" ) )
with expansion:
"this string contains 'abc' as a substring" contains: "abc"
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
+ CHECK_THAT( testStringForMatching(), StartsWith( "this" ) )
with expansion:
"this string contains 'abc' as a substring" starts with: "this"
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
+ CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
with expansion:
"this string contains 'abc' as a substring" ends with: "substring"
@@ -3333,7 +3333,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() Contains( "not there" ) )
+ CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
with expansion:
"this string contains 'abc' as a substring" contains: "not there"
@@ -3344,7 +3344,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
+ CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
with expansion:
"this string contains 'abc' as a substring" starts with: "string"
@@ -3355,7 +3355,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
+ CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
with expansion:
"this string contains 'abc' as a substring" ends with: "this"
@@ -3366,7 +3366,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() Equals( "something else" ) )
+ CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
with expansion:
"this string contains 'abc' as a substring" equals: "something else"
@@ -3378,7 +3378,7 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE_THAT( "" Equals(nullptr) )
+ REQUIRE_THAT( "", Equals(nullptr) )
with expansion:
"" equals: ""
@@ -3390,7 +3390,7 @@
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
+ CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
with expansion:
"this string contains 'abc' as a substring" ( contains: "string" and
contains: "abc" )
@@ -3403,14 +3403,14 @@
MiscTests.cpp:<line number>:
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:
"this string contains 'abc' as a substring" ( contains: "string" or contains:
"not there" )
MiscTests.cpp:<line number>:
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:
"this string contains 'abc' as a substring" ( contains: "not there" or
contains: "string" )
@@ -3423,7 +3423,7 @@
MiscTests.cpp:<line number>:
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:
"this string contains 'abc' as a substring" equals: "this string contains
'abc' as a substring"
@@ -3436,7 +3436,7 @@
MiscTests.cpp:<line number>:
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:
"this string contains 'abc' as a substring" ( contains: "string" and
contains: "abc" and contains: "substring" and contains: "contains" )
@@ -3449,14 +3449,14 @@
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+ CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
with expansion:
"this string contains 'abc' as a substring" ( contains: "string" or contains:
"different" or contains: "random" )
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+ CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
with expansion:
"some completely different text that contains one common word" ( contains:
"string" or contains: "different" or contains: "random" )
@@ -3469,7 +3469,7 @@
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
+ CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
with expansion:
"this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "substring" )
@@ -3481,7 +3481,7 @@
...............................................................................
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:
"this string contains 'abc' as a substring" ( ( contains: "string" or
contains: "different" ) and contains: "random" )
@@ -3494,7 +3494,7 @@
MiscTests.cpp:<line number>:
PASSED:
- CHECK_THAT( testStringForMatching() !Contains( "different" ) )
+ CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
with expansion:
"this string contains 'abc' as a substring" not contains: "different"
@@ -3505,7 +3505,7 @@
...............................................................................
MiscTests.cpp:<line number>: FAILED:
- CHECK_THAT( testStringForMatching() !Contains( "substring" ) )
+ CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
with expansion:
"this string contains 'abc' as a substring" not contains: "substring"
@@ -4224,7 +4224,7 @@
TestMain.cpp:<line number>:
PASSED:
- REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
+ REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) )
with expansion:
"Value after -x or --abortAfter must be greater than zero
- while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero"
@@ -4239,7 +4239,7 @@
TestMain.cpp:<line number>:
PASSED:
- REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) )
+ REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) )
with expansion:
"Unable to convert oops to destination type
- while parsing: (-x, --abortx <no. failures>)" contains: "-x"
@@ -5000,7 +5000,7 @@
TestMain.cpp:<line number>:
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:
"***************************************************************************-
***-
@@ -8783,7 +8783,7 @@
TagAliasTests.cpp:<line number>:
PASSED:
- CHECK_THAT( what Contains( "[@zzz]" ) )
+ CHECK_THAT( what, Contains( "[@zzz]" ) )
with expansion:
"error: tag alias, "[@zzz]" already registered.
First seen at file:2
@@ -8792,7 +8792,7 @@
TagAliasTests.cpp:<line number>:
PASSED:
- CHECK_THAT( what Contains( "file" ) )
+ CHECK_THAT( what, Contains( "file" ) )
with expansion:
"error: tag alias, "[@zzz]" already registered.
First seen at file:2
@@ -8801,7 +8801,7 @@
TagAliasTests.cpp:<line number>:
PASSED:
- CHECK_THAT( what Contains( "2" ) )
+ CHECK_THAT( what, Contains( "2" ) )
with expansion:
"error: tag alias, "[@zzz]" already registered.
First seen at file:2
@@ -8810,7 +8810,7 @@
TagAliasTests.cpp:<line number>:
PASSED:
- CHECK_THAT( what Contains( "10" ) )
+ CHECK_THAT( what, Contains( "10" ) )
with expansion:
"error: tag alias, "[@zzz]" already registered.
First seen at file:2
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 407c892..e88e47e 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -3468,7 +3468,7 @@
<TestCase name="String matchers">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Contains( "string" )
+ testStringForMatching(), Contains( "string" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" contains: "string"
@@ -3476,7 +3476,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Contains( "abc" )
+ testStringForMatching(), Contains( "abc" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" contains: "abc"
@@ -3484,7 +3484,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() StartsWith( "this" )
+ testStringForMatching(), StartsWith( "this" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" starts with: "this"
@@ -3492,7 +3492,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() EndsWith( "substring" )
+ testStringForMatching(), EndsWith( "substring" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ends with: "substring"
@@ -3503,7 +3503,7 @@
<TestCase name="Contains string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Contains( "not there" )
+ testStringForMatching(), Contains( "not there" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" contains: "not there"
@@ -3514,7 +3514,7 @@
<TestCase name="StartsWith string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() StartsWith( "string" )
+ testStringForMatching(), StartsWith( "string" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" starts with: "string"
@@ -3525,7 +3525,7 @@
<TestCase name="EndsWith string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() EndsWith( "this" )
+ testStringForMatching(), EndsWith( "this" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ends with: "this"
@@ -3536,7 +3536,7 @@
<TestCase name="Equals string matcher">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Equals( "something else" )
+ testStringForMatching(), Equals( "something else" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" equals: "something else"
@@ -3547,7 +3547,7 @@
<TestCase name="Equals string matcher, with NULL">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- "" Equals(nullptr)
+ "", Equals(nullptr)
</Original>
<Expanded>
"" equals: ""
@@ -3558,7 +3558,7 @@
<TestCase name="AllOf matcher">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
+ testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
@@ -3569,7 +3569,7 @@
<TestCase name="AnyOf matcher">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
+ testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
@@ -3577,7 +3577,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
+ testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
@@ -3588,7 +3588,7 @@
<TestCase name="Equals">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Equals( "this string contains 'abc' as a substring" )
+ testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
@@ -3599,7 +3599,7 @@
<TestCase name="Matchers can be (AllOf) composed with the && operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" )
+ testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" )
@@ -3610,7 +3610,7 @@
<TestCase name="Matchers can be (AnyOf) composed with the || operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" )
+ testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
@@ -3618,7 +3618,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" )
+ testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
</Original>
<Expanded>
"some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" )
@@ -3629,7 +3629,7 @@
<TestCase name="Matchers can be composed with both && and ||">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" )
+ testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" )
@@ -3640,7 +3640,7 @@
<TestCase name="Matchers can be composed with both && and || - failing">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" )
+ testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )
@@ -3651,7 +3651,7 @@
<TestCase name="Matchers can be negated (Not) with the ! operator">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() !Contains( "different" )
+ testStringForMatching(), !Contains( "different" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" not contains: "different"
@@ -3662,7 +3662,7 @@
<TestCase name="Matchers can be negated (Not) with the ! operator - failing">
<Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- testStringForMatching() !Contains( "substring" )
+ testStringForMatching(), !Contains( "substring" )
</Original>
<Expanded>
"this string contains 'abc' as a substring" not contains: "substring"
@@ -4415,7 +4415,7 @@
<Section name="-x must be greater than zero">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original>
- parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" )
+ parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" )
</Original>
<Expanded>
"Value after -x or --abortAfter must be greater than zero
@@ -4430,7 +4430,7 @@
<Section name="-x must be numeric">
<Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original>
- parseIntoConfigAndReturnError( argv, config ) Contains( "-x" )
+ parseIntoConfigAndReturnError( argv, config ), Contains( "-x" )
</Original>
<Expanded>
"Unable to convert oops to destination type
@@ -5276,7 +5276,7 @@
<TestCase name="Long text is truncted">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" >
<Original>
- t.toString() EndsWith( "... message truncated due to excessive size" )
+ t.toString(), EndsWith( "... message truncated due to excessive size" )
</Original>
<Expanded>
"******************************************************************************-
@@ -9254,7 +9254,7 @@
<Section name="The same tag alias can only be registered once">
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original>
- what Contains( "[@zzz]" )
+ what, Contains( "[@zzz]" )
</Original>
<Expanded>
"error: tag alias, "[@zzz]" already registered.
@@ -9264,7 +9264,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original>
- what Contains( "file" )
+ what, Contains( "file" )
</Original>
<Expanded>
"error: tag alias, "[@zzz]" already registered.
@@ -9274,7 +9274,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original>
- what Contains( "2" )
+ what, Contains( "2" )
</Original>
<Expanded>
"error: tag alias, "[@zzz]" already registered.
@@ -9284,7 +9284,7 @@
</Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
<Original>
- what Contains( "10" )
+ what, Contains( "10" )
</Original>
<Expanded>
"error: tag alias, "[@zzz]" already registered.