Re-enable 2 string tests
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 925c54d..00eb998 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -8409,7 +8409,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="toString( vectors<has_maker )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+ <TestCase name="toString( vectors<has_maker> )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
<Original>
::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker> }"
@@ -8422,6 +8422,32 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
+ <TestCase name="toString( vectors<has_maker_and_operator> )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+ <Original>
+ ::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker_and_operator> }"
+ </Original>
+ <Expanded>
+ "{ StringMaker<has_maker_and_operator> }"
+==
+"{ StringMaker<has_maker_and_operator> }"
+ </Expanded>
+ </Expression>
+ <OverallResult success="true"/>
+ </TestCase>
+ <TestCase name="toString( vectors<has_operator> )" tags="[toString]" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/UsageTests/ToStringWhich.tests.cpp" >
+ <Original>
+ ::Catch::Detail::stringify( v ) == "{ operator<<( has_operator ) }"
+ </Original>
+ <Expanded>
+ "{ operator<<( has_operator ) }"
+==
+"{ operator<<( has_operator ) }"
+ </Expanded>
+ </Expression>
+ <OverallResult success="true"/>
+ </TestCase>
<TestCase name="toString(enum class w/operator<<)" tags="[enum][enumClass][toString]" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
<Expression success="true" type="CHECK" filename="projects/<exe-name>/UsageTests/EnumToString.tests.cpp" >
<Original>
@@ -8863,7 +8889,7 @@
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="824" failures="107" expectedFailures="21"/>
+ <OverallResults successes="826" failures="107" expectedFailures="21"/>
</Group>
- <OverallResults successes="824" failures="106" expectedFailures="21"/>
+ <OverallResults successes="826" failures="106" expectedFailures="21"/>
</Catch>