Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Dropped "Test case" and "Section" prefixes in test report headers

Commit
10e891767febca73f6721010d2b8d86f51039a22
Author
Phil Nash ·
Parents
2e7d966b762a

Files · Download .tar.gz

Changes

 include/reporters/catch_reporter_console.hpp       |   39 +-
 projects/SelfTest/Baselines/approvedResults.txt    | 1192 ++++++++++----------
 .../CatchSelfTest/CatchSelfTest/BDDTests.cpp       |    6 +-
 3 files changed, 581 insertions(+), 656 deletions(-)

diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 17292c9e..ac7030b9 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -238,13 +238,13 @@ namespace Catch {
         }
         void lazyPrintGroupInfo() {
             if( !unusedGroupInfo->name.empty() && unusedGroupInfo->groupsCounts > 1 ) {
-                printHeader( "Group", unusedGroupInfo->name );
+                printHeader( "Group: " + unusedGroupInfo->name );
                 unusedGroupInfo.reset();
             }
         }
         void lazyPrintTestCaseInfo() {
             if( !currentSectionInfo ) {
-                printTestCaseHeader();
+                printHeader( unusedTestCaseInfo->name );
                 stream << std::endl;
                 unusedTestCaseInfo.reset();
             }
@@ -259,38 +259,21 @@ namespace Catch {
             
             // Sections
             if( !sections.empty() ) {
-                printTestCaseHeader();
+                printHeader( unusedTestCaseInfo->name, false );
                 
-                std::string firstInset;
-                std::string inset;
-                if( sections.size() > 1 ) {
-                    firstInset = "Sections: ";
-                    inset =      "          ";
-                }
-                else {
-                    firstInset = "Section: ";
-                    inset =      "         ";
-                }
                 typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
-                for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) {
-                    if( it == sections.rbegin() )
-                        stream << firstInset;
-                    else
-                        stream << inset;
-                    stream << (*it)->name << "\n";
-                }
+                for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it )
+                    stream << "  " << (*it)->name << "\n";
                 stream << getDashes() << "\n" << std::endl;
                 unusedSectionInfo.reset();
             }
         }
 
-        void printTestCaseHeader() {
-            printHeader( "Test case", unusedTestCaseInfo->name );
-        }
-        void printHeader( std::string const& _type, std::string const& _name ) {
+        void printHeader( std::string const& _name, bool closed = true ) {
             stream  << getDashes() << "\n"
-                    << _type << ": '" << _name << "'\n"
-                    << getDashes() << "\n";
+                    << _name << "\n";
+            if( closed )
+                stream << getDashes() << "\n";
         }
         
         void printTotals( const Totals& totals ) {
@@ -348,12 +331,12 @@ namespace Catch {
         }
         static std::string const& getDashes() {
             static const std::string dashes
-                = "----------------------------------------------------------------";
+                = "-----------------------------------------------------------------";
             return dashes;
         }
         static std::string const& getDoubleDashes() {
             static const std::string doubleDashes
-                = "================================================================";
+                = "=================================================================";
             return doubleDashes;
         }
         
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index ec744ad7..02b36ade 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,10 +1,10 @@
 
-CatchSelfTest is a CATCH v0.9 b12 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b13 (integration) host application.
 Run with -? for options
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/simple'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/simple
+-----------------------------------------------------------------
 
 ApproxTests.cpp:20:
   REQUIRE( d == Approx( 1.23 ) )
@@ -36,9 +36,9 @@ ApproxTests.cpp:26:
 passed with expansion:
   Approx( 1.23 ) != 1.24
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/epsilon'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/epsilon
+-----------------------------------------------------------------
 
 ApproxTests.cpp:38:
   REQUIRE( d != Approx( 1.231 ) )
@@ -50,9 +50,9 @@ ApproxTests.cpp:39:
 passed with expansion:
   1.23 == Approx( 1.231 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/float'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/float
+-----------------------------------------------------------------
 
 ApproxTests.cpp:49:
   REQUIRE( 1.23f == Approx( 1.23f ) )
@@ -64,9 +64,9 @@ ApproxTests.cpp:50:
 passed with expansion:
   0 == Approx( 0 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/int'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/int
+-----------------------------------------------------------------
 
 ApproxTests.cpp:60:
   REQUIRE( 1 == Approx( 1 ) )
@@ -76,9 +76,9 @@ ApproxTests.cpp:61:
   REQUIRE( 0 == Approx( 0 ) )
 passed
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/mixed'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/mixed
+-----------------------------------------------------------------
 
 ApproxTests.cpp:75:
   REQUIRE( 1.0f == Approx( 1 ) )
@@ -105,9 +105,9 @@ ApproxTests.cpp:79:
 passed with expansion:
   1.234 == Approx( 1.234 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/custom'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/custom
+-----------------------------------------------------------------
 
 ApproxTests.cpp:93:
   REQUIRE( d == approx( 1.23 ) )
@@ -149,45 +149,45 @@ ApproxTests.cpp:101:
 passed with expansion:
   Approx( 1.23 ) != 1.25
 
-----------------------------------------------------------------
-Test case: './succeeding/TestClass/succeedingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/TestClass/succeedingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:24:
   REQUIRE( s == "hello" )
 passed with expansion:
   "hello" == "hello"
 
-----------------------------------------------------------------
-Test case: './failing/TestClass/failingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/TestClass/failingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:28:
   REQUIRE( s == "world" )
 failed with expansion:
   "hello" == "world"
 
-----------------------------------------------------------------
-Test case: './succeeding/Fixture/succeedingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Fixture/succeedingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:47:
   REQUIRE( m_a == 1 )
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: './failing/Fixture/failingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/Fixture/failingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:55:
   REQUIRE( m_a == 2 )
 failed with expansion:
   1 == 2
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/equality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/equality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:55:
   REQUIRE( data.int_seven == 7 )
@@ -224,9 +224,9 @@ ConditionTests.cpp:63:
 passed with expansion:
   1.3 == Approx( 1.3 )
 
-----------------------------------------------------------------
-Test case: './failing/conditions/equality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/conditions/equality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:71:
   CHECK( data.int_seven == 6 )
@@ -293,9 +293,9 @@ ConditionTests.cpp:85:
 failed with expansion:
   1.3 == Approx( 1.301 )
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/inequality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/inequality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:93:
   REQUIRE( data.int_seven != 6 )
@@ -352,9 +352,9 @@ ConditionTests.cpp:103:
 passed with expansion:
   5 != 6
 
-----------------------------------------------------------------
-Test case: './failing/conditions/inequality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/conditions/inequality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:111:
   CHECK( data.int_seven != 7 )
@@ -381,9 +381,9 @@ ConditionTests.cpp:115:
 failed with expansion:
   5 != 5
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/ordered'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/ordered
+-----------------------------------------------------------------
 
 ConditionTests.cpp:124:
   REQUIRE( data.int_seven < 8 )
@@ -470,9 +470,9 @@ ConditionTests.cpp:144:
 passed with expansion:
   "hello" > "a"
 
-----------------------------------------------------------------
-Test case: './failing/conditions/ordered'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/conditions/ordered
+-----------------------------------------------------------------
 
 ConditionTests.cpp:152:
   CHECK( data.int_seven > 7 )
@@ -569,9 +569,9 @@ ConditionTests.cpp:174:
 failed with expansion:
   "hello" <= "a"
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/int literals'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/int literals
+-----------------------------------------------------------------
 
 ConditionTests.cpp:188:
   REQUIRE( i == 1 )
@@ -638,9 +638,9 @@ ConditionTests.cpp:202:
 passed with expansion:
   0x<hex digits> > 4
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions//long_to_unsigned_x'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions//long_to_unsigned_x
+-----------------------------------------------------------------
 
 ConditionTests.cpp:223:
   REQUIRE( long_var == unsigned_char_var )
@@ -662,9 +662,9 @@ ConditionTests.cpp:226:
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/const ints to int literal'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/const ints to int literal
+-----------------------------------------------------------------
 
 ConditionTests.cpp:237:
   REQUIRE( unsigned_char_var == 1 )
@@ -686,9 +686,9 @@ ConditionTests.cpp:240:
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/negative ints'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/negative ints
+-----------------------------------------------------------------
 
 ConditionTests.cpp:246:
   CHECK( ( -1 > 2u ) )
@@ -720,18 +720,18 @@ ConditionTests.cpp:254:
 passed with expansion:
   -2147483648 > 2
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/computed ints'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/computed ints
+-----------------------------------------------------------------
 
 ConditionTests.cpp:269:
   CHECK( 54 == 6*9 )
 passed with expansion:
   54 == 54
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/ptr'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/ptr
+-----------------------------------------------------------------
 
 ConditionTests.cpp:285:
   REQUIRE( p == __null )
@@ -773,9 +773,9 @@ ConditionTests.cpp:302:
 passed with expansion:
   0 != 0x<hex digits>
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/not'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/not
+-----------------------------------------------------------------
 
 ConditionTests.cpp:317:
   REQUIRE( false == false )
@@ -814,9 +814,9 @@ ConditionTests.cpp:326:
 passed with expansion:
   !(1 == 2)
 
-----------------------------------------------------------------
-Test case: './failing/conditions/not'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/conditions/not
+-----------------------------------------------------------------
 
 ConditionTests.cpp:334:
   CHECK( false != false )
@@ -855,9 +855,9 @@ ConditionTests.cpp:343:
 failed with expansion:
   !(1 == 1)
 
-----------------------------------------------------------------
-Test case: './succeeding/exceptions/explicit'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/exceptions/explicit
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:39:
   REQUIRE_THROWS_AS( thisThrows() )
@@ -871,9 +871,9 @@ ExceptionTests.cpp:41:
   REQUIRE_THROWS( thisThrows() )
 passed
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/explicit'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/explicit
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:47:
   CHECK_THROWS_AS( thisThrows() )
@@ -889,17 +889,17 @@ ExceptionTests.cpp:49:
 failed due to unexpected exception with message:
   expected exception
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/implicit'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/implicit
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:52:
 failed due to unexpected exception with message:
   unexpected exception
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/implicit/2'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/implicit/2
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:60:
   CHECK( 1 == 1 )
@@ -910,58 +910,58 @@ ExceptionTests.cpp:60:
 failed due to unexpected exception with message:
   unexpected exception
 
-----------------------------------------------------------------
-Test case: './succeeding/exceptions/implicit'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/exceptions/implicit
+-----------------------------------------------------------------
 
 
 No assertions in test case, './succeeding/exceptions/implicit'
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/custom'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/custom
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:102:
 failed due to unexpected exception with message:
   custom exception
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/custom/nothrow'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/custom/nothrow
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:109:
   REQUIRE_NOTHROW( throw CustomException( "unexpected custom exception" ) )
 failed due to unexpected exception with message:
   unexpected custom exception
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/custom/throw'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/custom/throw
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:114:
   REQUIRE_THROWS_AS( throw CustomException( "custom exception - not std" ) )
 failed due to unexpected exception with message:
   custom exception - not std
 
-----------------------------------------------------------------
-Test case: './failing/exceptions/custom/double'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/exceptions/custom/double
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:118:
 failed due to unexpected exception with message:
   3.14
 
-----------------------------------------------------------------
-Test case: './succeeding/exceptions/notimplemented'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/exceptions/notimplemented
+-----------------------------------------------------------------
 
 ExceptionTests.cpp:129:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 passed
 
-----------------------------------------------------------------
-Test case: './succeeding/generators/1'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/generators/1
+-----------------------------------------------------------------
 
 GeneratorTests.cpp:26:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
@@ -1683,9 +1683,9 @@ GeneratorTests.cpp:27:
 passed with expansion:
   214 == 214
 
-----------------------------------------------------------------
-Test case: './succeeding/generators/2'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/generators/2
+-----------------------------------------------------------------
 
 GeneratorTests.cpp:40:
   CATCH_REQUIRE( i->first == i->second-1 )
@@ -1697,9 +1697,9 @@ GeneratorTests.cpp:40:
 passed with expansion:
   2 == 2
 
-----------------------------------------------------------------
-Test case: './succeeding/message'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/message
+-----------------------------------------------------------------
 
 MessageTests.cpp:14:
 warning:
@@ -1708,17 +1708,17 @@ warning:
 
 No assertions in test case, './succeeding/message'
 
-----------------------------------------------------------------
-Test case: './succeeding/succeed'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/succeed
+-----------------------------------------------------------------
 
 MessageTests.cpp:18:
 passed with message:
   this is a success
 
-----------------------------------------------------------------
-Test case: './failing/message/info/1'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/message/info/1
+-----------------------------------------------------------------
 
 MessageTests.cpp:23:
 info:
@@ -1733,9 +1733,9 @@ MessageTests.cpp:26:
 failed with expansion:
   2 == 1
 
-----------------------------------------------------------------
-Test case: './mixed/message/info/2'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/message/info/2
+-----------------------------------------------------------------
 
 MessageTests.cpp:33:
   CHECK( a == 2 )
@@ -1769,57 +1769,53 @@ MessageTests.cpp:45:
 passed with expansion:
   2 == 2
 
-----------------------------------------------------------------
-Test case: './failing/message/fail'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/message/fail
+-----------------------------------------------------------------
 
 MessageTests.cpp:51:
 failed explicitly with message:
   This is a failure
 
-----------------------------------------------------------------
-Test case: './failing/message/sections'
-----------------------------------------------------------------
-Section: one
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/message/sections
+  one
+-----------------------------------------------------------------
 
 MessageTests.cpp:58:
 failed explicitly with message:
   Message from section one
 
-----------------------------------------------------------------
-Test case: './failing/message/sections'
-----------------------------------------------------------------
-Section: two
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/message/sections
+  two
+-----------------------------------------------------------------
 
 MessageTests.cpp:63:
 failed explicitly with message:
   Message from section two
 
 Message from section one
-----------------------------------------------------------------
-Test case: './succeeding/message/sections/stdout'
-----------------------------------------------------------------
-Section: one
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/message/sections/stdout
+  one
+-----------------------------------------------------------------
 
 
 No assertions in section, 'one'
 
 Message from section two
-----------------------------------------------------------------
-Test case: './succeeding/message/sections/stdout'
-----------------------------------------------------------------
-Section: two
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/message/sections/stdout
+  two
+-----------------------------------------------------------------
 
 
 No assertions in section, 'two'
 
-----------------------------------------------------------------
-Test case: './mixed/message/scoped'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/message/scoped
+-----------------------------------------------------------------
 
 MessageTests.cpp:86:
   REQUIRE( i < 10 )
@@ -1886,9 +1882,9 @@ MessageTests.cpp:86:
 failed with expansion:
   10 < 10
 
-----------------------------------------------------------------
-Test case: './succeeding/nofail'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/nofail
+-----------------------------------------------------------------
 
 MessageTests.cpp:92:
   CHECK_NOFAIL( 1 == 2 )
@@ -1897,11 +1893,10 @@ failed - but was ok
 
 No assertions in test case, './succeeding/nofail'
 
-----------------------------------------------------------------
-Test case: './succeeding/Misc/Sections'
-----------------------------------------------------------------
-Section: s1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/Sections
+  s1
+-----------------------------------------------------------------
 
 MiscTests.cpp:25:
   REQUIRE( a != b )
@@ -1913,22 +1908,20 @@ MiscTests.cpp:26:
 passed with expansion:
   2 != 1
 
-----------------------------------------------------------------
-Test case: './succeeding/Misc/Sections'
-----------------------------------------------------------------
-Section: s2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/Sections
+  s2
+-----------------------------------------------------------------
 
 MiscTests.cpp:31:
   REQUIRE( a != b )
 passed with expansion:
   1 != 2
 
-----------------------------------------------------------------
-Test case: './succeeding/Misc/Sections/nested'
-----------------------------------------------------------------
-Section: s1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/Sections/nested
+  s1
+-----------------------------------------------------------------
 
 MiscTests.cpp:42:
   REQUIRE( a != b )
@@ -1940,97 +1933,89 @@ MiscTests.cpp:43:
 passed with expansion:
   2 != 1
 
-----------------------------------------------------------------
-Test case: './succeeding/Misc/Sections/nested'
-----------------------------------------------------------------
-Sections: s1
-          s2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/Sections/nested
+  s1
+  s2
+-----------------------------------------------------------------
 
 MiscTests.cpp:47:
   REQUIRE( a != b )
 passed with expansion:
   1 != 2
 
-----------------------------------------------------------------
-Test case: './mixed/Misc/Sections/nested2'
-----------------------------------------------------------------
-Sections: s1
-          s2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s2
+-----------------------------------------------------------------
 
 MiscTests.cpp:61:
   REQUIRE( a == b )
 failed with expansion:
   1 == 2
 
-----------------------------------------------------------------
-Test case: './mixed/Misc/Sections/nested2'
-----------------------------------------------------------------
-Sections: s1
-          s3
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s3
+-----------------------------------------------------------------
 
 MiscTests.cpp:66:
   REQUIRE( a != b )
 passed with expansion:
   1 != 2
 
-----------------------------------------------------------------
-Test case: './mixed/Misc/Sections/nested2'
-----------------------------------------------------------------
-Sections: s1
-          s4
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s4
+-----------------------------------------------------------------
 
 MiscTests.cpp:70:
   REQUIRE( a < b )
 passed with expansion:
   1 < 2
 
-----------------------------------------------------------------
-Test case: './Sections/nested/a/b'
-----------------------------------------------------------------
-Sections: c
-          d (leaf)
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./Sections/nested/a/b
+  c
+  d (leaf)
+-----------------------------------------------------------------
 
 
 No assertions in section, 'd (leaf)'
 
-----------------------------------------------------------------
-Test case: './Sections/nested/a/b'
-----------------------------------------------------------------
-Sections: c
-          e (leaf)
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./Sections/nested/a/b
+  c
+  e (leaf)
+-----------------------------------------------------------------
 
 
 No assertions in section, 'e (leaf)'
 
-----------------------------------------------------------------
-Test case: './Sections/nested/a/b'
-----------------------------------------------------------------
-Section: f (leaf)
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./Sections/nested/a/b
+  f (leaf)
+-----------------------------------------------------------------
 
 
 No assertions in section, 'f (leaf)'
 
-----------------------------------------------------------------
-Test case: './mixed/Misc/Sections/loops'
-----------------------------------------------------------------
-Section: s1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/Misc/Sections/loops
+  s1
+-----------------------------------------------------------------
 
 MiscTests.cpp:103:
   CHECK( b > a )
 failed with expansion:
   0 > 1
 
-----------------------------------------------------------------
-Test case: './mixed/Misc/loops'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./mixed/Misc/loops
+-----------------------------------------------------------------
 
 MiscTests.cpp:114:
 info:
@@ -2106,16 +2091,16 @@ failed with expansion:
 
 Some information
 An error
-----------------------------------------------------------------
-Test case: './succeeding/Misc/stdout,stderr'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/stdout,stderr
+-----------------------------------------------------------------
 
 
 No assertions in test case, './succeeding/Misc/stdout,stderr'
 
-----------------------------------------------------------------
-Test case: './succeeding/Misc/null strings'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Misc/null strings
+-----------------------------------------------------------------
 
 MiscTests.cpp:133:
   REQUIRE( makeString( false ) != static_cast<char*>(__null) )
@@ -2127,9 +2112,9 @@ MiscTests.cpp:134:
 passed with expansion:
   {null string} == {null string}
 
-----------------------------------------------------------------
-Test case: './failing/info'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/info
+-----------------------------------------------------------------
 
 MiscTests.cpp:139:
 info:
@@ -2143,9 +2128,9 @@ MiscTests.cpp:142:
   REQUIRE( false )
 failed
 
-----------------------------------------------------------------
-Test case: './succeeding/checkedif'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/checkedif
+-----------------------------------------------------------------
 
 MiscTests.cpp:147:
   CHECKED_IF( flag )
@@ -2157,9 +2142,9 @@ MiscTests.cpp:155:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: './failing/checkedif'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/checkedif
+-----------------------------------------------------------------
 
 MiscTests.cpp:147:
   CHECKED_IF( flag )
@@ -2171,9 +2156,9 @@ MiscTests.cpp:160:
 failed with expansion:
   false
 
-----------------------------------------------------------------
-Test case: './succeeding/checkedelse'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/checkedelse
+-----------------------------------------------------------------
 
 MiscTests.cpp:165:
   CHECKED_ELSE( flag )
@@ -2185,9 +2170,9 @@ MiscTests.cpp:173:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: './failing/checkedelse'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/checkedelse
+-----------------------------------------------------------------
 
 MiscTests.cpp:165:
   CHECKED_ELSE( flag )
@@ -2199,27 +2184,25 @@ MiscTests.cpp:178:
 failed with expansion:
   false
 
-----------------------------------------------------------------
-Test case: './misc/xmlentitycheck'
-----------------------------------------------------------------
-Section: embedded xml
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./misc/xmlentitycheck
+  embedded xml
+-----------------------------------------------------------------
 
 
 No assertions in section, 'embedded xml'
 
-----------------------------------------------------------------
-Test case: './misc/xmlentitycheck'
-----------------------------------------------------------------
-Section: encoded chars
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./misc/xmlentitycheck
+  encoded chars
+-----------------------------------------------------------------
 
 
 No assertions in section, 'encoded chars'
 
-----------------------------------------------------------------
-Test case: './manual/onechar'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./manual/onechar
+-----------------------------------------------------------------
 
 MiscTests.cpp:195:
 info:
@@ -2229,18 +2212,18 @@ MiscTests.cpp:196:
   REQUIRE( false )
 failed
 
-----------------------------------------------------------------
-Test case: './succeeding/atomic if'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/atomic if
+-----------------------------------------------------------------
 
 MiscTests.cpp:206:
   REQUIRE( x == 0 )
 passed with expansion:
   0 == 0
 
-----------------------------------------------------------------
-Test case: './succeeding/matchers'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/matchers
+-----------------------------------------------------------------
 
 MiscTests.cpp:216:
   REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
@@ -2262,45 +2245,45 @@ MiscTests.cpp:220:
 passed with expansion:
   "this string contains 'abc' as a substring" ends with: "substring"
 
-----------------------------------------------------------------
-Test case: './failing/matchers/Contains'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/matchers/Contains
+-----------------------------------------------------------------
 
 MiscTests.cpp:225:
   CHECK_THAT( testStringForMatching() Contains( "not there" ) )
 failed with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
 
-----------------------------------------------------------------
-Test case: './failing/matchers/StartsWith'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/matchers/StartsWith
+-----------------------------------------------------------------
 
 MiscTests.cpp:230:
   CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
 failed with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
 
-----------------------------------------------------------------
-Test case: './failing/matchers/EndsWith'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/matchers/EndsWith
+-----------------------------------------------------------------
 
 MiscTests.cpp:235:
   CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
 failed with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
 
-----------------------------------------------------------------
-Test case: './failing/matchers/Equals'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/matchers/Equals
+-----------------------------------------------------------------
 
 MiscTests.cpp:240:
   CHECK_THAT( testStringForMatching() Equals( "something else" ) )
 failed with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
 
-----------------------------------------------------------------
-Test case: '/succeeding/matchers/AllOf'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+/succeeding/matchers/AllOf
+-----------------------------------------------------------------
 
 MiscTests.cpp:248:
   CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
@@ -2308,9 +2291,9 @@ passed with expansion:
   "this string contains 'abc' as a substring" ( contains: "string"
   and contains: "abc" )
 
-----------------------------------------------------------------
-Test case: '/succeeding/matchers/AnyOf'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+/succeeding/matchers/AnyOf
+-----------------------------------------------------------------
 
 MiscTests.cpp:252:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
@@ -2324,9 +2307,9 @@ passed with expansion:
   "this string contains 'abc' as a substring" ( contains: "not there"
   or contains: "string" )
 
-----------------------------------------------------------------
-Test case: './succeeding/matchers/Equals'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/matchers/Equals
+-----------------------------------------------------------------
 
 MiscTests.cpp:258:
   CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) )
@@ -2334,9 +2317,9 @@ passed with expansion:
   "this string contains 'abc' as a substring" equals: "this string
   contains 'abc' as a substring"
 
-----------------------------------------------------------------
-Test case: 'example/factorial'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+example/factorial
+-----------------------------------------------------------------
 
 MiscTests.cpp:269:
   REQUIRE( Factorial(0) == 1 )
@@ -2363,16 +2346,16 @@ MiscTests.cpp:273:
 passed with expansion:
   0x<hex digits> == 3628800
 
-----------------------------------------------------------------
-Test case: 'empty'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+empty
+-----------------------------------------------------------------
 
 
 No assertions in test case, 'empty'
 
-----------------------------------------------------------------
-Test case: 'Nice descriptive name'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+Nice descriptive name
+-----------------------------------------------------------------
 
 MiscTests.cpp:282:
 warning:
@@ -2381,26 +2364,25 @@ warning:
 
 No assertions in test case, 'Nice descriptive name'
 
-----------------------------------------------------------------
-Test case: 'first tag'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+first tag
+-----------------------------------------------------------------
 
 
 No assertions in test case, 'first tag'
 
-----------------------------------------------------------------
-Test case: 'second tag'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+second tag
+-----------------------------------------------------------------
 
 
 No assertions in test case, 'second tag'
 
-----------------------------------------------------------------
-Test case: 'selftest/main'
-----------------------------------------------------------------
-Sections: selftest/expected result
-          selftest/expected result/failing tests
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/main
+  selftest/expected result
+  selftest/expected result/failing tests
+-----------------------------------------------------------------
 
 catch_self_test.hpp:114:
 passed with message:
@@ -2502,12 +2484,11 @@ catch_self_test.hpp:114:
 passed with message:
   Tests failed, as expected
 
-----------------------------------------------------------------
-Test case: 'selftest/main'
-----------------------------------------------------------------
-Sections: selftest/expected result
-          selftest/expected result/succeeding tests
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/main
+  selftest/expected result
+  selftest/expected result/succeeding tests
+-----------------------------------------------------------------
 
 catch_self_test.hpp:103:
 passed with message:
@@ -2693,12 +2674,11 @@ Message from section one
 Message from section two
 Some information
 An error
-----------------------------------------------------------------
-Test case: 'selftest/main'
-----------------------------------------------------------------
-Sections: selftest/test counts
-          selftest/test counts/succeeding tests
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/main
+  selftest/test counts
+  selftest/test counts/succeeding tests
+-----------------------------------------------------------------
 
 TestMain.cpp:40:
   CHECK( totals.assertions.passed == 291 )
@@ -2710,12 +2690,11 @@ TestMain.cpp:41:
 passed with expansion:
   0 == 0
 
-----------------------------------------------------------------
-Test case: 'selftest/main'
-----------------------------------------------------------------
-Sections: selftest/test counts
-          selftest/test counts/failing tests
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/main
+  selftest/test counts
+  selftest/test counts/failing tests
+-----------------------------------------------------------------
 
 TestMain.cpp:47:
   CHECK( totals.assertions.passed == 1 )
@@ -2727,9 +2706,9 @@ TestMain.cpp:48:
 passed with expansion:
   72 == 72
 
-----------------------------------------------------------------
-Test case: 'meta/Misc/Sections'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+meta/Misc/Sections
+-----------------------------------------------------------------
 
 TestMain.cpp:57:
   CHECK( totals.assertions.passed == 2 )
@@ -2741,11 +2720,10 @@ TestMain.cpp:58:
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Section: default
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  default
+-----------------------------------------------------------------
 
 TestMain.cpp:97:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2771,12 +2749,11 @@ TestMain.cpp:102:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          -t/1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  -t/1
+-----------------------------------------------------------------
 
 TestMain.cpp:108:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2797,12 +2774,11 @@ TestMain.cpp:112:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          -t/exclude:1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  -t/exclude:1
+-----------------------------------------------------------------
 
 TestMain.cpp:116:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2823,12 +2799,11 @@ TestMain.cpp:120:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          --test/1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  --test/1
+-----------------------------------------------------------------
 
 TestMain.cpp:125:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2849,12 +2824,11 @@ TestMain.cpp:129:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          --test/exclude:1
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  --test/exclude:1
+-----------------------------------------------------------------
 
 TestMain.cpp:134:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2875,12 +2849,11 @@ TestMain.cpp:138:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          --test/exclude:2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  --test/exclude:2
+-----------------------------------------------------------------
 
 TestMain.cpp:143:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2901,12 +2874,11 @@ TestMain.cpp:147:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          -t/2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  -t/2
+-----------------------------------------------------------------
 
 TestMain.cpp:152:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2932,12 +2904,11 @@ TestMain.cpp:157:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: test lists
-          -t/0
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  test lists
+  -t/0
+-----------------------------------------------------------------
 
 TestMain.cpp:162:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) )
@@ -2945,12 +2916,11 @@ passed with expansion:
   "Error while parsing arguments. Expected at least 1 argument."
   contains: "at least 1"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: reporter
-          -r/console
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  reporter
+  -r/console
+-----------------------------------------------------------------
 
 TestMain.cpp:169:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2961,12 +2931,11 @@ TestMain.cpp:171:
 passed with expansion:
   "console" == "console"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: reporter
-          -r/xml
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  reporter
+  -r/xml
+-----------------------------------------------------------------
 
 TestMain.cpp:175:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2977,12 +2946,11 @@ TestMain.cpp:177:
 passed with expansion:
   "xml" == "xml"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: reporter
-          --reporter/junit
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  reporter
+  --reporter/junit
+-----------------------------------------------------------------
 
 TestMain.cpp:181:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -2993,12 +2961,11 @@ TestMain.cpp:183:
 passed with expansion:
   "junit" == "junit"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: reporter
-          -r/error
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  reporter
+  -r/error
+-----------------------------------------------------------------
 
 TestMain.cpp:187:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) )
@@ -3006,12 +2973,11 @@ passed with expansion:
   "Error while parsing arguments. Expected 1 argument. Arguments
   were: one two" contains: "1 argument"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: debugger
-          -b
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  debugger
+  -b
+-----------------------------------------------------------------
 
 TestMain.cpp:194:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3022,12 +2988,11 @@ TestMain.cpp:196:
 passed with expansion:
   true == true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: debugger
-          --break
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  debugger
+  --break
+-----------------------------------------------------------------
 
 TestMain.cpp:200:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3038,12 +3003,11 @@ TestMain.cpp:202:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: debugger
-          -b
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  debugger
+  -b
+-----------------------------------------------------------------
 
 TestMain.cpp:206:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) )
@@ -3051,12 +3015,11 @@ passed with expansion:
   "Error while parsing arguments. Expected 0 arguments. Arguments
   were: unexpected" contains: "0 arguments"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: abort
-          -a
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  abort
+  -a
+-----------------------------------------------------------------
 
 TestMain.cpp:213:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3067,12 +3030,11 @@ TestMain.cpp:215:
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: abort
-          -a/2
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  abort
+  -a/2
+-----------------------------------------------------------------
 
 TestMain.cpp:219:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3083,12 +3045,11 @@ TestMain.cpp:221:
 passed with expansion:
   2 == 2
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: abort
-          -a/error/0
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  abort
+  -a/error/0
+-----------------------------------------------------------------
 
 TestMain.cpp:225:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
@@ -3096,12 +3057,11 @@ passed with expansion:
   "Error while parsing arguments. threshold must be a number greater
   than zero. Arguments were: 0" contains: "greater than zero"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: abort
-          -a/error/non numeric
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  abort
+  -a/error/non numeric
+-----------------------------------------------------------------
 
 TestMain.cpp:229:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
@@ -3109,12 +3069,11 @@ passed with expansion:
   "Error while parsing arguments. threshold must be a number greater
   than zero. Arguments were: oops" contains: "greater than zero"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: abort
-          -a/error/two args
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  abort
+  -a/error/two args
+-----------------------------------------------------------------
 
 TestMain.cpp:233:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) )
@@ -3122,12 +3081,11 @@ passed with expansion:
   "Error while parsing arguments. Expected between 0 and 1 argument.
   Arguments were: 1 2" contains: "0 and 1 argument"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: nothrow
-          -nt
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  nothrow
+  -nt
+-----------------------------------------------------------------
 
 TestMain.cpp:240:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3138,12 +3096,11 @@ TestMain.cpp:242:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: nothrow
-          --nothrow
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  nothrow
+  --nothrow
+-----------------------------------------------------------------
 
 TestMain.cpp:246:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3154,12 +3111,11 @@ TestMain.cpp:248:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: streams
-          -o filename
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  streams
+  -o filename
+-----------------------------------------------------------------
 
 TestMain.cpp:255:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3175,12 +3131,11 @@ TestMain.cpp:258:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: streams
-          -o %stdout
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  streams
+  -o %stdout
+-----------------------------------------------------------------
 
 TestMain.cpp:262:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3196,12 +3151,11 @@ TestMain.cpp:265:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: streams
-          --out
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  streams
+  --out
+-----------------------------------------------------------------
 
 TestMain.cpp:269:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3212,12 +3166,11 @@ TestMain.cpp:271:
 passed with expansion:
   "filename.ext" == "filename.ext"
 
-----------------------------------------------------------------
-Test case: 'selftest/parser/2'
-----------------------------------------------------------------
-Sections: combinations
-          -a -b
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/parser/2
+  combinations
+  -a -b
+-----------------------------------------------------------------
 
 TestMain.cpp:278:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
@@ -3238,9 +3191,9 @@ TestMain.cpp:282:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/test filter'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/test filter
+-----------------------------------------------------------------
 
 TestMain.cpp:291:
   CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
@@ -3272,9 +3225,9 @@ TestMain.cpp:301:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/test filters'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/test filters
+-----------------------------------------------------------------
 
 TestMain.cpp:312:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
@@ -3296,9 +3249,9 @@ TestMain.cpp:316:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/filter/prefix wildcard'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/filter/prefix wildcard
+-----------------------------------------------------------------
 
 TestMain.cpp:322:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
@@ -3310,9 +3263,9 @@ TestMain.cpp:323:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/filter/wildcard at both ends'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/filter/wildcard at both ends
+-----------------------------------------------------------------
 
 TestMain.cpp:328:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
@@ -3334,9 +3287,9 @@ TestMain.cpp:331:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/option parsers'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/option parsers
+-----------------------------------------------------------------
 
 TestMain.cpp:351:
   CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) )
@@ -3357,11 +3310,10 @@ TestMain.cpp:355:
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: 'selftest/tags'
-----------------------------------------------------------------
-Section: one tag
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/tags
+  one tag
+-----------------------------------------------------------------
 
 TestMain.cpp:369:
   CHECK( oneTag.getTestCaseInfo().description == "" )
@@ -3403,11 +3355,10 @@ TestMain.cpp:377:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: 'selftest/tags'
-----------------------------------------------------------------
-Section: two tags
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/tags
+  two tags
+-----------------------------------------------------------------
 
 TestMain.cpp:383:
   CHECK( twoTags.getTestCaseInfo().description == "" )
@@ -3459,11 +3410,10 @@ TestMain.cpp:393:
 passed with expansion:
   true == true
 
-----------------------------------------------------------------
-Test case: 'selftest/tags'
-----------------------------------------------------------------
-Section: one tag with characters either side
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/tags
+  one tag with characters either side
+-----------------------------------------------------------------
 
 TestMain.cpp:399:
   CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
@@ -3485,11 +3435,10 @@ TestMain.cpp:402:
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: 'selftest/tags'
-----------------------------------------------------------------
-Section: start of a tag, but not closed
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/tags
+  start of a tag, but not closed
+-----------------------------------------------------------------
 
 TestMain.cpp:409:
   CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
@@ -3506,11 +3455,10 @@ TestMain.cpp:411:
 passed with expansion:
   0 == 0
 
-----------------------------------------------------------------
-Test case: 'selftest/tags'
-----------------------------------------------------------------
-Section: hidden
-----------------------------------------------------------------
+-----------------------------------------------------------------
+selftest/tags
+  hidden
+-----------------------------------------------------------------
 
 TestMain.cpp:417:
   CHECK( oneTag.getTestCaseInfo().description == "" )
@@ -3532,9 +3480,9 @@ TestMain.cpp:421:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: './succeeding/Tricky/std::pair'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Tricky/std::pair
+-----------------------------------------------------------------
 
 TrickyTests.cpp:37:
   REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
@@ -3544,9 +3492,9 @@ passed with expansion:
   ==
   std::pair( 1, 2 )
 
-----------------------------------------------------------------
-Test case: './inprogress/failing/Tricky/trailing expression'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./inprogress/failing/Tricky/trailing expression
+-----------------------------------------------------------------
 
 TrickyTests.cpp:55:
 warning:
@@ -3556,9 +3504,9 @@ warning:
 
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
-----------------------------------------------------------------
-Test case: './inprogress/failing/Tricky/compound lhs'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./inprogress/failing/Tricky/compound lhs
+-----------------------------------------------------------------
 
 TrickyTests.cpp:71:
 warning:
@@ -3568,9 +3516,9 @@ warning:
 
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
-----------------------------------------------------------------
-Test case: './failing/Tricky/non streamable type'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/Tricky/non streamable type
+-----------------------------------------------------------------
 
 TrickyTests.cpp:95:
   CHECK( &o1 == &o2 )
@@ -3582,18 +3530,18 @@ TrickyTests.cpp:96:
 failed with expansion:
   {?} == {?}
 
-----------------------------------------------------------------
-Test case: './failing/string literals'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/string literals
+-----------------------------------------------------------------
 
 TrickyTests.cpp:106:
   REQUIRE( std::string( "first" ) == "second" )
 failed with expansion:
   "first" == "second"
 
-----------------------------------------------------------------
-Test case: './succeeding/side-effects'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/side-effects
+-----------------------------------------------------------------
 
 TrickyTests.cpp:119:
   REQUIRE( i++ == 7 )
@@ -3605,47 +3553,46 @@ TrickyTests.cpp:120:
 passed with expansion:
   8 == 8
 
-----------------------------------------------------------------
-Test case: './succeeding/koenig'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/koenig
+-----------------------------------------------------------------
 
 TrickyTests.cpp:186:
   REQUIRE( 0x<hex digits> == o )
 passed with expansion:
   0x<hex digits> == {?}
 
-----------------------------------------------------------------
-Test case: './succeeding/non-const=='
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/non-const==
+-----------------------------------------------------------------
 
 TrickyTests.cpp:212:
   REQUIRE( t == 1u )
 passed with expansion:
   {?} == 1
 
-----------------------------------------------------------------
-Test case: './succeeding/enum/bits'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/enum/bits
+-----------------------------------------------------------------
 
 TrickyTests.cpp:224:
   REQUIRE( 0x<hex digits> == bit30and31 )
 passed with expansion:
   0x<hex digits> == 3221225472
 
-----------------------------------------------------------------
-Test case: './succeeding/boolean member'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/boolean member
+-----------------------------------------------------------------
 
 TrickyTests.cpp:239:
   REQUIRE( obj.prop != __null )
 passed with expansion:
   0x<hex digits> != 0
 
-----------------------------------------------------------------
-Test case: './succeeding/unimplemented static bool'
-----------------------------------------------------------------
-Section: compare to true
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to true
+-----------------------------------------------------------------
 
 TrickyTests.cpp:259:
   REQUIRE( is_true<true>::value == true )
@@ -3657,11 +3604,10 @@ TrickyTests.cpp:260:
 passed with expansion:
   true == true
 
-----------------------------------------------------------------
-Test case: './succeeding/unimplemented static bool'
-----------------------------------------------------------------
-Section: compare to false
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to false
+-----------------------------------------------------------------
 
 TrickyTests.cpp:264:
   REQUIRE( is_true<false>::value == false )
@@ -3673,33 +3619,30 @@ TrickyTests.cpp:265:
 passed with expansion:
   false == false
 
-----------------------------------------------------------------
-Test case: './succeeding/unimplemented static bool'
-----------------------------------------------------------------
-Section: negation
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/unimplemented static bool
+  negation
+-----------------------------------------------------------------
 
 TrickyTests.cpp:270:
   REQUIRE( !is_true<false>::value )
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: './succeeding/unimplemented static bool'
-----------------------------------------------------------------
-Section: double negation
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/unimplemented static bool
+  double negation
+-----------------------------------------------------------------
 
 TrickyTests.cpp:275:
   REQUIRE( !!is_true<true>::value )
 passed with expansion:
   true
 
-----------------------------------------------------------------
-Test case: './succeeding/unimplemented static bool'
-----------------------------------------------------------------
-Section: direct
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/unimplemented static bool
+  direct
+-----------------------------------------------------------------
 
 TrickyTests.cpp:280:
   REQUIRE( is_true<true>::value )
@@ -3711,9 +3654,9 @@ TrickyTests.cpp:281:
 passed with expansion:
   !false
 
-----------------------------------------------------------------
-Test case: './succeeding/SafeBool'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/SafeBool
+-----------------------------------------------------------------
 
 TrickyTests.cpp:313:
   CHECK( True )
@@ -3730,29 +3673,28 @@ TrickyTests.cpp:315:
 passed with expansion:
   !false
 
-----------------------------------------------------------------
-Test case: 'Scenario: Do that thing with the thing'
-----------------------------------------------------------------
-Sections: Given: This stuff exists
-          When:  I do this
-          Then:  it should do this
-----------------------------------------------------------------
+-----------------------------------------------------------------
+Scenario: Do that thing with the thing
+   Given: This stuff exists
+    When:  I do this
+    Then:  it should do this
+-----------------------------------------------------------------
 
 BDDTests.cpp:29:
   REQUIRE( itDoesThis() )
 passed with expansion:
   true
 
-================================================================
+=================================================================
 96 test cases - 45 failed (610 assertions - 102 failed)
 
 
-CatchSelfTest is a CATCH v0.9 b12 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b13 (integration) host application.
 Run with -? for options
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/simple'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/simple
+-----------------------------------------------------------------
 
 ApproxTests.cpp:20:
   REQUIRE( d == Approx( 1.23 ) )
@@ -3784,9 +3726,9 @@ ApproxTests.cpp:26:
 passed with expansion:
   Approx( 1.23 ) != 1.24
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/epsilon'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/epsilon
+-----------------------------------------------------------------
 
 ApproxTests.cpp:38:
   REQUIRE( d != Approx( 1.231 ) )
@@ -3798,9 +3740,9 @@ ApproxTests.cpp:39:
 passed with expansion:
   1.23 == Approx( 1.231 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/float'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/float
+-----------------------------------------------------------------
 
 ApproxTests.cpp:49:
   REQUIRE( 1.23f == Approx( 1.23f ) )
@@ -3812,9 +3754,9 @@ ApproxTests.cpp:50:
 passed with expansion:
   0 == Approx( 0 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/int'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/int
+-----------------------------------------------------------------
 
 ApproxTests.cpp:60:
   REQUIRE( 1 == Approx( 1 ) )
@@ -3824,9 +3766,9 @@ ApproxTests.cpp:61:
   REQUIRE( 0 == Approx( 0 ) )
 passed
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/mixed'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/mixed
+-----------------------------------------------------------------
 
 ApproxTests.cpp:75:
   REQUIRE( 1.0f == Approx( 1 ) )
@@ -3853,9 +3795,9 @@ ApproxTests.cpp:79:
 passed with expansion:
   1.234 == Approx( 1.234 )
 
-----------------------------------------------------------------
-Test case: './succeeding/Approx/custom'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Approx/custom
+-----------------------------------------------------------------
 
 ApproxTests.cpp:93:
   REQUIRE( d == approx( 1.23 ) )
@@ -3897,45 +3839,45 @@ ApproxTests.cpp:101:
 passed with expansion:
   Approx( 1.23 ) != 1.25
 
-----------------------------------------------------------------
-Test case: './succeeding/TestClass/succeedingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/TestClass/succeedingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:24:
   REQUIRE( s == "hello" )
 passed with expansion:
   "hello" == "hello"
 
-----------------------------------------------------------------
-Test case: './failing/TestClass/failingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/TestClass/failingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:28:
   REQUIRE( s == "world" )
 failed with expansion:
   "hello" == "world"
 
-----------------------------------------------------------------
-Test case: './succeeding/Fixture/succeedingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/Fixture/succeedingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:47:
   REQUIRE( m_a == 1 )
 passed with expansion:
   1 == 1
 
-----------------------------------------------------------------
-Test case: './failing/Fixture/failingCase'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/Fixture/failingCase
+-----------------------------------------------------------------
 
 ClassTests.cpp:55:
   REQUIRE( m_a == 2 )
 failed with expansion:
   1 == 2
 
-----------------------------------------------------------------
-Test case: './succeeding/conditions/equality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./succeeding/conditions/equality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:55:
   REQUIRE( data.int_seven == 7 )
@@ -3972,9 +3914,9 @@ ConditionTests.cpp:63:
 passed with expansion:
   1.3 == Approx( 1.3 )
 
-----------------------------------------------------------------
-Test case: './failing/conditions/equality'
-----------------------------------------------------------------
+-----------------------------------------------------------------
+./failing/conditions/equality
+-----------------------------------------------------------------
 
 ConditionTests.cpp:71:
   CHECK( data.int_seven == 6 )
@@ -3986,7 +3928,7 @@ ConditionTests.cpp:72:
 failed with expansion:
   7 == 8
 
-================================================================
+=================================================================
 12 test cases - 3 failed (38 assertions - 4 failed)
 
 <testsuites>
@@ -9332,9 +9274,9 @@ TrickyTests.cpp" line="315">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Scenario: Do that thing with the thing">
-      <Section name="Given: This stuff exists">
-        <Section name="When:  I do this">
-          <Section name="Then:  it should do this">
+      <Section name=" Given: This stuff exists">
+        <Section name="  When:  I do this">
+          <Section name="  Then:  it should do this">
 BDDTests.cpp" line="29">
               <Original>
                 itDoesThis()
@@ -10688,15 +10630,15 @@ TrickyTests.cpp:315: !False succeeded for: !false
 [Finished: './succeeding/SafeBool' All tests passed (3 assertions in 1 test case)]
 
 [Running: Scenario: Do that thing with the thing]
-[Started section: 'Given: This stuff exists']
-[Started section: 'When:  I do this']
-[Started section: 'Then:  it should do this']
+[Started section: ' Given: This stuff exists']
+[Started section: '  When:  I do this']
+[Started section: '  Then:  it should do this']
 BDDTests.cpp:29: itDoesThis() succeeded for: true
-[End of section: 'Then:  it should do this' 1 assertion passed]
+[End of section: '  Then:  it should do this' 1 assertion passed]
 
-[End of section: 'When:  I do this' 1 assertion passed]
+[End of section: '  When:  I do this' 1 assertion passed]
 
-[End of section: 'Given: This stuff exists' 1 assertion passed]
+[End of section: ' Given: This stuff exists' 1 assertion passed]
 
 [Finished: 'Scenario: Do that thing with the thing' All tests passed (1 assertion in 1 test case)]
 [End of group: '~dummy'. 45 of 96 test cases failed (102 of 610 assertions failed)]
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp
index dd43189e..1a8807f6 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp
@@ -14,9 +14,9 @@
 
 // !TBD: story scenarios map to class based tests
 #define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
-#define GIVEN( desc ) SECTION( "Given: " desc, "" )
-#define WHEN( desc ) SECTION( "When:  " desc, "" )
-#define THEN( desc ) SECTION( "Then:  " desc, "" )
+#define GIVEN( desc ) SECTION( " Given: " desc, "" )
+#define WHEN( desc ) SECTION( "  When:  " desc, "" )
+#define THEN( desc ) SECTION( "  Then:  " desc, "" )
 
 inline bool itDoesThis(){ return true; }