Fixed test names mentioning the new Matcher combinator operators
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 73cef33..2b312e6 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -708,7 +708,7 @@
"this string contains 'abc' as a substring" equals: "something else"
-------------------------------------------------------------------------------
-Matchers can be composed with both + and | - failing
+Matchers can be composed with both && and || - failing
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 082fa32..edfedde 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -3419,7 +3419,7 @@
'abc' as a substring"
-------------------------------------------------------------------------------
-Matchers can be (AllOf) composed with the + operator
+Matchers can be (AllOf) composed with the && operator
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
@@ -3432,7 +3432,7 @@
contains: "abc" and contains: "substring" and contains: "contains" )
-------------------------------------------------------------------------------
-Matchers can be (AnyOf) composed with the | operator
+Matchers can be (AnyOf) composed with the || operator
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
@@ -3452,7 +3452,7 @@
"string" or contains: "different" or contains: "random" )
-------------------------------------------------------------------------------
-Matchers can be composed with both + and |
+Matchers can be composed with both && and ||
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
@@ -3465,7 +3465,7 @@
contains: "different" ) and contains: "substring" )
-------------------------------------------------------------------------------
-Matchers can be composed with both + and | - failing
+Matchers can be composed with both && and || - failing
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 039aeaa..0243909 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -438,10 +438,10 @@
<testcase classname="global" name="AllOf matcher" time="{duration}"/>
<testcase classname="global" name="AnyOf matcher" time="{duration}"/>
<testcase classname="global" name="Equals" time="{duration}"/>
- <testcase classname="global" name="Matchers can be (AllOf) composed with the + operator" time="{duration}"/>
- <testcase classname="global" name="Matchers can be (AnyOf) composed with the | operator" time="{duration}"/>
- <testcase classname="global" name="Matchers can be composed with both + and |" time="{duration}"/>
- <testcase classname="global" name="Matchers can be composed with both + and | - failing" time="{duration}">
+ <testcase classname="global" name="Matchers can be (AllOf) composed with the && operator" time="{duration}"/>
+ <testcase classname="global" name="Matchers can be (AnyOf) composed with the || operator" time="{duration}"/>
+ <testcase classname="global" name="Matchers can be composed with both && and ||" time="{duration}"/>
+ <testcase classname="global" name="Matchers can be composed with both && and || - failing" time="{duration}">
<failure message=""this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )" type="CHECK_THAT">
MiscTests.cpp:<line number>
</failure>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index ed4ce49..f185891 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -3590,7 +3590,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="Matchers can be (AllOf) composed with the + operator">
+ <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" )
@@ -3601,7 +3601,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
- <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" >
<Original>
testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" )
@@ -3620,7 +3620,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="Matchers can be composed with both + and |">
+ <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" )
@@ -3631,7 +3631,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="Matchers can be composed with both + and | - failing">
+ <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" )
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index c2a7784..cf7f48c 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -262,7 +262,7 @@
CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) );
}
-TEST_CASE("Matchers can be (AllOf) composed with the + operator", "[matchers][operators][operator+]")
+TEST_CASE("Matchers can be (AllOf) composed with the && operator", "[matchers][operators][operator&&]")
{
CHECK_THAT( testStringForMatching(),
Contains( "string" ) &&
@@ -271,18 +271,18 @@
Contains( "contains" ) );
}
-TEST_CASE("Matchers can be (AnyOf) composed with the | operator", "[matchers][operators][operator|]")
+TEST_CASE("Matchers can be (AnyOf) composed with the || operator", "[matchers][operators][operator||]")
{
CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
}
-TEST_CASE("Matchers can be composed with both + and |", "[matchers][operators][operator|][operator+]")
+TEST_CASE("Matchers can be composed with both && and ||", "[matchers][operators][operator||][operator&&]")
{
CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) );
}
-TEST_CASE("Matchers can be composed with both + and | - failing", "[matchers][operators][operator|][operator+][.failing]")
+TEST_CASE("Matchers can be composed with both && and || - failing", "[matchers][operators][operator||][operator&&][.failing]")
{
CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) );
}