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

Changed header and summary logs to multiline forms

Commit
a7079a2dbeed5fb24ea50c499b488467dc8e91f1
Author
Phil Nash ·
Parents
f117812cffa8

Files · Download .tar.gz

Changes

 include/reporters/catch_reporter_console.hpp    |   64 +-
 projects/SelfTest/Baselines/approvedResults.txt | 1232 +++++++++++++++--------
 2 files changed, 867 insertions(+), 429 deletions(-)

diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index d3c05df1..15a5ba4c 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -16,7 +16,8 @@ namespace Catch {
 
     struct ConsoleReporter : AccumulatingReporter {
         ConsoleReporter( ReporterConfig const& _config )
-        : AccumulatingReporter( _config )
+        :   AccumulatingReporter( _config ),
+            m_atLeastOneTestCasePrinted( false )
         {}
 
         virtual ~ConsoleReporter();
@@ -30,19 +31,18 @@ namespace Catch {
 
         }
         void lazyPrintRunInfo() {
-            stream << "[Started testing: " << testRunInfo->name << "]" << std::endl;
+            printHeader( "Started testing", testRunInfo->name );
             testRunInfo.reset();
         }
         void lazyPrintGroupInfo() {
             if( !unusedGroupInfo->name.empty() )
-                stream << "[Group: '" << unusedGroupInfo->name << "']" << std::endl;
+                printHeader( "Group", unusedGroupInfo->name );
             unusedGroupInfo.reset();
         }
         void lazyPrintTestCaseInfo() {
-            stream << "[Test case: '" << unusedTestCaseInfo->name << "']" << std::endl;
+            printHeader( "Test case", unusedTestCaseInfo->name );
             unusedTestCaseInfo.reset();
-        }
-        
+        }        
         void lazyPrintSectionInfo() {
             std::vector<ThreadedSectionInfo*> sections;
             for(    ThreadedSectionInfo* section = unusedSectionInfo.get();
@@ -52,11 +52,26 @@ namespace Catch {
 
             typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
             for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) {
-                stream << "[Section: " << "'" + (*it)->name + "'" << "]" << std::endl;
+                printHeader( "Section", (*it)->name );
                 (*it)->printed = true;
             }
             unusedSectionInfo.reset();
         }
+
+        static std::string const& getDashes() {
+            static const std::string dashes = "----------------------------------------------------------------";
+            return dashes;
+        }
+        static std::string const& getDoubleDashes() {
+            static const std::string doubleDashes = "================================================================";
+            return doubleDashes;
+        }
+        void printHeader( std::string const& _type, std::string const& _name ) {
+            stream  << "-- " << _type << ": '" << _name << "' "
+                    << getDashes().substr( 0, getDashes().size() - ( _type.size() + _name.size() + 9 ) )
+                    << std::endl;
+        }
+
         void lazyPrint() {
             if( testRunInfo )
                 lazyPrintRunInfo();
@@ -245,7 +260,8 @@ namespace Catch {
                 stream << "\nNo assertions in section, '" << _sectionStats->sectionInfo.name << "'\n" << std::endl;
             }
             if( currentSectionInfo && currentSectionInfo->printed ) {
-                stream << "[Summary for section '" << _sectionStats->sectionInfo.name << "': ";
+                printSummarDivider();
+                stream << "Summary for section '" << _sectionStats->sectionInfo.name << "':\n";
                 Counts const& assertions = _sectionStats->assertions;
                 if( assertions.failed ) {
                     TextColour colour( TextColour::ResultError );
@@ -256,7 +272,7 @@ namespace Catch {
                     stream  << ( assertions.passed > 1 ? "All " : "" )
                             << pluralise( assertions.passed, "assertion" ) << " passed" ;
                 }
-                stream << "]\n" << std::endl;
+                stream << "\n" << std::endl;
             }
             AccumulatingReporter::sectionEnded( _sectionStats );
         }
@@ -268,29 +284,40 @@ namespace Catch {
                 stream << "\nNo assertions in test case, '" << _testCaseStats->testInfo.name << "'\n" << std::endl;
             }
             if( !unusedTestCaseInfo ) {
-                stream << "[Summary for test case '" << _testCaseStats->testInfo.name << "': ";
+                m_atLeastOneTestCasePrinted = true;
+                printSummarDivider();
+                stream << "Summary for test case '" << _testCaseStats->testInfo.name << "':\n";
                 printTotals( _testCaseStats->totals );
-                stream << "]\n" << std::endl;
+                stream << "\n" << std::endl;
             }
             AccumulatingReporter::testCaseEnded( _testCaseStats );
         }
         virtual void testGroupEnded( Ptr<TestGroupStats const> const& _testGroupStats ) {
             if( !unusedGroupInfo ) {
-                stream << "[Summary for group '" << _testGroupStats->groupInfo.name << "': ";
+                printSummarDivider();
+                stream << "Summary for group '" << _testGroupStats->groupInfo.name << "':\n";
                 printTotals( _testGroupStats->totals );
-                stream << "]\n" << std::endl;
+                stream << "\n" << std::endl;
             }
             AccumulatingReporter::testGroupEnded( _testGroupStats );
         }
         virtual void testRunEnded( Ptr<TestRunStats const> const& _testRunStats ) {
-            if( !unusedTestCaseInfo ) {
-                stream << "[Summary for '" << _testRunStats->runInfo.name << "': ";
-                printTotals( _testRunStats->totals );
-                stream << "]\n" << std::endl;
-            }
+            if( m_atLeastOneTestCasePrinted )
+                printTotalsDivider();
+            stream << "Summary for all tests in '" << _testRunStats->runInfo.name << "':\n";
+            printTotals( _testRunStats->totals );
+            stream << "\n" << std::endl;
             AccumulatingReporter::testRunEnded( _testRunStats );
         }
 
+    private:
+        void printTotalsDivider() {
+            stream << "================================================================\n";
+        }
+        void printSummarDivider() {
+            stream << "----------------------------------------------------------------\n";
+        }
+
         void printLineInfo( SourceLineInfo const& lineInfo ) {
             if( !lineInfo.empty() ) {
                 if( m_lastPrintedLine.empty() ||
@@ -309,6 +336,7 @@ namespace Catch {
         void resetLastPrintedLine() {
             m_lastPrintedLine = SourceLineInfo();
         }
+        bool m_atLeastOneTestCasePrinted;
         SourceLineInfo m_lastPrintedLine;
 
     };
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 5fc1dfd9..2b8419b7 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,6 +1,6 @@
-[Started testing: CatchSelfTest]
-[Group: '~dummy']
-[Test case: './succeeding/Approx/simple']
+-- Started testing: 'CatchSelfTest'  ---------------------------
+-- Group: '~dummy'  --------------------------------------------
+-- Test case: './succeeding/Approx/simple'  --------------------
 ApproxTests.cpp:20:
 d == Approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
 line 21:
@@ -13,30 +13,38 @@ line 25:
 Approx( d ) != 1.22 succeeded for: Approx( 1.23 ) != 1.22
 line 26:
 Approx( d ) != 1.24 succeeded for: Approx( 1.23 ) != 1.24
-[Summary for test case './succeeding/Approx/simple': All tests passed (6 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/simple':
+All tests passed (6 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/epsilon']
+-- Test case: './succeeding/Approx/epsilon'  -------------------
 ApproxTests.cpp:38:
 d != Approx( 1.231 ) succeeded for: 1.23 != Approx( 1.231 )
 line 39:
 d == Approx( 1.231 ).epsilon( 0.1 ) succeeded for: 1.23 == Approx( 1.231 )
-[Summary for test case './succeeding/Approx/epsilon': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/epsilon':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/float']
+-- Test case: './succeeding/Approx/float'  ---------------------
 ApproxTests.cpp:49:
 1.23f == Approx( 1.23f ) succeeded for: 1.23 == Approx( 1.23 )
 line 50:
 0.0f == Approx( 0.0f ) succeeded for: 0 == Approx( 0 )
-[Summary for test case './succeeding/Approx/float': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/float':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/int']
+-- Test case: './succeeding/Approx/int'  -----------------------
 ApproxTests.cpp:60:
 1 == Approx( 1 ) succeeded
 line 61:
 0 == Approx( 0 ) succeeded
-[Summary for test case './succeeding/Approx/int': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/int':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/mixed']
+-- Test case: './succeeding/Approx/mixed'  ---------------------
 ApproxTests.cpp:75:
 1.0f == Approx( 1 ) succeeded for: 1 == Approx( 1 )
 line 76:
@@ -47,9 +55,11 @@ line 78:
 1.234f == Approx( dMedium ) succeeded for: 1.234 == Approx( 1.234 )
 line 79:
 dMedium == Approx( 1.234f ) succeeded for: 1.234 == Approx( 1.234 )
-[Summary for test case './succeeding/Approx/mixed': All tests passed (5 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/mixed':
+All tests passed (5 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/custom']
+-- Test case: './succeeding/Approx/custom'  --------------------
 ApproxTests.cpp:93:
 d == approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
 line 94:
@@ -66,29 +76,39 @@ line 100:
 approx( d ) == 1.24 succeeded for: Approx( 1.23 ) == 1.24
 line 101:
 approx( d ) != 1.25 succeeded for: Approx( 1.23 ) != 1.25
-[Summary for test case './succeeding/Approx/custom': All tests passed (8 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/custom':
+All tests passed (8 assertions in 1 test case)
 
-[Test case: './succeeding/TestClass/succeedingCase']
+-- Test case: './succeeding/TestClass/succeedingCase'  ---------
 ClassTests.cpp:24:
 s == "hello" succeeded for: "hello" == "hello"
-[Summary for test case './succeeding/TestClass/succeedingCase': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/TestClass/succeedingCase':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './failing/TestClass/failingCase']
+-- Test case: './failing/TestClass/failingCase'  ---------------
 ClassTests.cpp:28:
 s == "world" failed for: "hello" == "world"
-[Summary for test case './failing/TestClass/failingCase': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/TestClass/failingCase':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/Fixture/succeedingCase']
+-- Test case: './succeeding/Fixture/succeedingCase'  -----------
 ClassTests.cpp:47:
 m_a == 1 succeeded for: 1 == 1
-[Summary for test case './succeeding/Fixture/succeedingCase': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Fixture/succeedingCase':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './failing/Fixture/failingCase']
+-- Test case: './failing/Fixture/failingCase'  -----------------
 ClassTests.cpp:55:
 m_a == 2 failed for: 1 == 2
-[Summary for test case './failing/Fixture/failingCase': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/Fixture/failingCase':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/conditions/equality']
+-- Test case: './succeeding/conditions/equality'  --------------
 ConditionTests.cpp:55:
 data.int_seven == 7 succeeded for: 7 == 7
 line 56:
@@ -103,9 +123,11 @@ line 60:
 data.str_hello.size() == 5 succeeded for: 5 == 5
 line 63:
 x == Approx( 1.3 ) succeeded for: 1.3 == Approx( 1.3 )
-[Summary for test case './succeeding/conditions/equality': All tests passed (7 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/equality':
+All tests passed (7 assertions in 1 test case)
 
-[Test case: './failing/conditions/equality']
+-- Test case: './failing/conditions/equality'  -----------------
 ConditionTests.cpp:71:
 data.int_seven == 6 failed for: 7 == 6
 line 72:
@@ -132,9 +154,11 @@ line 82:
 data.str_hello.size() == 6 failed for: 5 == 6
 line 85:
 x == Approx( 1.301 ) failed for: 1.3 == Approx( 1.301 )
-[Summary for test case './failing/conditions/equality': 1 test case - failed (13 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './failing/conditions/equality':
+1 test case - failed (13 assertions - all failed)
 
-[Test case: './succeeding/conditions/inequality']
+-- Test case: './succeeding/conditions/inequality'  ------------
 ConditionTests.cpp:93:
 data.int_seven != 6 succeeded for: 7 != 6
 line 94:
@@ -157,9 +181,11 @@ line 102:
 data.str_hello != "hello1" succeeded for: "hello" != "hello1"
 line 103:
 data.str_hello.size() != 6 succeeded for: 5 != 6
-[Summary for test case './succeeding/conditions/inequality': All tests passed (11 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/inequality':
+All tests passed (11 assertions in 1 test case)
 
-[Test case: './failing/conditions/inequality']
+-- Test case: './failing/conditions/inequality'  ---------------
 ConditionTests.cpp:111:
 data.int_seven != 7 failed for: 7 != 7
 line 112:
@@ -170,9 +196,11 @@ line 114:
 data.str_hello != "hello" failed for: "hello" != "hello"
 line 115:
 data.str_hello.size() != 5 failed for: 5 != 5
-[Summary for test case './failing/conditions/inequality': 1 test case - failed (5 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './failing/conditions/inequality':
+1 test case - failed (5 assertions - all failed)
 
-[Test case: './succeeding/conditions/ordered']
+-- Test case: './succeeding/conditions/ordered'  ---------------
 ConditionTests.cpp:124:
 data.int_seven < 8 succeeded for: 7 < 8
 line 125:
@@ -207,9 +235,11 @@ line 143:
 data.str_hello > "hellm" succeeded for: "hello" > "hellm"
 line 144:
 data.str_hello > "a" succeeded for: "hello" > "a"
-[Summary for test case './succeeding/conditions/ordered': All tests passed (17 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/ordered':
+All tests passed (17 assertions in 1 test case)
 
-[Test case: './failing/conditions/ordered']
+-- Test case: './failing/conditions/ordered'  ------------------
 ConditionTests.cpp:152:
 data.int_seven > 7 failed for: 7 > 7
 line 153:
@@ -248,9 +278,11 @@ ConditionTests.cpp:173:
 data.str_hello >= "z" failed for: "hello" >= "z"
 line 174:
 data.str_hello <= "a" failed for: "hello" <= "a"
-[Summary for test case './failing/conditions/ordered': 1 test case - failed (19 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './failing/conditions/ordered':
+1 test case - failed (19 assertions - all failed)
 
-[Test case: './succeeding/conditions/int literals']
+-- Test case: './succeeding/conditions/int literals'  ----------
 ConditionTests.cpp:188:
 i == 1 succeeded for: 1 == 1
 line 189:
@@ -277,9 +309,11 @@ line 200:
 6 == uc succeeded for: 6 == 
 line 202:
 (std::numeric_limits<unsigned long>::max)() > ul succeeded for: 0x<hex digits> > 4
-[Summary for test case './succeeding/conditions/int literals': All tests passed (13 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/int literals':
+All tests passed (13 assertions in 1 test case)
 
-[Test case: './succeeding/conditions//long_to_unsigned_x']
+-- Test case: './succeeding/conditions//long_to_unsigned_x'  ---
 ConditionTests.cpp:223:
 long_var == unsigned_char_var succeeded for: 1 == 
 line 224:
@@ -288,9 +322,11 @@ line 225:
 long_var == unsigned_int_var succeeded for: 1 == 1
 line 226:
 long_var == unsigned_long_var succeeded for: 1 == 1
-[Summary for test case './succeeding/conditions//long_to_unsigned_x': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions//long_to_unsigned_x':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: './succeeding/conditions/const ints to int literal']
+-- Test case: './succeeding/conditions/const ints to int literal'  ----------------------------------------------------------------
 ConditionTests.cpp:237:
 unsigned_char_var == 1 succeeded for:  == 1
 line 238:
@@ -299,9 +335,11 @@ line 239:
 unsigned_int_var == 1 succeeded for: 1 == 1
 line 240:
 unsigned_long_var == 1 succeeded for: 1 == 1
-[Summary for test case './succeeding/conditions/const ints to int literal': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/const ints to int literal':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: './succeeding/conditions/negative ints']
+-- Test case: './succeeding/conditions/negative ints'  ---------
 ConditionTests.cpp:246:
 ( -1 > 2u ) succeeded for: true
 line 247:
@@ -314,14 +352,18 @@ line 253:
 ( minInt > 2u ) succeeded for: true
 line 254:
 minInt > 2u succeeded for: -2147483648 > 2
-[Summary for test case './succeeding/conditions/negative ints': All tests passed (6 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/negative ints':
+All tests passed (6 assertions in 1 test case)
 
-[Test case: './succeeding/conditions/computed ints']
+-- Test case: './succeeding/conditions/computed ints'  ---------
 ConditionTests.cpp:269:
 54 == 6*9 succeeded for: 54 == 54
-[Summary for test case './succeeding/conditions/computed ints': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/computed ints':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/conditions/ptr']
+-- Test case: './succeeding/conditions/ptr'  -------------------
 ConditionTests.cpp:285:
 p == __null succeeded for: __null == 0
 line 286:
@@ -338,9 +380,11 @@ line 300:
 returnsConstNull() == __null succeeded for: {null string} == 0
 line 302:
 __null != p succeeded for: 0 != 0x<hex digits>
-[Summary for test case './succeeding/conditions/ptr': All tests passed (8 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/ptr':
+All tests passed (8 assertions in 1 test case)
 
-[Test case: './succeeding/conditions/not']
+-- Test case: './succeeding/conditions/not'  -------------------
 ConditionTests.cpp:317:
 false == false succeeded
 line 318:
@@ -357,9 +401,11 @@ line 325:
 !(1 == 2) succeeded for: true
 line 326:
 !1 == 2 succeeded for: !(1 == 2)
-[Summary for test case './succeeding/conditions/not': All tests passed (8 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/not':
+All tests passed (8 assertions in 1 test case)
 
-[Test case: './failing/conditions/not']
+-- Test case: './failing/conditions/not'  ----------------------
 ConditionTests.cpp:334:
 false != false failed
 line 335:
@@ -376,69 +422,91 @@ line 342:
 !(1 == 1) failed for: false
 line 343:
 !1 == 1 failed for: !(1 == 1)
-[Summary for test case './failing/conditions/not': 1 test case - failed (8 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './failing/conditions/not':
+1 test case - failed (8 assertions - all failed)
 
-[Test case: './succeeding/exceptions/explicit']
+-- Test case: './succeeding/exceptions/explicit'  --------------
 ExceptionTests.cpp:39:
 thisThrows() succeeded
 line 40:
 thisDoesntThrow() succeeded
 line 41:
 thisThrows() succeeded
-[Summary for test case './succeeding/exceptions/explicit': All tests passed (3 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/exceptions/explicit':
+All tests passed (3 assertions in 1 test case)
 
-[Test case: './failing/exceptions/explicit']
+-- Test case: './failing/exceptions/explicit'  -----------------
 ExceptionTests.cpp:47:
 thisThrows() failed with unexpected exception with message: 'expected exception'
 line 48:
 thisDoesntThrow() failed because no exception was thrown where one was expected
 line 49:
 thisThrows() failed with unexpected exception with message: 'expected exception'
-[Summary for test case './failing/exceptions/explicit': 1 test case - failed (3 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/explicit':
+1 test case - failed (3 assertions - all failed)
 
-[Test case: './failing/exceptions/implicit']
+-- Test case: './failing/exceptions/implicit'  -----------------
 ExceptionTests.cpp:52:
 Unexpected exception with message: 'unexpected exception'
-[Summary for test case './failing/exceptions/implicit': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/implicit':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/exceptions/implicit/2']
+-- Test case: './failing/exceptions/implicit/2'  ---------------
 ExceptionTests.cpp:60:
 1 == 1 succeeded
 {Unknown expression after this line} failed with unexpected exception with message: 'unexpected exception'
-[Summary for test case './failing/exceptions/implicit/2': 1 test case - failed (2 assertions - 1 failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/implicit/2':
+1 test case - failed (2 assertions - 1 failed)
 
-[Test case: './succeeding/exceptions/implicit']
+-- Test case: './succeeding/exceptions/implicit'  --------------
 
 No assertions in test case, './succeeding/exceptions/implicit'
 
-[Summary for test case './succeeding/exceptions/implicit': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './succeeding/exceptions/implicit':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/exceptions/custom']
+-- Test case: './failing/exceptions/custom'  -------------------
 ExceptionTests.cpp:102:
 Unexpected exception with message: 'custom exception'
-[Summary for test case './failing/exceptions/custom': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/custom':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/exceptions/custom/nothrow']
+-- Test case: './failing/exceptions/custom/nothrow'  -----------
 ExceptionTests.cpp:109:
 throw CustomException( "unexpected custom exception" ) failed with unexpected exception with message: 'unexpected custom exception'
-[Summary for test case './failing/exceptions/custom/nothrow': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/custom/nothrow':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/exceptions/custom/throw']
+-- Test case: './failing/exceptions/custom/throw'  -------------
 ExceptionTests.cpp:114:
 throw CustomException( "custom exception - not std" ) failed with unexpected exception with message: 'custom exception - not std'
-[Summary for test case './failing/exceptions/custom/throw': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/custom/throw':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/exceptions/custom/double']
+-- Test case: './failing/exceptions/custom/double'  ------------
 ExceptionTests.cpp:118:
 Unexpected exception with message: '3.14'
-[Summary for test case './failing/exceptions/custom/double': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/exceptions/custom/double':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/exceptions/notimplemented']
+-- Test case: './succeeding/exceptions/notimplemented'  --------
 ExceptionTests.cpp:129:
 thisFunctionNotImplemented( 7 ) succeeded
-[Summary for test case './succeeding/exceptions/notimplemented': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/exceptions/notimplemented':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/generators/1']
+-- Test case: './succeeding/generators/1'  ---------------------
 GeneratorTests.cpp:26:
 multiply( i, 2 ) == i*2 succeeded for: 2 == 2
 line 27:
@@ -656,32 +724,40 @@ multiply( j, 2 ) == j*2 succeeded for: 214 == 214
 multiply( i, 2 ) == i*2 succeeded for: 72 == 72
 line 27:
 multiply( j, 2 ) == j*2 succeeded for: 214 == 214
-[Summary for test case './succeeding/generators/1': All tests passed (144 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/generators/1':
+All tests passed (144 assertions in 1 test case)
 
-[Test case: './succeeding/message']
+-- Test case: './succeeding/message'  --------------------------
 MessageTests.cpp:14:
 [warning: this is a warning]
 
 No assertions in test case, './succeeding/message'
 
-[Summary for test case './succeeding/message': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './succeeding/message':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/succeed']
+-- Test case: './succeeding/succeed'  --------------------------
 MessageTests.cpp:18:
  succeeded
 [with message: this is a success]
-[Summary for test case './succeeding/succeed': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/succeed':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './failing/message/info/1']
+-- Test case: './failing/message/info/1'  ----------------------
 MessageTests.cpp:23:
 [info: this message should be logged]
 line 24:
 [info: so should this]
 line 26:
 a == 1 failed for: 2 == 1
-[Summary for test case './failing/message/info/1': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/message/info/1':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './mixed/message/info/2']
+-- Test case: './mixed/message/info/2'  ------------------------
 MessageTests.cpp:33:
 a == 2 succeeded for: 2 == 2
 line 31:
@@ -696,44 +772,60 @@ line 41:
 a == 0 failed for: 2 == 0
 line 45:
 a == 2 succeeded for: 2 == 2
-[Summary for test case './mixed/message/info/2': 1 test case - failed (4 assertions - 2 failed)]
+----------------------------------------------------------------
+Summary for test case './mixed/message/info/2':
+1 test case - failed (4 assertions - 2 failed)
 
-[Test case: './failing/message/fail']
+-- Test case: './failing/message/fail'  ------------------------
 MessageTests.cpp:51:
 failed with message: 'This is a failure'
-[Summary for test case './failing/message/fail': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/message/fail':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/message/sections']
-[Section: 'one']
+-- Test case: './failing/message/sections'  --------------------
+-- Section: 'one'  ---------------------------------------------
 MessageTests.cpp:58:
 failed with message: 'Message from section one'
-[Summary for section 'one': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'one':
+1 assertion - failed
 
-[Section: 'two']
+-- Section: 'two'  ---------------------------------------------
 MessageTests.cpp:63:
 failed with message: 'Message from section two'
-[Summary for section 'two': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'two':
+1 assertion - failed
 
-[Summary for test case './failing/message/sections': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './failing/message/sections':
+1 test case - failed (2 assertions - both failed)
 
 Message from section one
-[Test case: './succeeding/message/sections/stdout']
-[Section: 'one']
+-- Test case: './succeeding/message/sections/stdout'  ----------
+-- Section: 'one'  ---------------------------------------------
 
 No assertions in section, 'one'
 
-[Summary for section 'one': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'one':
+1 assertion - failed
 
 Message from section two
-[Section: 'two']
+-- Section: 'two'  ---------------------------------------------
 
 No assertions in section, 'two'
 
-[Summary for section 'two': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'two':
+1 assertion - failed
 
-[Summary for test case './succeeding/message/sections/stdout': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './succeeding/message/sections/stdout':
+1 test case - failed (2 assertions - both failed)
 
-[Test case: './mixed/message/scoped']
+-- Test case: './mixed/message/scoped'  ------------------------
 MessageTests.cpp:86:
 i < 10 succeeded for: 0 < 10
 i < 10 succeeded for: 1 < 10
@@ -748,109 +840,155 @@ i < 10 succeeded for: 9 < 10
 i < 10 succeeded[info: current counter 10]
 i < 10 succeeded[info: i := 10]
 i < 10 failed for: 10 < 10
-[Summary for test case './mixed/message/scoped': 1 test case - failed (11 assertions - 1 failed)]
+----------------------------------------------------------------
+Summary for test case './mixed/message/scoped':
+1 test case - failed (11 assertions - 1 failed)
 
-[Test case: './succeeding/nofail']
+-- Test case: './succeeding/nofail'  ---------------------------
 MessageTests.cpp:92:
 1 == 2 failed - but was ok
 
 No assertions in test case, './succeeding/nofail'
 
-[Summary for test case './succeeding/nofail': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './succeeding/nofail':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/Misc/Sections']
-[Section: 's1']
+-- Test case: './succeeding/Misc/Sections'  --------------------
+-- Section: 's1'  ----------------------------------------------
 MiscTests.cpp:25:
 a != b succeeded for: 1 != 2
 line 26:
 b != a succeeded for: 2 != 1
-[Summary for section 's1': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 's1':
+All 2 assertions passed
 
-[Section: 's2']
+-- Section: 's2'  ----------------------------------------------
 MiscTests.cpp:31:
 a != b succeeded for: 1 != 2
-[Summary for section 's2': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's2':
+1 assertion passed
 
-[Summary for test case './succeeding/Misc/Sections': All tests passed (3 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Misc/Sections':
+All tests passed (3 assertions in 1 test case)
 
-[Test case: './succeeding/Misc/Sections/nested']
-[Section: 's1']
+-- Test case: './succeeding/Misc/Sections/nested'  -------------
+-- Section: 's1'  ----------------------------------------------
 MiscTests.cpp:42:
 a != b succeeded for: 1 != 2
 line 43:
 b != a succeeded for: 2 != 1
-[Section: 's2']
+-- Section: 's2'  ----------------------------------------------
 line 47:
 a != b succeeded for: 1 != 2
-[Summary for section 's2': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's2':
+1 assertion passed
 
-[Summary for section 's1': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section 's1':
+All 3 assertions passed
 
-[Summary for test case './succeeding/Misc/Sections/nested': All tests passed (3 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Misc/Sections/nested':
+All tests passed (3 assertions in 1 test case)
 
-[Test case: './mixed/Misc/Sections/nested2']
-[Section: 's1']
-[Section: 's2']
+-- Test case: './mixed/Misc/Sections/nested2'  -----------------
+-- Section: 's1'  ----------------------------------------------
+-- Section: 's2'  ----------------------------------------------
 MiscTests.cpp:61:
 a == b failed for: 1 == 2
-[Summary for section 's2': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 's2':
+1 assertion - failed
 
-[Summary for section 's1': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 's1':
+1 assertion - failed
 
-[Section: 's1']
-[Section: 's3']
+-- Section: 's1'  ----------------------------------------------
+-- Section: 's3'  ----------------------------------------------
 MiscTests.cpp:66:
 a != b succeeded for: 1 != 2
-[Summary for section 's3': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's3':
+1 assertion passed
 
-[Summary for section 's1': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's1':
+1 assertion passed
 
-[Section: 's1']
-[Section: 's4']
+-- Section: 's1'  ----------------------------------------------
+-- Section: 's4'  ----------------------------------------------
 MiscTests.cpp:70:
 a < b succeeded for: 1 < 2
-[Summary for section 's4': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's4':
+1 assertion passed
 
-[Summary for section 's1': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 's1':
+1 assertion passed
 
-[Summary for test case './mixed/Misc/Sections/nested2': 1 test case - failed (3 assertions - 1 failed)]
+----------------------------------------------------------------
+Summary for test case './mixed/Misc/Sections/nested2':
+1 test case - failed (3 assertions - 1 failed)
 
-[Test case: './Sections/nested/a/b']
-[Section: 'c']
-[Section: 'd (leaf)']
+-- Test case: './Sections/nested/a/b'  -------------------------
+-- Section: 'c'  -----------------------------------------------
+-- Section: 'd (leaf)'  ----------------------------------------
 
 No assertions in section, 'd (leaf)'
 
-[Summary for section 'd (leaf)': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'd (leaf)':
+1 assertion - failed
 
-[Summary for section 'c': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'c':
+1 assertion - failed
 
-[Section: 'c']
-[Section: 'e (leaf)']
+-- Section: 'c'  -----------------------------------------------
+-- Section: 'e (leaf)'  ----------------------------------------
 
 No assertions in section, 'e (leaf)'
 
-[Summary for section 'e (leaf)': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'e (leaf)':
+1 assertion - failed
 
-[Summary for section 'c': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'c':
+1 assertion - failed
 
-[Section: 'f (leaf)']
+-- Section: 'f (leaf)'  ----------------------------------------
 
 No assertions in section, 'f (leaf)'
 
-[Summary for section 'f (leaf)': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'f (leaf)':
+1 assertion - failed
 
-[Summary for test case './Sections/nested/a/b': 1 test case - failed (3 assertions - all failed)]
+----------------------------------------------------------------
+Summary for test case './Sections/nested/a/b':
+1 test case - failed (3 assertions - all failed)
 
-[Test case: './mixed/Misc/Sections/loops']
-[Section: 's1']
+-- Test case: './mixed/Misc/Sections/loops'  -------------------
+-- Section: 's1'  ----------------------------------------------
 MiscTests.cpp:103:
 b > a failed for: 0 > 1
-[Summary for section 's1': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 's1':
+1 assertion - failed
 
-[Summary for test case './mixed/Misc/Sections/loops': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './mixed/Misc/Sections/loops':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './mixed/Misc/loops']
+-- Test case: './mixed/Misc/loops'  ----------------------------
 MiscTests.cpp:114:
 [info: Testing if fib[0] (1) is even]
 line 115:
@@ -876,88 +1014,114 @@ line 115:
 [info: Testing if fib[7] (21) is even]
 line 115:
 ( fib[i] % 2 ) == 0 failed for: 1 == 0
-[Summary for test case './mixed/Misc/loops': 1 test case - failed (8 assertions - 6 failed)]
+----------------------------------------------------------------
+Summary for test case './mixed/Misc/loops':
+1 test case - failed (8 assertions - 6 failed)
 
 Some information
 An error
-[Test case: './succeeding/Misc/stdout,stderr']
+-- Test case: './succeeding/Misc/stdout,stderr'  ---------------
 
 No assertions in test case, './succeeding/Misc/stdout,stderr'
 
-[Summary for test case './succeeding/Misc/stdout,stderr': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Misc/stdout,stderr':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/Misc/null strings']
+-- Test case: './succeeding/Misc/null strings'  ----------------
 MiscTests.cpp:133:
 makeString( false ) != static_cast<char*>(__null) succeeded for: "valid string" != {null string}
 line 134:
 makeString( true ) == static_cast<char*>(__null) succeeded for: {null string} == {null string}
-[Summary for test case './succeeding/Misc/null strings': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Misc/null strings':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './failing/info']
+-- Test case: './failing/info'  --------------------------------
 MiscTests.cpp:139:
 [info: hi]
 line 141:
 [info: i := 7]
 line 142:
 false failed
-[Summary for test case './failing/info': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/info':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/checkedif']
+-- Test case: './succeeding/checkedif'  ------------------------
 MiscTests.cpp:147:
 flag succeeded for: true
 line 155:
 testCheckedIf( true ) succeeded for: true
-[Summary for test case './succeeding/checkedif': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/checkedif':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './failing/checkedif']
+-- Test case: './failing/checkedif'  ---------------------------
 MiscTests.cpp:147:
 flag failed for: false
 line 160:
 testCheckedIf( false ) failed for: false
-[Summary for test case './failing/checkedif': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './failing/checkedif':
+1 test case - failed (2 assertions - both failed)
 
-[Test case: './succeeding/checkedelse']
+-- Test case: './succeeding/checkedelse'  ----------------------
 MiscTests.cpp:165:
 flag succeeded for: true
 line 173:
 testCheckedElse( true ) succeeded for: true
-[Summary for test case './succeeding/checkedelse': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/checkedelse':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './failing/checkedelse']
+-- Test case: './failing/checkedelse'  -------------------------
 MiscTests.cpp:165:
 flag failed for: false
 line 178:
 testCheckedElse( false ) failed for: false
-[Summary for test case './failing/checkedelse': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './failing/checkedelse':
+1 test case - failed (2 assertions - both failed)
 
-[Test case: './misc/xmlentitycheck']
-[Section: 'embedded xml']
+-- Test case: './misc/xmlentitycheck'  -------------------------
+-- Section: 'embedded xml'  ------------------------------------
 
 No assertions in section, 'embedded xml'
 
-[Summary for section 'embedded xml': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'embedded xml':
+1 assertion - failed
 
-[Section: 'encoded chars']
+-- Section: 'encoded chars'  -----------------------------------
 
 No assertions in section, 'encoded chars'
 
-[Summary for section 'encoded chars': 1 assertion - failed]
+----------------------------------------------------------------
+Summary for section 'encoded chars':
+1 assertion - failed
 
-[Summary for test case './misc/xmlentitycheck': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './misc/xmlentitycheck':
+1 test case - failed (2 assertions - both failed)
 
-[Test case: './manual/onechar']
+-- Test case: './manual/onechar'  ------------------------------
 MiscTests.cpp:195:
 [info: 3]
 line 196:
 false failed
-[Summary for test case './manual/onechar': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './manual/onechar':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/atomic if']
+-- Test case: './succeeding/atomic if'  ------------------------
 MiscTests.cpp:206:
 x == 0 succeeded for: 0 == 0
-[Summary for test case './succeeding/atomic if': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/atomic if':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/matchers']
+-- Test case: './succeeding/matchers'  -------------------------
 MiscTests.cpp:216:
 testStringForMatching() Contains( "string" ) succeeded for:
 	"this string contains 'abc' as a substring" contains: "string"
@@ -970,54 +1134,70 @@ testStringForMatching() StartsWith( "this" ) succeeded for:
 line 220:
 testStringForMatching() EndsWith( "substring" ) succeeded for:
 	"this string contains 'abc' as a substring" ends with: "substring"
-[Summary for test case './succeeding/matchers': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/matchers':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: './failing/matchers/Contains']
+-- Test case: './failing/matchers/Contains'  -------------------
 MiscTests.cpp:225:
 testStringForMatching() Contains( "not there" ) failed for:
 	"this string contains 'abc' as a substring" contains: "not there"
-[Summary for test case './failing/matchers/Contains': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/matchers/Contains':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/matchers/StartsWith']
+-- Test case: './failing/matchers/StartsWith'  -----------------
 MiscTests.cpp:230:
 testStringForMatching() StartsWith( "string" ) failed for:
 	"this string contains 'abc' as a substring" starts with: "string"
-[Summary for test case './failing/matchers/StartsWith': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/matchers/StartsWith':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/matchers/EndsWith']
+-- Test case: './failing/matchers/EndsWith'  -------------------
 MiscTests.cpp:235:
 testStringForMatching() EndsWith( "this" ) failed for:
 	"this string contains 'abc' as a substring" ends with: "this"
-[Summary for test case './failing/matchers/EndsWith': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/matchers/EndsWith':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/matchers/Equals']
+-- Test case: './failing/matchers/Equals'  ---------------------
 MiscTests.cpp:240:
 testStringForMatching() Equals( "something else" ) failed for:
 	"this string contains 'abc' as a substring" equals: "something else"
-[Summary for test case './failing/matchers/Equals': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/matchers/Equals':
+1 test case - failed (1 assertion - failed)
 
-[Test case: '/succeeding/matchers/AllOf']
+-- Test case: '/succeeding/matchers/AllOf'  --------------------
 MiscTests.cpp:245:
 testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
-[Summary for test case '/succeeding/matchers/AllOf': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case '/succeeding/matchers/AllOf':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: '/succeeding/matchers/AnyOf']
+-- Test case: '/succeeding/matchers/AnyOf'  --------------------
 MiscTests.cpp:249:
 testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
 line 250:
 testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) succeeded for:
 "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
-[Summary for test case '/succeeding/matchers/AnyOf': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case '/succeeding/matchers/AnyOf':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/matchers/Equals']
+-- Test case: './succeeding/matchers/Equals'  ------------------
 MiscTests.cpp:255:
 testStringForMatching() Equals( "this string contains 'abc' as a substring" ) succeeded for:
 "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
-[Summary for test case './succeeding/matchers/Equals': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/matchers/Equals':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: 'example/factorial']
+-- Test case: 'example/factorial'  -----------------------------
 MiscTests.cpp:266:
 Factorial(0) == 1 succeeded for: 1 == 1
 line 267:
@@ -1028,37 +1208,47 @@ line 269:
 Factorial(3) == 6 succeeded for: 6 == 6
 line 270:
 Factorial(10) == 3628800 succeeded for: 0x<hex digits> == 3628800
-[Summary for test case 'example/factorial': All tests passed (5 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'example/factorial':
+All tests passed (5 assertions in 1 test case)
 
-[Test case: 'empty']
+-- Test case: 'empty'  -----------------------------------------
 
 No assertions in test case, 'empty'
 
-[Summary for test case 'empty': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case 'empty':
+1 test case - failed (1 assertion - failed)
 
-[Test case: 'Nice descriptive name']
+-- Test case: 'Nice descriptive name'  -------------------------
 MiscTests.cpp:279:
 [warning: This one ran]
 
 No assertions in test case, 'Nice descriptive name'
 
-[Summary for test case 'Nice descriptive name': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case 'Nice descriptive name':
+1 test case - failed (1 assertion - failed)
 
-[Test case: 'first tag']
+-- Test case: 'first tag'  -------------------------------------
 
 No assertions in test case, 'first tag'
 
-[Summary for test case 'first tag': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case 'first tag':
+1 test case - failed (1 assertion - failed)
 
-[Test case: 'second tag']
+-- Test case: 'second tag'  ------------------------------------
 
 No assertions in test case, 'second tag'
 
-[Summary for test case 'second tag': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case 'second tag':
+1 test case - failed (1 assertion - failed)
 
-[Test case: 'selftest/main']
-[Section: 'selftest/expected result']
-[Section: 'selftest/expected result/failing tests']
+-- Test case: 'selftest/main'  ---------------------------------
+-- Section: 'selftest/expected result'  ------------------------
+-- Section: 'selftest/expected result/failing tests'  ----------
 /Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106:
  succeeded
 [with message: Tests failed, as expected]
@@ -1110,12 +1300,16 @@ No assertions in test case, 'second tag'
 [with message: Tests failed, as expected]
  succeeded
 [with message: Tests failed, as expected]
-[Summary for section 'selftest/expected result/failing tests': All 25 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/expected result/failing tests':
+All 25 assertions passed
 
-[Summary for section 'selftest/expected result': All 25 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/expected result':
+All 25 assertions passed
 
-[Section: 'selftest/expected result']
-[Section: 'selftest/expected result/succeeding tests']
+-- Section: 'selftest/expected result'  ------------------------
+-- Section: 'selftest/expected result/succeeding tests'  -------
 /Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95:
  succeeded
 [with message: Tests passed, as expected]
@@ -1207,45 +1401,61 @@ An error
 [with message: Tests passed, as expected]
  succeeded
 [with message: Tests passed, as expected]
-[Summary for section 'selftest/expected result/succeeding tests': All 43 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/expected result/succeeding tests':
+All 43 assertions passed
 
-[Summary for section 'selftest/expected result': All 43 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/expected result':
+All 43 assertions passed
 
 Message from section one
 Message from section two
 Some information
 An error
-[Section: 'selftest/test counts']
-[Section: 'selftest/test counts/succeeding tests']
+-- Section: 'selftest/test counts'  ----------------------------
+-- Section: 'selftest/test counts/succeeding tests'  -----------
 TestMain.cpp:40:
 totals.assertions.passed == 291 succeeded for: 291 == 291
 line 41:
 totals.assertions.failed == 0 succeeded for: 0 == 0
-[Summary for section 'selftest/test counts/succeeding tests': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/test counts/succeeding tests':
+All 2 assertions passed
 
-[Summary for section 'selftest/test counts': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/test counts':
+All 2 assertions passed
 
-[Section: 'selftest/test counts']
-[Section: 'selftest/test counts/failing tests']
+-- Section: 'selftest/test counts'  ----------------------------
+-- Section: 'selftest/test counts/failing tests'  --------------
 TestMain.cpp:47:
 totals.assertions.passed == 1 succeeded for: 1 == 1
 line 48:
 totals.assertions.failed == 72 succeeded for: 72 == 72
-[Summary for section 'selftest/test counts/failing tests': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/test counts/failing tests':
+All 2 assertions passed
 
-[Summary for section 'selftest/test counts': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'selftest/test counts':
+All 2 assertions passed
 
-[Summary for test case 'selftest/main': All tests passed (72 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/main':
+All tests passed (72 assertions in 1 test case)
 
-[Test case: 'meta/Misc/Sections']
+-- Test case: 'meta/Misc/Sections'  ----------------------------
 TestMain.cpp:57:
 totals.assertions.passed == 2 succeeded for: 2 == 2
 line 58:
 totals.assertions.failed == 1 succeeded for: 1 == 1
-[Summary for test case 'meta/Misc/Sections': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'meta/Misc/Sections':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: 'selftest/parser/2']
-[Section: 'default']
+-- Test case: 'selftest/parser/2'  -----------------------------
+-- Section: 'default'  -----------------------------------------
 TestMain.cpp:97:
 parseIntoConfig( argv, config ) succeeded
 line 99:
@@ -1256,10 +1466,12 @@ line 101:
 config.allowThrows == true succeeded for: true == true
 line 102:
 config.reporter.empty() succeeded for: true
-[Summary for section 'default': All 5 assertions passed]
+----------------------------------------------------------------
+Summary for section 'default':
+All 5 assertions passed
 
-[Section: 'test lists']
-[Section: '-t/1']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '-t/1'  --------------------------------------------
 TestMain.cpp:108:
 parseIntoConfig( argv, config ) succeeded
 line 110:
@@ -1268,12 +1480,16 @@ line 111:
 config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
 line 112:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
-[Summary for section '-t/1': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '-t/1':
+All 4 assertions passed
 
-[Summary for section 'test lists': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 4 assertions passed
 
-[Section: 'test lists']
-[Section: '-t/exclude:1']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '-t/exclude:1'  ------------------------------------
 TestMain.cpp:116:
 parseIntoConfig( argv, config ) succeeded
 line 118:
@@ -1282,12 +1498,16 @@ line 119:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
 line 120:
 config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
-[Summary for section '-t/exclude:1': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '-t/exclude:1':
+All 4 assertions passed
 
-[Summary for section 'test lists': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 4 assertions passed
 
-[Section: 'test lists']
-[Section: '--test/1']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '--test/1'  ----------------------------------------
 TestMain.cpp:125:
 parseIntoConfig( argv, config ) succeeded
 line 127:
@@ -1296,12 +1516,16 @@ line 128:
 config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
 line 129:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
-[Summary for section '--test/1': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '--test/1':
+All 4 assertions passed
 
-[Summary for section 'test lists': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 4 assertions passed
 
-[Section: 'test lists']
-[Section: '--test/exclude:1']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '--test/exclude:1'  --------------------------------
 TestMain.cpp:134:
 parseIntoConfig( argv, config ) succeeded
 line 136:
@@ -1310,12 +1534,16 @@ line 137:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
 line 138:
 config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
-[Summary for section '--test/exclude:1': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '--test/exclude:1':
+All 4 assertions passed
 
-[Summary for section 'test lists': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 4 assertions passed
 
-[Section: 'test lists']
-[Section: '--test/exclude:2']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '--test/exclude:2'  --------------------------------
 TestMain.cpp:143:
 parseIntoConfig( argv, config ) succeeded
 line 145:
@@ -1324,12 +1552,16 @@ line 146:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
 line 147:
 config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
-[Summary for section '--test/exclude:2': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '--test/exclude:2':
+All 4 assertions passed
 
-[Summary for section 'test lists': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 4 assertions passed
 
-[Section: 'test lists']
-[Section: '-t/2']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '-t/2'  --------------------------------------------
 TestMain.cpp:152:
 parseIntoConfig( argv, config ) succeeded
 line 154:
@@ -1340,190 +1572,266 @@ line 156:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
 line 157:
 config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) succeeded for: true
-[Summary for section '-t/2': All 5 assertions passed]
+----------------------------------------------------------------
+Summary for section '-t/2':
+All 5 assertions passed
 
-[Summary for section 'test lists': All 5 assertions passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+All 5 assertions passed
 
-[Section: 'test lists']
-[Section: '-t/0']
+-- Section: 'test lists'  --------------------------------------
+-- Section: '-t/0'  --------------------------------------------
 TestMain.cpp:162:
 parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) succeeded for:
 "Error while parsing arguments. Expected at least 1 argument." contains: "at least 1"
-[Summary for section '-t/0': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-t/0':
+1 assertion passed
 
-[Summary for section 'test lists': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'test lists':
+1 assertion passed
 
-[Section: 'reporter']
-[Section: '-r/basic']
+-- Section: 'reporter'  ----------------------------------------
+-- Section: '-r/basic'  ----------------------------------------
 TestMain.cpp:169:
 parseIntoConfig( argv, config ) succeeded
 line 171:
 config.reporter == "console" succeeded for: "console" == "console"
-[Summary for section '-r/basic': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-r/basic':
+All 2 assertions passed
 
-[Summary for section 'reporter': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'reporter':
+All 2 assertions passed
 
-[Section: 'reporter']
-[Section: '-r/xml']
+-- Section: 'reporter'  ----------------------------------------
+-- Section: '-r/xml'  ------------------------------------------
 TestMain.cpp:175:
 parseIntoConfig( argv, config ) succeeded
 line 177:
 config.reporter == "xml" succeeded for: "xml" == "xml"
-[Summary for section '-r/xml': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-r/xml':
+All 2 assertions passed
 
-[Summary for section 'reporter': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'reporter':
+All 2 assertions passed
 
-[Section: 'reporter']
-[Section: '--reporter/junit']
+-- Section: 'reporter'  ----------------------------------------
+-- Section: '--reporter/junit'  --------------------------------
 TestMain.cpp:181:
 parseIntoConfig( argv, config ) succeeded
 line 183:
 config.reporter == "junit" succeeded for: "junit" == "junit"
-[Summary for section '--reporter/junit': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '--reporter/junit':
+All 2 assertions passed
 
-[Summary for section 'reporter': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'reporter':
+All 2 assertions passed
 
-[Section: 'reporter']
-[Section: '-r/error']
+-- Section: 'reporter'  ----------------------------------------
+-- Section: '-r/error'  ----------------------------------------
 TestMain.cpp:187:
 parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) succeeded for:
 "Error while parsing arguments. Expected 1 argument. Arguments were: one two" contains: "1 argument"
-[Summary for section '-r/error': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-r/error':
+1 assertion passed
 
-[Summary for section 'reporter': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'reporter':
+1 assertion passed
 
-[Section: 'debugger']
-[Section: '-b']
+-- Section: 'debugger'  ----------------------------------------
+-- Section: '-b'  ----------------------------------------------
 TestMain.cpp:194:
 parseIntoConfig( argv, config ) succeeded
 line 196:
 config.shouldDebugBreak == true succeeded for: true == true
-[Summary for section '-b': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-b':
+All 2 assertions passed
 
-[Summary for section 'debugger': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'debugger':
+All 2 assertions passed
 
-[Section: 'debugger']
-[Section: '--break']
+-- Section: 'debugger'  ----------------------------------------
+-- Section: '--break'  -----------------------------------------
 TestMain.cpp:200:
 parseIntoConfig( argv, config ) succeeded
 line 202:
 config.shouldDebugBreak succeeded for: true
-[Summary for section '--break': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '--break':
+All 2 assertions passed
 
-[Summary for section 'debugger': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'debugger':
+All 2 assertions passed
 
-[Section: 'debugger']
-[Section: '-b']
+-- Section: 'debugger'  ----------------------------------------
+-- Section: '-b'  ----------------------------------------------
 TestMain.cpp:206:
 parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) succeeded for:
 "Error while parsing arguments. Expected 0 arguments. Arguments were: unexpected" contains: "0 arguments"
-[Summary for section '-b': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-b':
+1 assertion passed
 
-[Summary for section 'debugger': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'debugger':
+1 assertion passed
 
-[Section: 'abort']
-[Section: '-a']
+-- Section: 'abort'  -------------------------------------------
+-- Section: '-a'  ----------------------------------------------
 TestMain.cpp:213:
 parseIntoConfig( argv, config ) succeeded
 line 215:
 config.cutoff == 1 succeeded for: 1 == 1
-[Summary for section '-a': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-a':
+All 2 assertions passed
 
-[Summary for section 'abort': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'abort':
+All 2 assertions passed
 
-[Section: 'abort']
-[Section: '-a/2']
+-- Section: 'abort'  -------------------------------------------
+-- Section: '-a/2'  --------------------------------------------
 TestMain.cpp:219:
 parseIntoConfig( argv, config ) succeeded
 line 221:
 config.cutoff == 2 succeeded for: 2 == 2
-[Summary for section '-a/2': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-a/2':
+All 2 assertions passed
 
-[Summary for section 'abort': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'abort':
+All 2 assertions passed
 
-[Section: 'abort']
-[Section: '-a/error/0']
+-- Section: 'abort'  -------------------------------------------
+-- Section: '-a/error/0'  --------------------------------------
 TestMain.cpp:225:
 parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
 "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: 0" contains: "greater than zero"
-[Summary for section '-a/error/0': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-a/error/0':
+1 assertion passed
 
-[Summary for section 'abort': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'abort':
+1 assertion passed
 
-[Section: 'abort']
-[Section: '-a/error/non numeric']
+-- Section: 'abort'  -------------------------------------------
+-- Section: '-a/error/non numeric'  ----------------------------
 TestMain.cpp:229:
 parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
 "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: oops" contains: "greater than zero"
-[Summary for section '-a/error/non numeric': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-a/error/non numeric':
+1 assertion passed
 
-[Summary for section 'abort': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'abort':
+1 assertion passed
 
-[Section: 'abort']
-[Section: '-a/error/two args']
+-- Section: 'abort'  -------------------------------------------
+-- Section: '-a/error/two args'  -------------------------------
 TestMain.cpp:233:
 parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) succeeded for:
 "Error while parsing arguments. Expected between 0 and 1 argument. Arguments were: 1 2" contains: "0 and 1 argument"
-[Summary for section '-a/error/two args': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section '-a/error/two args':
+1 assertion passed
 
-[Summary for section 'abort': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'abort':
+1 assertion passed
 
-[Section: 'nothrow']
-[Section: '-nt']
+-- Section: 'nothrow'  -----------------------------------------
+-- Section: '-nt'  ---------------------------------------------
 TestMain.cpp:240:
 parseIntoConfig( argv, config ) succeeded
 line 242:
 config.allowThrows == false succeeded for: false == false
-[Summary for section '-nt': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '-nt':
+All 2 assertions passed
 
-[Summary for section 'nothrow': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'nothrow':
+All 2 assertions passed
 
-[Section: 'nothrow']
-[Section: '--nothrow']
+-- Section: 'nothrow'  -----------------------------------------
+-- Section: '--nothrow'  ---------------------------------------
 TestMain.cpp:246:
 parseIntoConfig( argv, config ) succeeded
 line 248:
 config.allowThrows == false succeeded for: false == false
-[Summary for section '--nothrow': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '--nothrow':
+All 2 assertions passed
 
-[Summary for section 'nothrow': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'nothrow':
+All 2 assertions passed
 
-[Section: 'streams']
-[Section: '-o filename']
+-- Section: 'streams'  -----------------------------------------
+-- Section: '-o filename'  -------------------------------------
 TestMain.cpp:255:
 parseIntoConfig( argv, config ) succeeded
 line 257:
 config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 line 258:
 config.stream.empty() succeeded for: true
-[Summary for section '-o filename': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section '-o filename':
+All 3 assertions passed
 
-[Summary for section 'streams': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section 'streams':
+All 3 assertions passed
 
-[Section: 'streams']
-[Section: '-o %stdout']
+-- Section: 'streams'  -----------------------------------------
+-- Section: '-o %stdout'  --------------------------------------
 TestMain.cpp:262:
 parseIntoConfig( argv, config ) succeeded
 line 264:
 config.stream == "stdout" succeeded for: "stdout" == "stdout"
 line 265:
 config.outputFilename.empty() succeeded for: true
-[Summary for section '-o %stdout': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section '-o %stdout':
+All 3 assertions passed
 
-[Summary for section 'streams': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section 'streams':
+All 3 assertions passed
 
-[Section: 'streams']
-[Section: '--out']
+-- Section: 'streams'  -----------------------------------------
+-- Section: '--out'  -------------------------------------------
 TestMain.cpp:269:
 parseIntoConfig( argv, config ) succeeded
 line 271:
 config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
-[Summary for section '--out': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section '--out':
+All 2 assertions passed
 
-[Summary for section 'streams': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'streams':
+All 2 assertions passed
 
-[Section: 'combinations']
-[Section: '-a -b']
+-- Section: 'combinations'  ------------------------------------
+-- Section: '-a -b'  -------------------------------------------
 TestMain.cpp:278:
 parseIntoConfig( argv, config ) succeeded
 line 280:
@@ -1532,13 +1840,19 @@ line 281:
 config.shouldDebugBreak succeeded for: true
 line 282:
 config.allowThrows == false succeeded for: false == false
-[Summary for section '-a -b': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section '-a -b':
+All 4 assertions passed
 
-[Summary for section 'combinations': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'combinations':
+All 4 assertions passed
 
-[Summary for test case 'selftest/parser/2': All tests passed (66 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/parser/2':
+All tests passed (66 assertions in 1 test case)
 
-[Test case: 'selftest/test filter']
+-- Test case: 'selftest/test filter'  --------------------------
 TestMain.cpp:291:
 matchAny.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
 line 292:
@@ -1551,9 +1865,11 @@ line 300:
 matchHidden.shouldInclude( fakeTestCase( "./any" ) ) succeeded for: true
 line 301:
 matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false succeeded for: false == false
-[Summary for test case 'selftest/test filter': All tests passed (6 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/test filter':
+All tests passed (6 assertions in 1 test case)
 
-[Test case: 'selftest/test filters']
+-- Test case: 'selftest/test filters'  -------------------------
 TestMain.cpp:312:
 matchHidden.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
 line 314:
@@ -1562,16 +1878,20 @@ line 315:
 filters.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
 line 316:
 filters.shouldInclude( fakeTestCase( "./anything" ) ) == false succeeded for: false == false
-[Summary for test case 'selftest/test filters': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/test filters':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: 'selftest/filter/prefix wildcard']
+-- Test case: 'selftest/filter/prefix wildcard'  ---------------
 TestMain.cpp:322:
 matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
 line 323:
 matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false succeeded for: false == false
-[Summary for test case 'selftest/filter/prefix wildcard': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/filter/prefix wildcard':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: 'selftest/filter/wildcard at both ends']
+-- Test case: 'selftest/filter/wildcard at both ends'  ---------
 TestMain.cpp:328:
 matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
 line 329:
@@ -1580,9 +1900,11 @@ line 330:
 matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) succeeded for: true
 line 331:
 matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false succeeded for: false == false
-[Summary for test case 'selftest/filter/wildcard at both ends': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/filter/wildcard at both ends':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: 'selftest/option parsers']
+-- Test case: 'selftest/option parsers'  -----------------------
 TestMain.cpp:351:
 opt.parseIntoConfig( parser, config ) succeeded
 line 353:
@@ -1591,10 +1913,12 @@ line 354:
 config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
 line 355:
 config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
-[Summary for test case 'selftest/option parsers': All tests passed (4 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/option parsers':
+All tests passed (4 assertions in 1 test case)
 
-[Test case: 'selftest/tags']
-[Section: 'one tag']
+-- Test case: 'selftest/tags'  ---------------------------------
+-- Section: 'one tag'  -----------------------------------------
 TestMain.cpp:369:
 oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
 line 370:
@@ -1611,9 +1935,11 @@ line 376:
 oneTag.matchesTags( p4 ) == false succeeded for: false == false
 line 377:
 oneTag.matchesTags( p5 ) == false succeeded for: false == false
-[Summary for section 'one tag': All 8 assertions passed]
+----------------------------------------------------------------
+Summary for section 'one tag':
+All 8 assertions passed
 
-[Section: 'two tags']
+-- Section: 'two tags'  ----------------------------------------
 TestMain.cpp:383:
 twoTags.getTestCaseInfo().description == "" succeeded for: "" == ""
 line 384:
@@ -1634,9 +1960,11 @@ line 392:
 twoTags.matchesTags( p4 ) == true succeeded for: true == true
 line 393:
 twoTags.matchesTags( p5 ) == true succeeded for: true == true
-[Summary for section 'two tags': All 10 assertions passed]
+----------------------------------------------------------------
+Summary for section 'two tags':
+All 10 assertions passed
 
-[Section: 'one tag with characters either side']
+-- Section: 'one tag with characters either side'  -------------
 TestMain.cpp:399:
 oneTagWithExtras.getTestCaseInfo().description == "1234" succeeded for: "1234" == "1234"
 line 400:
@@ -1645,18 +1973,22 @@ line 401:
 oneTagWithExtras.hasTag( "two" ) == false succeeded for: false == false
 line 402:
 oneTagWithExtras.getTags().size() == 1 succeeded for: 1 == 1
-[Summary for section 'one tag with characters either side': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'one tag with characters either side':
+All 4 assertions passed
 
-[Section: 'start of a tag, but not closed']
+-- Section: 'start of a tag, but not closed'  ------------------
 TestMain.cpp:409:
 oneTagOpen.getTestCaseInfo().description == "[one" succeeded for: "[one" == "[one"
 line 410:
 oneTagOpen.hasTag( "one" ) == false succeeded for: false == false
 line 411:
 oneTagOpen.getTags().size() == 0 succeeded for: 0 == 0
-[Summary for section 'start of a tag, but not closed': All 3 assertions passed]
+----------------------------------------------------------------
+Summary for section 'start of a tag, but not closed':
+All 3 assertions passed
 
-[Section: 'hidden']
+-- Section: 'hidden'  ------------------------------------------
 TestMain.cpp:417:
 oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
 line 418:
@@ -1665,138 +1997,188 @@ line 419:
 oneTag.isHidden() succeeded for: true
 line 421:
 oneTag.matchesTags( "~[hide]" ) == false succeeded for: false == false
-[Summary for section 'hidden': All 4 assertions passed]
+----------------------------------------------------------------
+Summary for section 'hidden':
+All 4 assertions passed
 
-[Summary for test case 'selftest/tags': All tests passed (29 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'selftest/tags':
+All tests passed (29 assertions in 1 test case)
 
-[Test case: './succeeding/Tricky/std::pair']
+-- Test case: './succeeding/Tricky/std::pair'  -----------------
 TrickyTests.cpp:37:
 (std::pair<int, int>( 1, 2 )) == aNicePair succeeded for:
 
 	std::pair( 1, 2 )
 	==
 	std::pair( 1, 2 )
-[Summary for test case './succeeding/Tricky/std::pair': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Tricky/std::pair':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './inprogress/failing/Tricky/trailing expression']
+-- Test case: './inprogress/failing/Tricky/trailing expression'  ----------------------------------------------------------------
 TrickyTests.cpp:55:
 [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
 
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
-[Summary for test case './inprogress/failing/Tricky/trailing expression': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './inprogress/failing/Tricky/trailing expression':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './inprogress/failing/Tricky/compound lhs']
+-- Test case: './inprogress/failing/Tricky/compound lhs'  ------
 TrickyTests.cpp:71:
 [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
 
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
-[Summary for test case './inprogress/failing/Tricky/compound lhs': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './inprogress/failing/Tricky/compound lhs':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './failing/Tricky/non streamable type']
+-- Test case: './failing/Tricky/non streamable type'  ----------
 TrickyTests.cpp:95:
 &o1 == &o2 failed for: 0x<hex digits> == 0x<hex digits>
 line 96:
 o1 == o2 failed for: {?} == {?}
-[Summary for test case './failing/Tricky/non streamable type': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './failing/Tricky/non streamable type':
+1 test case - failed (2 assertions - both failed)
 
-[Test case: './failing/string literals']
+-- Test case: './failing/string literals'  ---------------------
 TrickyTests.cpp:106:
 std::string( "first" ) == "second" failed for: "first" == "second"
-[Summary for test case './failing/string literals': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/string literals':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/side-effects']
+-- Test case: './succeeding/side-effects'  ---------------------
 TrickyTests.cpp:119:
 i++ == 7 succeeded for: 7 == 7
 line 120:
 i++ == 8 succeeded for: 8 == 8
-[Summary for test case './succeeding/side-effects': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/side-effects':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/koenig']
+-- Test case: './succeeding/koenig'  ---------------------------
 TrickyTests.cpp:186:
 0x<hex digits> == o succeeded for: 0x<hex digits> == {?}
-[Summary for test case './succeeding/koenig': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/koenig':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/non-const==']
+-- Test case: './succeeding/non-const=='  ----------------------
 TrickyTests.cpp:212:
 t == 1u succeeded for: {?} == 1
-[Summary for test case './succeeding/non-const==': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/non-const==':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/enum/bits']
+-- Test case: './succeeding/enum/bits'  ------------------------
 TrickyTests.cpp:224:
 0x<hex digits> == bit30and31 succeeded for: 0x<hex digits> == 3221225472
-[Summary for test case './succeeding/enum/bits': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/enum/bits':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/boolean member']
+-- Test case: './succeeding/boolean member'  -------------------
 TrickyTests.cpp:239:
 obj.prop != __null succeeded for: 0x<hex digits> != 0
-[Summary for test case './succeeding/boolean member': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/boolean member':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './succeeding/unimplemented static bool']
-[Section: 'compare to true']
+-- Test case: './succeeding/unimplemented static bool'  --------
+-- Section: 'compare to true'  ---------------------------------
 TrickyTests.cpp:259:
 is_true<true>::value == true succeeded for: true == true
 line 260:
 true == is_true<true>::value succeeded for: true == true
-[Summary for section 'compare to true': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'compare to true':
+All 2 assertions passed
 
-[Section: 'compare to false']
+-- Section: 'compare to false'  --------------------------------
 TrickyTests.cpp:264:
 is_true<false>::value == false succeeded for: false == false
 line 265:
 false == is_true<false>::value succeeded for: false == false
-[Summary for section 'compare to false': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'compare to false':
+All 2 assertions passed
 
-[Section: 'negation']
+-- Section: 'negation'  ----------------------------------------
 TrickyTests.cpp:270:
 !is_true<false>::value succeeded for: true
-[Summary for section 'negation': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'negation':
+1 assertion passed
 
-[Section: 'double negation']
+-- Section: 'double negation'  ---------------------------------
 TrickyTests.cpp:275:
 !!is_true<true>::value succeeded for: true
-[Summary for section 'double negation': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'double negation':
+1 assertion passed
 
-[Section: 'direct']
+-- Section: 'direct'  ------------------------------------------
 TrickyTests.cpp:280:
 is_true<true>::value succeeded for: true
 line 281:
 !is_true<false>::value succeeded for: !false
-[Summary for section 'direct': All 2 assertions passed]
+----------------------------------------------------------------
+Summary for section 'direct':
+All 2 assertions passed
 
-[Summary for test case './succeeding/unimplemented static bool': All tests passed (8 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/unimplemented static bool':
+All tests passed (8 assertions in 1 test case)
 
-[Test case: './succeeding/SafeBool']
+-- Test case: './succeeding/SafeBool'  -------------------------
 TrickyTests.cpp:313:
 True succeeded for: true
 line 314:
 !False succeeded for: true
 line 315:
 !False succeeded for: !false
-[Summary for test case './succeeding/SafeBool': All tests passed (3 assertions in 1 test case)]
-
-[Test case: 'scenario name']
-[Section: 'This stuff exists']
-[Section: 'I do this']
-[Section: 'it should do this']
+----------------------------------------------------------------
+Summary for test case './succeeding/SafeBool':
+All tests passed (3 assertions in 1 test case)
+
+-- Test case: 'scenario name'  ---------------------------------
+-- Section: 'This stuff exists'  -------------------------------
+-- Section: 'I do this'  ---------------------------------------
+-- Section: 'it should do this'  -------------------------------
 BDDTests.cpp:37:
 itDoesThis() succeeded for: true
-[Summary for section 'it should do this': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'it should do this':
+1 assertion passed
 
-[Summary for section 'I do this': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'I do this':
+1 assertion passed
 
-[Summary for section 'This stuff exists': 1 assertion passed]
+----------------------------------------------------------------
+Summary for section 'This stuff exists':
+1 assertion passed
 
-[Summary for test case 'scenario name': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case 'scenario name':
+All tests passed (1 assertion in 1 test case)
 
-[Summary for group '~dummy': 95 test cases - 44 failed (607 assertions - 101 failed)]
+----------------------------------------------------------------
+Summary for group '~dummy':
+95 test cases - 44 failed (607 assertions - 101 failed)
 
-[Summary for 'CatchSelfTest': 95 test cases - 44 failed (607 assertions - 101 failed)]
+================================================================
+Summary for all tests in 'CatchSelfTest':
+95 test cases - 44 failed (607 assertions - 101 failed)
 
-[Started testing: CatchSelfTest]
-[Group: '~dummy']
-[Test case: './succeeding/Approx/simple']
+-- Started testing: 'CatchSelfTest'  ---------------------------
+-- Group: '~dummy'  --------------------------------------------
+-- Test case: './succeeding/Approx/simple'  --------------------
 ApproxTests.cpp:20:
 d == Approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
 line 21:
@@ -1809,30 +2191,38 @@ line 25:
 Approx( d ) != 1.22 succeeded for: Approx( 1.23 ) != 1.22
 line 26:
 Approx( d ) != 1.24 succeeded for: Approx( 1.23 ) != 1.24
-[Summary for test case './succeeding/Approx/simple': All tests passed (6 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/simple':
+All tests passed (6 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/epsilon']
+-- Test case: './succeeding/Approx/epsilon'  -------------------
 ApproxTests.cpp:38:
 d != Approx( 1.231 ) succeeded for: 1.23 != Approx( 1.231 )
 line 39:
 d == Approx( 1.231 ).epsilon( 0.1 ) succeeded for: 1.23 == Approx( 1.231 )
-[Summary for test case './succeeding/Approx/epsilon': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/epsilon':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/float']
+-- Test case: './succeeding/Approx/float'  ---------------------
 ApproxTests.cpp:49:
 1.23f == Approx( 1.23f ) succeeded for: 1.23 == Approx( 1.23 )
 line 50:
 0.0f == Approx( 0.0f ) succeeded for: 0 == Approx( 0 )
-[Summary for test case './succeeding/Approx/float': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/float':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/int']
+-- Test case: './succeeding/Approx/int'  -----------------------
 ApproxTests.cpp:60:
 1 == Approx( 1 ) succeeded
 line 61:
 0 == Approx( 0 ) succeeded
-[Summary for test case './succeeding/Approx/int': All tests passed (2 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/int':
+All tests passed (2 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/mixed']
+-- Test case: './succeeding/Approx/mixed'  ---------------------
 ApproxTests.cpp:75:
 1.0f == Approx( 1 ) succeeded for: 1 == Approx( 1 )
 line 76:
@@ -1843,9 +2233,11 @@ line 78:
 1.234f == Approx( dMedium ) succeeded for: 1.234 == Approx( 1.234 )
 line 79:
 dMedium == Approx( 1.234f ) succeeded for: 1.234 == Approx( 1.234 )
-[Summary for test case './succeeding/Approx/mixed': All tests passed (5 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/mixed':
+All tests passed (5 assertions in 1 test case)
 
-[Test case: './succeeding/Approx/custom']
+-- Test case: './succeeding/Approx/custom'  --------------------
 ApproxTests.cpp:93:
 d == approx( 1.23 ) succeeded for: 1.23 == Approx( 1.23 )
 line 94:
@@ -1862,29 +2254,39 @@ line 100:
 approx( d ) == 1.24 succeeded for: Approx( 1.23 ) == 1.24
 line 101:
 approx( d ) != 1.25 succeeded for: Approx( 1.23 ) != 1.25
-[Summary for test case './succeeding/Approx/custom': All tests passed (8 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Approx/custom':
+All tests passed (8 assertions in 1 test case)
 
-[Test case: './succeeding/TestClass/succeedingCase']
+-- Test case: './succeeding/TestClass/succeedingCase'  ---------
 ClassTests.cpp:24:
 s == "hello" succeeded for: "hello" == "hello"
-[Summary for test case './succeeding/TestClass/succeedingCase': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/TestClass/succeedingCase':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './failing/TestClass/failingCase']
+-- Test case: './failing/TestClass/failingCase'  ---------------
 ClassTests.cpp:28:
 s == "world" failed for: "hello" == "world"
-[Summary for test case './failing/TestClass/failingCase': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/TestClass/failingCase':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/Fixture/succeedingCase']
+-- Test case: './succeeding/Fixture/succeedingCase'  -----------
 ClassTests.cpp:47:
 m_a == 1 succeeded for: 1 == 1
-[Summary for test case './succeeding/Fixture/succeedingCase': All tests passed (1 assertion in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/Fixture/succeedingCase':
+All tests passed (1 assertion in 1 test case)
 
-[Test case: './failing/Fixture/failingCase']
+-- Test case: './failing/Fixture/failingCase'  -----------------
 ClassTests.cpp:55:
 m_a == 2 failed for: 1 == 2
-[Summary for test case './failing/Fixture/failingCase': 1 test case - failed (1 assertion - failed)]
+----------------------------------------------------------------
+Summary for test case './failing/Fixture/failingCase':
+1 test case - failed (1 assertion - failed)
 
-[Test case: './succeeding/conditions/equality']
+-- Test case: './succeeding/conditions/equality'  --------------
 ConditionTests.cpp:55:
 data.int_seven == 7 succeeded for: 7 == 7
 line 56:
@@ -1899,18 +2301,26 @@ line 60:
 data.str_hello.size() == 5 succeeded for: 5 == 5
 line 63:
 x == Approx( 1.3 ) succeeded for: 1.3 == Approx( 1.3 )
-[Summary for test case './succeeding/conditions/equality': All tests passed (7 assertions in 1 test case)]
+----------------------------------------------------------------
+Summary for test case './succeeding/conditions/equality':
+All tests passed (7 assertions in 1 test case)
 
-[Test case: './failing/conditions/equality']
+-- Test case: './failing/conditions/equality'  -----------------
 ConditionTests.cpp:71:
 data.int_seven == 6 failed for: 7 == 6
 line 72:
 data.int_seven == 8 failed for: 7 == 8
-[Summary for test case './failing/conditions/equality': 1 test case - failed (2 assertions - both failed)]
+----------------------------------------------------------------
+Summary for test case './failing/conditions/equality':
+1 test case - failed (2 assertions - both failed)
 
-[Summary for group '~dummy': 12 test cases - 3 failed (38 assertions - 4 failed)]
+----------------------------------------------------------------
+Summary for group '~dummy':
+12 test cases - 3 failed (38 assertions - 4 failed)
 
-[Summary for 'CatchSelfTest': 12 test cases - 3 failed (38 assertions - 4 failed)]
+================================================================
+Summary for all tests in 'CatchSelfTest':
+12 test cases - 3 failed (38 assertions - 4 failed)
 
 <testsuites>
   <testsuite name="~dummy" errors="8" failures="76" tests="607" hostname="tbd" time="tbd" timestamp="tbd">