From df5c31bb1938d39d8916365a676e708fdb15d4c9 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Fri, 11 Aug 2017 10:38:29 +0100
Subject: [PATCH] Cleaned up the output a bit - removed [!shouldfail] test from
 "green" path - changed "spanner" to more descriptive text

---
 projects/SelfTest/Baselines/console.std.approved.txt | 3 ++-
 projects/SelfTest/Baselines/console.sw.approved.txt  | 3 ++-
 projects/SelfTest/Baselines/junit.sw.approved.txt    | 3 ++-
 projects/SelfTest/Baselines/xml.sw.approved.txt      | 7 ++++---
 projects/SelfTest/ExceptionTests.cpp                 | 2 +-
 projects/SelfTest/MiscTests.cpp                      | 2 +-
 projects/SelfTest/TrickyTests.cpp                    | 4 ++--
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 1312ad4b..f0a61f56 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -885,7 +885,8 @@ MiscTests.cpp:<line number>: FAILED:
 with expansion:
   false
 
-spanner-------------------------------------------------------------------------------
+loose text artifact
+-------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
 MessageTests.cpp:<line number>
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 10f9830b..db766fab 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -6600,7 +6600,8 @@ MiscTests.cpp:<line number>
 MiscTests.cpp:<line number>:
 PASSED:
 
-spanner-------------------------------------------------------------------------------
+loose text artifact
+-------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
 MessageTests.cpp:<line number>
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index de6224e5..b99c0964 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuitesspanner>
+<testsuitesloose text artifact
+>
   <testsuite name="<exe-name>" errors="15" failures="87" tests="902" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}">
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 64105e60..5aebbe28 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -4,7 +4,7 @@
     <TestCase name="# A test name that starts with a #" filename="projects/<exe-name>/MiscTests.cpp" >
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
+    <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
       <Section name="outside assertions" filename="projects/<exe-name>/ExceptionTests.cpp" >
         <Info>
           answer := 42
@@ -117,7 +117,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail]" filename="projects/<exe-name>/MiscTests.cpp" >
+    <TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail][.][failing][hide]" filename="projects/<exe-name>/MiscTests.cpp" >
       <Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
         <Original>
           f() == 0
@@ -7398,7 +7398,8 @@ Message from section two
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="has printf" filename="projects/<exe-name>/TrickyTests.cpp" >
-spanner      <OverallResult success="true"/>
+loose text artifact
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="just failure" tags="[.][fail][hide][isolated info][messages]" filename="projects/<exe-name>/MessageTests.cpp" >
       <Failure filename="projects/<exe-name>/MessageTests.cpp" >
diff --git a/projects/SelfTest/ExceptionTests.cpp b/projects/SelfTest/ExceptionTests.cpp
index 566065e6..6c7cdb2c 100644
--- a/projects/SelfTest/ExceptionTests.cpp
+++ b/projects/SelfTest/ExceptionTests.cpp
@@ -205,7 +205,7 @@ TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!thr
     REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
 }
 
-TEST_CASE( "#748 - captures with unexpected exceptions", "[!shouldfail][!throws]" ) {
+TEST_CASE( "#748 - captures with unexpected exceptions", "[.][failing][!throws][!shouldfail]" ) {
     int answer = 42;
     CAPTURE( answer );
     // the message should be printed on the first two sections but not on the third
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index c8a7b302..500e876a 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -353,7 +353,7 @@ static int f() {
     return 1;
 }
 
-TEST_CASE( "#835 -- errno should not be touched by Catch", "[!shouldfail]" ) {
+TEST_CASE( "#835 -- errno should not be touched by Catch", "[.][failing][!shouldfail]" ) {
     errno = 1;
     CHECK(f() == 0);
     REQUIRE(errno == 1); // Check that f() doesn't touch errno.
diff --git a/projects/SelfTest/TrickyTests.cpp b/projects/SelfTest/TrickyTests.cpp
index 96a8b2b6..a03b21ff 100644
--- a/projects/SelfTest/TrickyTests.cpp
+++ b/projects/SelfTest/TrickyTests.cpp
@@ -396,8 +396,8 @@ TEST_CASE( "X/level/1/b", "[Tricky]" )      { SUCCEED(""); }
 
 TEST_CASE( "has printf" ) {
 
-    // This can cause problems as, currently, stdout itself is not redirect - only the cout (and cerr) buffer
-    printf( "spanner" );
+    // This can cause problems as, currently, stdout itself is not redirected - only the cout (and cerr) buffer
+    printf( "loose text artifact\n" );
 }
 
 TEST_CASE( "assertions with commas are allowed" ) {