3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 05:59:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rebased approvals following previous reversal (d’oh!)

Browse Source
This commit is contained in:
Phil Nash
2017-02-06 16:23:34 +00:00
parent 88b760276d
commit 1f5ec9884c
4 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/SelfTest/Baselines/console.std.approved.txt
View File

@@ -830,5 +830,5 @@ with expansion:
=============================================================================== ===============================================================================
test cases: 157 | 113 passed | 42 failed | 2 failed as expected test cases: 157 | 113 passed | 42 failed | 2 failed as expected
assertions: 913 | 817 passed | 78 failed | 18 failed as expected assertions: 915 | 819 passed | 78 failed | 18 failed as expected

36
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@@ -7982,27 +7982,53 @@ with expansion:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
XmlEncode XmlEncode
string with control char (1) string with control char (1) (XML 1.0)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
MiscTests.cpp:<line number> MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE( encode( "[\x01]" ) == "[&#x01;]" ) REQUIRE( encode( "[\x01]" ) == "[\\x01]" )
with expansion:
"[\x01]" == "[\x01]"
-------------------------------------------------------------------------------
XmlEncode
string with control char (1) (XMl 1.1)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x01]", Catch::XmlEncode::ForTextNodes, Catch::XmlEncode::_1_1 ) == "[&#x01;]" )
with expansion: with expansion:
"[&#x01;]" == "[&#x01;]" "[&#x01;]" == "[&#x01;]"
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
XmlEncode XmlEncode
string with control char (x7F) string with control char (x7F) (XML 1.0)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
MiscTests.cpp:<line number> MiscTests.cpp:<line number>
............................................................................... ...............................................................................
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" ) REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" )
with expansion:
"[\x7F]" == "[\x7F]"
-------------------------------------------------------------------------------
XmlEncode
string with control char (x7F) (XML 1.1)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
REQUIRE( encode( "[\x7F]", Catch::XmlEncode::ForTextNodes, Catch::XmlEncode::_1_1 ) == "[&#x7F;]" )
with expansion: with expansion:
"[&#x7F;]" == "[&#x7F;]" "[&#x7F;]" == "[&#x7F;]"
@@ -9026,5 +9052,5 @@ PASSED:
=============================================================================== ===============================================================================
test cases: 157 | 112 passed | 43 failed | 2 failed as expected test cases: 157 | 112 passed | 43 failed | 2 failed as expected
assertions: 915 | 817 passed | 80 failed | 18 failed as expected assertions: 917 | 819 passed | 80 failed | 18 failed as expected

10
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<testsuites> <testsuites>
<testsuite name="<exe-name>" errors="13" failures="68" tests="916" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testsuite name="<exe-name>" errors="13" failures="68" tests="918" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<testcase classname="global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="global" name="'Not' checks that should fail" time="{duration}"> <testcase classname="global" name="'Not' checks that should fail" time="{duration}">
<failure message="false != false" type="CHECK"> <failure message="false != false" type="CHECK">
@@ -538,8 +538,10 @@ ExceptionTests.cpp:<line number>
<testcase classname="XmlEncode" name="string with less-than" time="{duration}"/> <testcase classname="XmlEncode" name="string with less-than" time="{duration}"/>
<testcase classname="XmlEncode" name="string with greater-than" time="{duration}"/> <testcase classname="XmlEncode" name="string with greater-than" time="{duration}"/>
<testcase classname="XmlEncode" name="string with quotes" time="{duration}"/> <testcase classname="XmlEncode" name="string with quotes" time="{duration}"/>
<testcase classname="XmlEncode" name="string with control char (1)" time="{duration}"/> <testcase classname="XmlEncode" name="string with control char (1) (XML 1.0)" time="{duration}"/>
<testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/> <testcase classname="XmlEncode" name="string with control char (1) (XMl 1.1)" time="{duration}"/>
<testcase classname="XmlEncode" name="string with control char (x7F) (XML 1.0)" time="{duration}"/>
<testcase classname="XmlEncode" name="string with control char (x7F) (XML 1.1)" time="{duration}"/>
<testcase classname="global" name="atomic if" time="{duration}"/> <testcase classname="global" name="atomic if" time="{duration}"/>
<testcase classname="global" name="boolean member" time="{duration}"/> <testcase classname="global" name="boolean member" time="{duration}"/>
<testcase classname="global" name="checkedElse" time="{duration}"/> <testcase classname="global" name="checkedElse" time="{duration}"/>

36
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Catch name="<exe-name>"> <Catch name="<exe-name>">
<Group name="<exe-name>"> <Group name="<exe-name>">
<TestCase name="# A test name that starts with a #"> <TestCase name="# A test name that starts with a #">
@@ -8462,10 +8462,21 @@ there"
</Expression> </Expression>
<OverallResults successes="2" failures="0" expectedFailures="0"/> <OverallResults successes="2" failures="0" expectedFailures="0"/>
</Section> </Section>
<Section name="string with control char (1)"> <Section name="string with control char (1) (XML 1.0)">
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" > <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original> <Original>
encode( "[\x01]" ) == "[&amp;#x01;]" encode( "[\x01]" ) == "[\\x01]"
</Original>
<Expanded>
"[\x01]" == "[\x01]"
</Expanded>
</Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section>
<Section name="string with control char (1) (XMl 1.1)">
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original>
encode( "[\x01]", Catch::XmlEncode::ForTextNodes, Catch::XmlEncode::_1_1 ) == "[&amp;#x01;]"
</Original> </Original>
<Expanded> <Expanded>
"[&amp;#x01;]" == "[&amp;#x01;]" "[&amp;#x01;]" == "[&amp;#x01;]"
@@ -8473,10 +8484,21 @@ there"
</Expression> </Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<Section name="string with control char (x7F)"> <Section name="string with control char (x7F) (XML 1.0)">
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" > <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original> <Original>
encode( "[\x7F]" ) == "[&amp;#x7F;]" encode( "[\x7F]" ) == "[\\x7F]"
</Original>
<Expanded>
"[\x7F]" == "[\x7F]"
</Expanded>
</Expression>
<OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section>
<Section name="string with control char (x7F) (XML 1.1)">
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original>
encode( "[\x7F]", Catch::XmlEncode::ForTextNodes, Catch::XmlEncode::_1_1 ) == "[&amp;#x7F;]"
</Original> </Original>
<Expanded> <Expanded>
"[&amp;#x7F;]" == "[&amp;#x7F;]" "[&amp;#x7F;]" == "[&amp;#x7F;]"
@@ -9520,7 +9542,7 @@ there"
</Section> </Section>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<OverallResults successes="817" failures="81" expectedFailures="18"/> <OverallResults successes="819" failures="81" expectedFailures="18"/>
</Group> </Group>
<OverallResults successes="817" failures="80" expectedFailures="18"/> <OverallResults successes="819" failures="80" expectedFailures="18"/>
</Catch> </Catch>