rebased following recent changes

This commit is contained in:
Phil Nash 2016-09-27 10:28:11 +01:00
parent b1eeec7c69
commit 31861bbd46
4 changed files with 32 additions and 15 deletions

View File

@ -830,6 +830,6 @@ with expansion:
"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

View File

@ -3920,9 +3920,9 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x01]" ) == "[&#x1]" )
REQUIRE( encode( "[\x01]" ) == "[&#x01;]" )
with expansion:
"[&#x1]" == "[&#x1]"
"[&#x01;]" == "[&#x01;]"
-------------------------------------------------------------------------------
XmlEncode
@ -3933,9 +3933,9 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x7F]" ) == "[&#x7F]" )
REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" )
with expansion:
"[&#x7F]" == "[&#x7F]"
"[&#x7F;]" == "[&#x7F;]"
-------------------------------------------------------------------------------
long long
@ -3962,6 +3962,17 @@ PASSED:
with message:
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 @@ with expansion:
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

View File

@ -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&lt;&lt;)" time="{duration}"/>
<testcase classname="global" name="toString(enum class)" time="{duration}"/>
@ -500,6 +501,7 @@ MiscTests.cpp:<line number>
<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}"/>

View File

@ -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]" ) == "[&amp;#x1]"
encode( "[\x01]" ) == "[&amp;#x01;]"
</Original>
<Expanded>
"[&amp;#x1]" == "[&amp;#x1]"
"[&amp;#x01;]" == "[&amp;#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]" ) == "[&amp;#x7F]"
encode( "[\x7F]" ) == "[&amp;#x7F;]"
</Original>
<Expanded>
"[&amp;#x7F]" == "[&amp;#x7F]"
"[&amp;#x7F;]" == "[&amp;#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 @@ there"
</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>