commit 976a6554960e2cd3c5d39c7d84bbef1af4d762e5
author Phil Nash <github@philnash.me> Mon Jan 09 14:12:12 2017 +0000
committer Phil Nash <github@philnash.me> Mon Jan 09 14:37:28 2017 +0000
tree 35152f9c459b093e2b43a5582811b0d5c00f743e
parent 37e1e243093052b540de78dd50c78be51b5728d2

Approval tests can use Catch path fixed in env. var, and convert nullptr and __null to 0 for comparison

projects/SelfTest/Baselines/xml.sw.approved.txt

diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 3dd64de..b031e4d 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1015,7 +1015,7 @@
     <TestCase name="Equals string matcher, with NULL">
       <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          "", Equals(nullptr)
+          "", Equals(0)
         </Original>
         <Expanded>
           "" equals: ""
@@ -5709,10 +5709,10 @@
     <TestCase name="Pointers can be compared to null">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          p == nullptr
+          p == 0
         </Original>
         <Expanded>
-          NULL == nullptr
+          NULL == 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
@@ -5725,50 +5725,50 @@
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          p != nullptr
+          p != 0
         </Original>
         <Expanded>
-          0x<hex digits> != nullptr
+          0x<hex digits> != 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          cp != nullptr
+          cp != 0
         </Original>
         <Expanded>
-          0x<hex digits> != nullptr
+          0x<hex digits> != 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          cpc != nullptr
+          cpc != 0
         </Original>
         <Expanded>
-          0x<hex digits> != nullptr
+          0x<hex digits> != 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          returnsNull() == nullptr
+          returnsNull() == 0
         </Original>
         <Expanded>
-          {null string} == nullptr
+          {null string} == 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          returnsConstNull() == nullptr
+          returnsConstNull() == 0
         </Original>
         <Expanded>
-          {null string} == nullptr
+          {null string} == 0
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          nullptr != p
+          0 != p
         </Original>
         <Expanded>
-          nullptr != 0x<hex digits>
+          0 != 0x<hex digits>
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
@@ -8318,10 +8318,10 @@
     <TestCase name="boolean member">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          obj.prop != nullptr
+          obj.prop != 0
         </Original>
         <Expanded>
-          0x<hex digits> != nullptr
+          0x<hex digits> != 0
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
@@ -8709,7 +8709,7 @@
     <TestCase name="null strings">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          makeString( false ) != static_cast&lt;char*>(nullptr)
+          makeString( false ) != static_cast&lt;char*>(0)
         </Original>
         <Expanded>
           "valid string" != {null string}
@@ -8717,7 +8717,7 @@
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          makeString( true ) == static_cast&lt;char*>(nullptr)
+          makeString( true ) == static_cast&lt;char*>(0)
         </Original>
         <Expanded>
           {null string} == {null string}
@@ -8728,10 +8728,10 @@
     <TestCase name="null_ptr">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          ptr.get() == nullptr
+          ptr.get() == 0
         </Original>
         <Expanded>
-          NULL == nullptr
+          NULL == 0
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
@@ -9264,15 +9264,15 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="tuple&lt;nullptr,int,const char *>">
+    <TestCase name="tuple&lt;0,int,const char *>">
       <Expression success="true" type="CHECK" filename="projects/SelfTest/ToStringTuple.cpp" >
         <Original>
-          "{ nullptr, 42, \"Catch me\" }" == Catch::toString(value)
+          "{ 0, 42, \"Catch me\" }" == Catch::toString(value)
         </Original>
         <Expanded>
-          "{ nullptr, 42, "Catch me" }"
+          "{ 0, 42, "Catch me" }"
 ==
-"{ nullptr, 42, "Catch me" }"
+"{ 0, 42, "Catch me" }"
         </Expanded>
       </Expression>
       <OverallResult success="true"/>