Merged group name commit from develop

3 files changed, 704 insertions, 704 deletions

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index 42069b9f..e6303d88 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -37,7 +37,7 @@ namespace Catch {
 
             Totals totals;
 
-            context.testGroupStarting( "", 1, 1 ); // deprecated?
+            context.testGroupStarting( "all tests", 1, 1 ); // deprecated?
 
             TestSpec testSpec = m_config->testSpec();
             if( !testSpec.hasFilters() )
@@ -60,7 +60,7 @@ namespace Catch {
                     m_testsAlreadyRun.insert( *it );
                 }
             }
-            context.testGroupEnded( "", totals, 1, 1 );
+            context.testGroupEnded( "all tests", totals, 1, 1 );
             return totals;
         }
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 450c09fe..d0e29857 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite errors="12" failures="87" tests="729" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite name="all tests" errors="12" failures="87" tests="729" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 1789cb2e..498f899e 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,7 +1,7 @@
 <Catch name="CatchSelfTest">
-  <Group>
+  <Group name="all tests">
     <TestCase name="Some simple comparisons between doubles">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.23 )
         </Original>
@@ -9,7 +9,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.22 )
         </Original>
@@ -17,7 +17,7 @@
           1.23 != Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.24 )
         </Original>
@@ -25,7 +25,7 @@
           1.23 != Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) == 1.23
         </Original>
@@ -33,7 +33,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.22
         </Original>
@@ -41,7 +41,7 @@
           Approx( 1.23 ) != 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           Approx( d ) != 1.24
         </Original>
@@ -52,7 +52,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with different epsilons">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != Approx( 1.231 )
         </Original>
@@ -60,7 +60,7 @@
           1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
@@ -71,7 +71,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with floats">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.23f == Approx( 1.23f )
         </Original>
@@ -79,7 +79,7 @@
           1.23f == Approx( 1.2300000191 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0.0f == Approx( 0.0f )
         </Original>
@@ -90,7 +90,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with ints">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1 == Approx( 1 )
         </Original>
@@ -98,7 +98,7 @@
           1 == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( 0 )
         </Original>
@@ -109,7 +109,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate comparisons with mixed numeric types">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.0f == Approx( 1 )
         </Original>
@@ -117,7 +117,7 @@
           1.0f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( dZero)
         </Original>
@@ -125,7 +125,7 @@
           0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           0 == Approx( dSmall ).epsilon( 0.001 )
         </Original>
@@ -133,7 +133,7 @@
           0 == Approx( 0.00001 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           1.234f == Approx( dMedium )
         </Original>
@@ -141,7 +141,7 @@
           1.234f == Approx( 1.234 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           dMedium == Approx( 1.234f )
         </Original>
@@ -152,7 +152,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Use a custom approx">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.23 )
         </Original>
@@ -160,7 +160,7 @@
           1.23 == Approx( 1.23 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.22 )
         </Original>
@@ -168,7 +168,7 @@
           1.23 == Approx( 1.22 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d == approx( 1.24 )
         </Original>
@@ -176,7 +176,7 @@
           1.23 == Approx( 1.24 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           d != approx( 1.25 )
         </Original>
@@ -184,7 +184,7 @@
           1.23 != Approx( 1.25 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.23
         </Original>
@@ -192,7 +192,7 @@
           Approx( 1.23 ) == 1.23
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.22
         </Original>
@@ -200,7 +200,7 @@
           Approx( 1.23 ) == 1.22
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) == 1.24
         </Original>
@@ -208,7 +208,7 @@
           Approx( 1.23 ) == 1.24
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           approx( d ) != 1.25
         </Original>
@@ -219,7 +219,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Approximate PI">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
@@ -227,7 +227,7 @@
           3.1428571429 == Approx( 3.141 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ApproxTests.cpp" >
         <Original>
           divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
@@ -238,7 +238,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           s == &quot;hello&quot;
         </Original>
@@ -249,7 +249,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           s == &quot;world&quot;
         </Original>
@@ -260,7 +260,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           m_a == 1
         </Original>
@@ -271,7 +271,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A TEST_CASE_METHOD based test run that fails">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ClassTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ClassTests.cpp" >
         <Original>
           m_a == 2
         </Original>
@@ -282,7 +282,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Equality checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 7
         </Original>
@@ -290,7 +290,7 @@
           7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.1f )
         </Original>
@@ -298,7 +298,7 @@
           9.1f == Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415926535 )
         </Original>
@@ -306,7 +306,7 @@
           3.1415926535 == Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hello&quot;
         </Original>
@@ -314,7 +314,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           &quot;hello&quot; == data.str_hello
         </Original>
@@ -322,7 +322,7 @@
           &quot;hello&quot; == &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 5
         </Original>
@@ -330,7 +330,7 @@
           5 == 5
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.3 )
         </Original>
@@ -341,7 +341,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Equality checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 6
         </Original>
@@ -349,7 +349,7 @@
           7 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 8
         </Original>
@@ -357,7 +357,7 @@
           7 == 8
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven == 0
         </Original>
@@ -365,7 +365,7 @@
           7 == 0
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.11f )
         </Original>
@@ -373,7 +373,7 @@
           9.1f == Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 9.0f )
         </Original>
@@ -381,7 +381,7 @@
           9.1f == Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 1 )
         </Original>
@@ -389,7 +389,7 @@
           9.1f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one == Approx( 0 )
         </Original>
@@ -397,7 +397,7 @@
           9.1f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi == Approx( 3.1415 )
         </Original>
@@ -405,7 +405,7 @@
           3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;goodbye&quot;
         </Original>
@@ -413,7 +413,7 @@
           &quot;hello&quot; == &quot;goodbye&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hell&quot;
         </Original>
@@ -421,7 +421,7 @@
           &quot;hello&quot; == &quot;hell&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello == &quot;hello1&quot;
         </Original>
@@ -429,7 +429,7 @@
           &quot;hello&quot; == &quot;hello1&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() == 6
         </Original>
@@ -437,7 +437,7 @@
           5 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           x == Approx( 1.301 )
         </Original>
@@ -448,7 +448,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Inequality checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 6
         </Original>
@@ -456,7 +456,7 @@
           7 != 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 8
         </Original>
@@ -464,7 +464,7 @@
           7 != 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.11f )
         </Original>
@@ -472,7 +472,7 @@
           9.1f != Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.0f )
         </Original>
@@ -480,7 +480,7 @@
           9.1f != Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 1 )
         </Original>
@@ -488,7 +488,7 @@
           9.1f != Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 0 )
         </Original>
@@ -496,7 +496,7 @@
           9.1f != Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415 )
         </Original>
@@ -504,7 +504,7 @@
           3.1415926535 != Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;goodbye&quot;
         </Original>
@@ -512,7 +512,7 @@
           &quot;hello&quot; != &quot;goodbye&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hell&quot;
         </Original>
@@ -520,7 +520,7 @@
           &quot;hello&quot; != &quot;hell&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hello1&quot;
         </Original>
@@ -528,7 +528,7 @@
           &quot;hello&quot; != &quot;hello1&quot;
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 6
         </Original>
@@ -539,7 +539,7 @@
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Inequality checks that should fail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven != 7
         </Original>
@@ -547,7 +547,7 @@
           7 != 7
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one != Approx( 9.1f )
         </Original>
@@ -555,7 +555,7 @@
           9.1f != Approx( 9.1000003815 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.double_pi != Approx( 3.1415926535 )
         </Original>
@@ -563,7 +563,7 @@
           3.1415926535 != Approx( 3.1415926535 )
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello != &quot;hello&quot;
         </Original>
@@ -571,7 +571,7 @@
           &quot;hello&quot; != &quot;hello&quot;
         </Expanded>
       </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello.size() != 5
         </Original>
@@ -582,7 +582,7 @@
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should succeed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt; 8
         </Original>
@@ -590,7 +590,7 @@
           7 &lt; 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 6
         </Original>
@@ -598,7 +598,7 @@
           7 > 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > 0
         </Original>
@@ -606,7 +606,7 @@
           7 > 0
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven > -1
         </Original>
@@ -614,7 +614,7 @@
           7 > -1
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 7
         </Original>
@@ -622,7 +622,7 @@
           7 >= 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven >= 6
         </Original>
@@ -630,7 +630,7 @@
           7 >= 6
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 7
         </Original>
@@ -638,7 +638,7 @@
           7 &lt;= 7
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.int_seven &lt;= 8
         </Original>
@@ -646,7 +646,7 @@
           7 &lt;= 8
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one > 9
         </Original>
@@ -654,7 +654,7 @@
           9.1f > 9
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 10
         </Original>
@@ -662,7 +662,7 @@
           9.1f &lt; 10
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.float_nine_point_one &lt; 9.2
         </Original>
@@ -670,7 +670,7 @@
           9.1f &lt; 9.2
         </Expanded>
       </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch2/projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch3/projects/SelfTest/ConditionTests.cpp" >
         <Original>
           data.str_hello &lt;= &quot;hello&quot;
         </Original>
@@ -678,7 +678,7 @@
           &quot;hello&quot; &lt;= &quot;hello&quot;
         </Expanded>
       </Expression>