rebased following recent changes
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index ae45f32..ee8d807 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -830,6 +830,6 @@
"first" == "second"
===============================================================================
-test cases: 168 | 124 passed | 42 failed | 2 failed as expected
-assertions: 920 | 824 passed | 78 failed | 18 failed as expected
+test cases: 169 | 125 passed | 42 failed | 2 failed as expected
+assertions: 921 | 825 passed | 78 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index e0a4903..3359a0f 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -3920,9 +3920,9 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE( encode( "[\x01]" ) == "[]" )
+ REQUIRE( encode( "[\x01]" ) == "[]" )
with expansion:
- "[]" == "[]"
+ "[]" == "[]"
-------------------------------------------------------------------------------
XmlEncode
@@ -3933,9 +3933,9 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE( encode( "[\x7F]" ) == "[]" )
+ REQUIRE( encode( "[\x7F]" ) == "[]" )
with expansion:
- "[]" == "[]"
+ "[]" == "[]"
-------------------------------------------------------------------------------
long long
@@ -3963,6 +3963,17 @@
oops!
-------------------------------------------------------------------------------
+# A test name that starts with a #
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+with message:
+ yay
+
+-------------------------------------------------------------------------------
Process can be configured on command line
default - no arguments
-------------------------------------------------------------------------------
@@ -9104,6 +9115,6 @@
1 > 0
===============================================================================
-test cases: 168 | 123 passed | 43 failed | 2 failed as expected
-assertions: 922 | 824 passed | 80 failed | 18 failed as expected
+test cases: 169 | 124 passed | 43 failed | 2 failed as expected
+assertions: 923 | 825 passed | 80 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index e3268bc..3fd998f 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,6 @@
+<?xml version="1.1" encoding="UTF-8"?>
<testsuites>
- <testsuite name="CatchSelfTest" errors="13" failures="68" tests="923" hostname="tbd" time="{duration}" timestamp="tbd">
+ <testsuite name="CatchSelfTest" errors="13" failures="68" tests="924" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="toString(enum)" time="{duration}"/>
<testcase classname="global" name="toString(enum w/operator<<)" time="{duration}"/>
<testcase classname="global" name="toString(enum class)" time="{duration}"/>
@@ -500,6 +501,7 @@
<testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/>
<testcase classname="global" name="long long" time="{duration}"/>
<testcase classname="global" name="This test 'should' fail but doesn't" time="{duration}"/>
+ <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="default - no arguments" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index be30de5..ed730bb 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,3 +1,4 @@
+<?xml version="1.1" encoding="UTF-8"?>
<Catch name="CatchSelfTest">
<Group name="CatchSelfTest">
<TestCase name="toString(enum)">
@@ -4051,10 +4052,10 @@
<Section name="string with control char (1)">
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- encode( "[\x01]" ) == "[&#x1]"
+ encode( "[\x01]" ) == "[&#x01;]"
</Original>
<Expanded>
- "[&#x1]" == "[&#x1]"
+ "[&#x01;]" == "[&#x01;]"
</Expanded>
</Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -4062,10 +4063,10 @@
<Section name="string with control char (x7F)">
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
<Original>
- encode( "[\x7F]" ) == "[&#x7F]"
+ encode( "[\x7F]" ) == "[&#x7F;]"
</Original>
<Expanded>
- "[&#x7F]" == "[&#x7F]"
+ "[&#x7F;]" == "[&#x7F;]"
</Expanded>
</Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/>
@@ -4088,6 +4089,9 @@
<TestCase name="This test 'should' fail but doesn't">
<OverallResult success="false"/>
</TestCase>
+ <TestCase name="# A test name that starts with a #">
+ <OverallResult success="true"/>
+ </TestCase>
<TestCase name="Process can be configured on command line">
<Section name="default - no arguments">
<Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
@@ -9566,7 +9570,7 @@
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="824" failures="81" expectedFailures="18"/>
+ <OverallResults successes="825" failures="81" expectedFailures="18"/>
</Group>
- <OverallResults successes="824" failures="80" expectedFailures="18"/>
+ <OverallResults successes="825" failures="80" expectedFailures="18"/>
</Catch>