From 1f5ec9884cc51747fcaa2116b12e70f09a48c85f Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Mon, 6 Feb 2017 16:23:34 +0000
Subject: [PATCH] =?UTF-8?q?Rebased=20approvals=20following=20previous=20re?=
 =?UTF-8?q?versal=20(d=E2=80=99oh!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Baselines/console.std.approved.txt        |  2 +-
 .../Baselines/console.sw.approved.txt         | 36 ++++++++++++++++---
 .../SelfTest/Baselines/junit.sw.approved.txt  | 10 +++---
 .../SelfTest/Baselines/xml.sw.approved.txt    | 36 +++++++++++++++----
 4 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index ea2e1008..b5f4a482 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -830,5 +830,5 @@ with expansion:
 
 ===============================================================================
 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
 
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 2ea4dd0b..fb34373b 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -7982,27 +7982,53 @@ with expansion:
 
 -------------------------------------------------------------------------------
 XmlEncode
-  string with control char (1)
+  string with control char (1) (XML 1.0)
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>:
 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:
   "[&#x01;]" == "[&#x01;]"
 
 -------------------------------------------------------------------------------
 XmlEncode
-  string with control char (x7F)
+  string with control char (x7F) (XML 1.0)
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>:
 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:
   "[&#x7F;]" == "[&#x7F;]"
 
@@ -9026,5 +9052,5 @@ PASSED:
 
 ===============================================================================
 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
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 55ee56c9..e7e650de 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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="'Not' checks that should fail" time="{duration}">
       <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 greater-than" 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 (x7F)" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with control char (1) (XML 1.0)" 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="boolean member" time="{duration}"/>
     <testcase classname="global" name="checkedElse" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 354ed640..ccb4864b 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Catch name="<exe-name>">
   <Group name="<exe-name>">
     <TestCase name="# A test name that starts with a #">
@@ -8462,10 +8462,21 @@ there"
         </Expression>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </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" >
           <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>
           <Expanded>
             "[&amp;#x01;]" == "[&amp;#x01;]"
@@ -8473,10 +8484,21 @@ there"
         </Expression>
         <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </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" >
           <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>
           <Expanded>
             "[&amp;#x7F;]" == "[&amp;#x7F;]"
@@ -9520,7 +9542,7 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="817" failures="81" expectedFailures="18"/>
+    <OverallResults successes="819" failures="81" expectedFailures="18"/>
   </Group>
-  <OverallResults successes="817" failures="80" expectedFailures="18"/>
+  <OverallResults successes="819" failures="80" expectedFailures="18"/>
 </Catch>