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

Tidied up some loose ends with reporting test cases and sections (now handles them as a single block).

This should fixes an issue where sections not being printed when they should be (and reverses a workaround where they were being printed too much)
Commit
b7ff995e890f8d4fa26eb794f502724b3726761d
Author
Phil Nash ·
Parents
90b2bfec3ddd

Files · Download .tar.gz

Changes

 include/reporters/catch_reporter_console.hpp    |   61 +-
 projects/SelfTest/Baselines/approvedResults.txt | 1821 ++++-------------------
 projects/SelfTest/TrickyTests.cpp               |   59 +
 3 files changed, 404 insertions(+), 1537 deletions(-)

diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 44abbb6d..a9b88fbe 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -17,7 +17,7 @@ namespace Catch {
     struct ConsoleReporter : StreamingReporterBase {
         ConsoleReporter( ReporterConfig const& _config )
         :   StreamingReporterBase( _config ),
-            m_printedCurrentSection( false ),
+            m_headerPrinted( false ),
             m_atLeastOneTestCasePrinted( false )
         {}
 
@@ -50,7 +50,7 @@ namespace Catch {
         }
 
         virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
-            m_printedCurrentSection = false;
+            m_headerPrinted = false;
             StreamingReporterBase::sectionStarting( _sectionInfo );
         }
         virtual void sectionEnded( SectionStats const& _sectionStats ) {
@@ -59,7 +59,7 @@ namespace Catch {
                 TextColour colour( TextColour::ResultError );
                 stream << "\nNo assertions in section, '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
             }
-            m_printedCurrentSection = false;
+            m_headerPrinted = false;
             StreamingReporterBase::sectionEnded( _sectionStats );
         }
 
@@ -71,6 +71,7 @@ namespace Catch {
                 stream << "\nNo assertions in test case, '" << _testCaseStats.testInfo.name << "'\n" << std::endl;
             }
             StreamingReporterBase::testCaseEnded( _testCaseStats );
+            m_headerPrinted = false;
         }
         virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) {
             if( !unusedGroupInfo ) {
@@ -250,11 +251,11 @@ namespace Catch {
                 lazyPrintRunInfo();
             if( unusedGroupInfo )
                 lazyPrintGroupInfo();
-            if( unusedTestCaseInfo )
-                lazyPrintTestCaseInfo();
-            if( currentSectionInfo && !m_printedCurrentSection )
-                lazyPrintSectionInfo();
             
+            if( !m_headerPrinted ) {
+                printTestCaseAndSectionHeader();
+                m_headerPrinted = true;
+            }
             m_atLeastOneTestCasePrinted = true;
         }
         void lazyPrintRunInfo() {
@@ -271,42 +272,42 @@ namespace Catch {
         }
         void lazyPrintGroupInfo() {
             if( !unusedGroupInfo->name.empty() && unusedGroupInfo->groupsCounts > 1 ) {
-                printHeader( "Group: " + unusedGroupInfo->name );
+                printClosedHeader( "Group: " + unusedGroupInfo->name );
                 unusedGroupInfo.reset();
             }
         }
         void lazyPrintTestCaseInfo() {
             if( !currentSectionInfo ) {
-                printHeader( unusedTestCaseInfo->name );
+                printClosedHeader( unusedTestCaseInfo->name );
                 stream << std::endl;
-//                unusedTestCaseInfo.reset();
             }
         }
-        void lazyPrintSectionInfo() {
-            
-            std::vector<ThreadedSectionInfo*> sections;
-            for(    ThreadedSectionInfo* section = currentSectionInfo.get();
-                    section;
-                    section = section->parent )
-                sections.push_back( section );
-            
-            // Sections
-            if( !sections.empty() ) {
-                printHeader( unusedTestCaseInfo->name, false );
+        void printTestCaseAndSectionHeader() {
+            printOpenHeader( unusedTestCaseInfo->name );
+            if( currentSectionInfo ) {
+                std::vector<ThreadedSectionInfo*> sections;
+                for(    ThreadedSectionInfo* section = currentSectionInfo.get();
+                        section;
+                        section = section->parent )
+                    sections.push_back( section );
                 
-                typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
-                for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it )
-                    stream << "  " << (*it)->name << "\n";
-                stream << getDots() << "\n" << std::endl;
+                // Sections
+                if( !sections.empty() ) {                    
+                    typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
+                    for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it )
+                        stream << "  " << (*it)->name << "\n";
+                }
             }
-            m_printedCurrentSection = true;
+            stream << getDots() << "\n" << std::endl;
         }
 
-        void printHeader( std::string const& _name, bool closed = true ) {
+        void printClosedHeader( std::string const& _name ) {
+            printOpenHeader( _name );
+            stream << getDots() << "\n";
+        }
+        void printOpenHeader( std::string const& _name ) {
             stream  << getDashes() << "\n"
                     << _name << "\n";
-            if( closed )
-                stream << getDots() << "\n";
         }
         
         void printTotals( const Totals& totals ) {
@@ -376,7 +377,7 @@ namespace Catch {
         }
         
     private:
-        bool m_printedCurrentSection;
+        bool m_headerPrinted;
         bool m_atLeastOneTestCasePrinted;
     };
 
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 833e2092..a9d0650d 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -12,50 +12,30 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:21:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:22:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:24:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:25:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:26:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
@@ -72,10 +52,6 @@ PASSED:
 with expansion:
   1.23 != Approx( 1.231 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/epsilon
-...............................................................................
-
 ApproxTests.cpp:39:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
@@ -92,10 +68,6 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/float
-...............................................................................
-
 ApproxTests.cpp:50:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
@@ -110,10 +82,6 @@ ApproxTests.cpp:60:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/int
-...............................................................................
-
 ApproxTests.cpp:61:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
@@ -128,40 +96,24 @@ PASSED:
 with expansion:
   1 == Approx( 1 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:76:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:77:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
   0 == Approx( 1e-05 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:78:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234 == Approx( 1.234 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:79:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
@@ -178,70 +130,42 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:94:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:95:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:96:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:98:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:99:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:100:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:101:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
@@ -258,10 +182,6 @@ PASSED:
 with expansion:
   3.142857142857143 == Approx( 3.141 )
 
--------------------------------------------------------------------------------
-Approximate PI
-...............................................................................
-
 ApproxTests.cpp:111:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
@@ -316,60 +236,36 @@ PASSED:
 with expansion:
   7 == 7
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:56:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1 == Approx( 9.1 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:57:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.14159 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:58:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:59:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:60:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:63:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
@@ -385,109 +281,61 @@ ConditionTests.cpp:71: FAILED:
 with expansion:
   7 == 6
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:72: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:73: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:74: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1 == Approx( 9.11 )
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:75: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1 == Approx( 9 )
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:76: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1 == Approx( 1 )
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:77: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1 == Approx( 0 )
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:78: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:79: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:80: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:81: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:82: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:85: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
@@ -503,100 +351,60 @@ PASSED:
 with expansion:
   7 != 6
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:94:
 PASSED:
   REQUIRE( data.int_seven != 8 )
 with expansion:
   7 != 8
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:95:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
 with expansion:
   9.1 != Approx( 9.11 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:96:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
 with expansion:
   9.1 != Approx( 9 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:97:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 1 ) )
 with expansion:
   9.1 != Approx( 1 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:98:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 0 ) )
 with expansion:
   9.1 != Approx( 0 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:99:
 PASSED:
   REQUIRE( data.double_pi != Approx( 3.1415 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:100:
 PASSED:
   REQUIRE( data.str_hello != "goodbye" )
 with expansion:
   "hello" != "goodbye"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:101:
 PASSED:
   REQUIRE( data.str_hello != "hell" )
 with expansion:
   "hello" != "hell"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:102:
 PASSED:
   REQUIRE( data.str_hello != "hello1" )
 with expansion:
   "hello" != "hello1"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:103:
 PASSED:
   REQUIRE( data.str_hello.size() != 6 )
@@ -612,37 +420,21 @@ ConditionTests.cpp:111: FAILED:
 with expansion:
   7 != 7
 
--------------------------------------------------------------------------------
-./failing/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:112: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1 != Approx( 9.1 )
 
--------------------------------------------------------------------------------
-./failing/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:113: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.14159 )
 
--------------------------------------------------------------------------------
-./failing/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:114: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
--------------------------------------------------------------------------------
-./failing/conditions/inequality
-...............................................................................
-
 ConditionTests.cpp:115: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
@@ -658,160 +450,96 @@ PASSED:
 with expansion:
   7 < 8
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:125:
 PASSED:
   REQUIRE( data.int_seven > 6 )
 with expansion:
   7 > 6
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:126:
 PASSED:
   REQUIRE( data.int_seven > 0 )
 with expansion:
   7 > 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:127:
 PASSED:
   REQUIRE( data.int_seven > -1 )
 with expansion:
   7 > -1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:129:
 PASSED:
   REQUIRE( data.int_seven >= 7 )
 with expansion:
   7 >= 7
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:130:
 PASSED:
   REQUIRE( data.int_seven >= 6 )
 with expansion:
   7 >= 6
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:131:
 PASSED:
   REQUIRE( data.int_seven <= 7 )
 with expansion:
   7 <= 7
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:132:
 PASSED:
   REQUIRE( data.int_seven <= 8 )
 with expansion:
   7 <= 8
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:134:
 PASSED:
   REQUIRE( data.float_nine_point_one > 9 )
 with expansion:
   9.1 > 9
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:135:
 PASSED:
   REQUIRE( data.float_nine_point_one < 10 )
 with expansion:
   9.1 < 10
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:136:
 PASSED:
   REQUIRE( data.float_nine_point_one < 9.2 )
 with expansion:
   9.1 < 9.199999999999999
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:138:
 PASSED:
   REQUIRE( data.str_hello <= "hello" )
 with expansion:
   "hello" <= "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:139:
 PASSED:
   REQUIRE( data.str_hello >= "hello" )
 with expansion:
   "hello" >= "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:141:
 PASSED:
   REQUIRE( data.str_hello < "hellp" )
 with expansion:
   "hello" < "hellp"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:142:
 PASSED:
   REQUIRE( data.str_hello < "zebra" )
 with expansion:
   "hello" < "zebra"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:143:
 PASSED:
   REQUIRE( data.str_hello > "hellm" )
 with expansion:
   "hello" > "hellm"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:144:
 PASSED:
   REQUIRE( data.str_hello > "a" )
@@ -827,163 +555,91 @@ ConditionTests.cpp:152: FAILED:
 with expansion:
   7 > 7
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:153: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:154: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:155: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:156: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:157: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:159: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:160: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:162: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1 < 9
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:163: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1 > 10
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:164: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1 > 9.199999999999999
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:166: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:167: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:168: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:169: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:170: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:171: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:173: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
--------------------------------------------------------------------------------
-./failing/conditions/ordered
-...............................................................................
-
 ConditionTests.cpp:174: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
@@ -999,120 +655,72 @@ PASSED:
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:189:
 PASSED:
   REQUIRE( ui == 2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:190:
 PASSED:
   REQUIRE( l == 3 )
 with expansion:
   3 == 3
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:191:
 PASSED:
   REQUIRE( ul == 4 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:192:
 PASSED:
   REQUIRE( c == 5 )
 with expansion:
   5 == 5
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:193:
 PASSED:
   REQUIRE( uc == 6 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:195:
 PASSED:
   REQUIRE( 1 == i )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:196:
 PASSED:
   REQUIRE( 2 == ui )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:197:
 PASSED:
   REQUIRE( 3 == l )
 with expansion:
   3 == 3
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:198:
 PASSED:
   REQUIRE( 4 == ul )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:199:
 PASSED:
   REQUIRE( 5 == c )
 with expansion:
   5 == 5
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:200:
 PASSED:
   REQUIRE( 6 == uc )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
-...............................................................................
-
 ConditionTests.cpp:202:
 PASSED:
   REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
@@ -1129,30 +737,18 @@ PASSED:
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions//long_to_unsigned_x
-...............................................................................
-
 ConditionTests.cpp:224:
 PASSED:
   REQUIRE( long_var == unsigned_short_var )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions//long_to_unsigned_x
-...............................................................................
-
 ConditionTests.cpp:225:
 PASSED:
   REQUIRE( long_var == unsigned_int_var )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions//long_to_unsigned_x
-...............................................................................
-
 ConditionTests.cpp:226:
 PASSED:
   REQUIRE( long_var == unsigned_long_var )
@@ -1169,30 +765,18 @@ PASSED:
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/const ints to int literal
-...............................................................................
-
 ConditionTests.cpp:238:
 PASSED:
   REQUIRE( unsigned_short_var == 1 )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/const ints to int literal
-...............................................................................
-
 ConditionTests.cpp:239:
 PASSED:
   REQUIRE( unsigned_int_var == 1 )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/const ints to int literal
-...............................................................................
-
 ConditionTests.cpp:240:
 PASSED:
   REQUIRE( unsigned_long_var == 1 )
@@ -1209,50 +793,30 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
-...............................................................................
-
 ConditionTests.cpp:247:
 PASSED:
   CHECK( -1 > 2u )
 with expansion:
   -1 > 2
 
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
-...............................................................................
-
 ConditionTests.cpp:249:
 PASSED:
   CHECK( ( 2u < -1 ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
-...............................................................................
-
 ConditionTests.cpp:250:
 PASSED:
   CHECK( 2u < -1 )
 with expansion:
   2 < -1
 
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
-...............................................................................
-
 ConditionTests.cpp:253:
 PASSED:
   CHECK( ( minInt > 2u ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
-...............................................................................
-
 ConditionTests.cpp:254:
 PASSED:
   CHECK( minInt > 2u )
@@ -1279,70 +843,42 @@ PASSED:
 with expansion:
   __null == 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:286:
 PASSED:
   REQUIRE( p == pNULL )
 with expansion:
   __null == __null
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:291:
 PASSED:
   REQUIRE( p != __null )
 with expansion:
   0x<hex digits> != 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:294:
 PASSED:
   REQUIRE( cp != __null )
 with expansion:
   0x<hex digits> != 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:297:
 PASSED:
   REQUIRE( cpc != __null )
 with expansion:
   0x<hex digits> != 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:299:
 PASSED:
   REQUIRE( returnsNull() == __null )
 with expansion:
   {null string} == 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:300:
 PASSED:
   REQUIRE( returnsConstNull() == __null )
 with expansion:
   {null string} == 0
 
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
-...............................................................................
-
 ConditionTests.cpp:302:
 PASSED:
   REQUIRE( __null != p )
@@ -1357,66 +893,38 @@ ConditionTests.cpp:317:
 PASSED:
   REQUIRE( false == false )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:318:
 PASSED:
   REQUIRE( true == true )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:319:
 PASSED:
   REQUIRE( !false )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:320:
 PASSED:
   REQUIRE_FALSE( !false )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:322:
 PASSED:
   REQUIRE( !falseValue )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:323:
 PASSED:
   REQUIRE_FALSE( !falseValue )
 with expansion:
   !false
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:325:
 PASSED:
   REQUIRE( !(1 == 2) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/conditions/not
-...............................................................................
-
 ConditionTests.cpp:326:
 PASSED:
   REQUIRE_FALSE( !1 == 2 )
@@ -1430,60 +938,32 @@ with expansion:
 ConditionTests.cpp:334: FAILED:
   CHECK( false != false )
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:335: FAILED:
   CHECK( true != true )
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:336: FAILED:
   CHECK( !true )
 with expansion:
   false
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:337: FAILED:
   CHECK_FALSE( !true )
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:339: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:340: FAILED:
   CHECK_FALSE( !trueValue )
 with expansion:
   !true
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:342: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
--------------------------------------------------------------------------------
-./failing/conditions/not
-...............................................................................
-
 ConditionTests.cpp:343: FAILED:
   CHECK_FALSE( !1 == 1 )
 with expansion:
@@ -1497,18 +977,10 @@ ExceptionTests.cpp:39:
 PASSED:
   REQUIRE_THROWS_AS( thisThrows() )
 
--------------------------------------------------------------------------------
-./succeeding/exceptions/explicit
-...............................................................................
-
 ExceptionTests.cpp:40:
 PASSED:
   REQUIRE_NOTHROW( thisDoesntThrow() )
 
--------------------------------------------------------------------------------
-./succeeding/exceptions/explicit
-...............................................................................
-
 ExceptionTests.cpp:41:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
@@ -1522,18 +994,10 @@ ExceptionTests.cpp:47: FAILED:
 due to unexpected exception with message:
   expected exception
 
--------------------------------------------------------------------------------
-./failing/exceptions/explicit
-...............................................................................
-
 ExceptionTests.cpp:48: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow() )
 because no exception was thrown where one was expected:
 
--------------------------------------------------------------------------------
-./failing/exceptions/explicit
-...............................................................................
-
 ExceptionTests.cpp:49: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
@@ -1555,10 +1019,6 @@ ExceptionTests.cpp:60:
 PASSED:
   CHECK( 1 == 1 )
 
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/2
-...............................................................................
-
 ExceptionTests.cpp:60: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
@@ -1632,1430 +1092,858 @@ PASSED:
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   200 == 200
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   202 == 202
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   204 == 204
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   206 == 206
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   208 == 208
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   210 == 210
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   212 == 212
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
   214 == 214
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:26:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
--------------------------------------------------------------------------------
-./succeeding/generators/1
-...............................................................................
-
 GeneratorTests.cpp:27:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
@@ -3072,10 +1960,6 @@ PASSED:
 with expansion:
   0 == 0
 
--------------------------------------------------------------------------------
-./succeeding/generators/2
-...............................................................................
-
 GeneratorTests.cpp:40:
 PASSED:
   CATCH_REQUIRE( i->first == i->second-1 )
@@ -3091,10 +1975,6 @@ warning:
   this is a message
   this is a warning
 
--------------------------------------------------------------------------------
-./succeeding/message
-...............................................................................
-
 
 No assertions in test case, './succeeding/message'
 
@@ -3131,10 +2011,6 @@ with expansion:
 with message:
   this message should not be logged
 
--------------------------------------------------------------------------------
-./mixed/message/info/2
-...............................................................................
-
 MessageTests.cpp:37: FAILED:
   CHECK( a == 1 )
 with expansion:
@@ -3142,10 +2018,6 @@ with expansion:
 with message:
   this message should be logged
 
--------------------------------------------------------------------------------
-./mixed/message/info/2
-...............................................................................
-
 MessageTests.cpp:41: FAILED:
   CHECK( a == 0 )
 with expansion:
@@ -3153,10 +2025,6 @@ with expansion:
 with message:
   and this, but later
 
--------------------------------------------------------------------------------
-./mixed/message/info/2
-...............................................................................
-
 MessageTests.cpp:45:
 PASSED:
   CHECK( a == 2 )
@@ -3222,10 +2090,6 @@ with messages:
   current counter 0
   i := 0
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3235,10 +2099,6 @@ with messages:
   current counter 1
   i := 1
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3248,10 +2108,6 @@ with messages:
   current counter 2
   i := 2
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3261,10 +2117,6 @@ with messages:
   current counter 3
   i := 3
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3274,10 +2126,6 @@ with messages:
   current counter 4
   i := 4
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3287,10 +2135,6 @@ with messages:
   current counter 5
   i := 5
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3300,10 +2144,6 @@ with messages:
   current counter 6
   i := 6
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3313,10 +2153,6 @@ with messages:
   current counter 7
   i := 7
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3326,10 +2162,6 @@ with messages:
   current counter 8
   i := 8
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86:
 PASSED:
   REQUIRE( i < 10 )
@@ -3339,10 +2171,6 @@ with messages:
   current counter 9
   i := 9
 
--------------------------------------------------------------------------------
-./mixed/message/scoped
-...............................................................................
-
 MessageTests.cpp:86: FAILED:
   REQUIRE( i < 10 )
 with expansion:
@@ -3359,10 +2187,6 @@ MessageTests.cpp:92:
 FAILED - but was ok:
   CHECK_NOFAIL( 1 == 2 )
 
--------------------------------------------------------------------------------
-./succeeding/nofail
-...............................................................................
-
 
 No assertions in test case, './succeeding/nofail'
 
@@ -3520,10 +2344,6 @@ with expansion:
 with message:
   Testing if fib[0] (1) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3531,10 +2351,6 @@ with expansion:
 with message:
   Testing if fib[1] (1) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
@@ -3543,10 +2359,6 @@ with expansion:
 with message:
   Testing if fib[2] (2) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3554,10 +2366,6 @@ with expansion:
 with message:
   Testing if fib[3] (3) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3565,10 +2373,6 @@ with expansion:
 with message:
   Testing if fib[4] (5) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
@@ -3577,10 +2381,6 @@ with expansion:
 with message:
   Testing if fib[5] (8) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3588,10 +2388,6 @@ with expansion:
 with message:
   Testing if fib[6] (13) is even
 
--------------------------------------------------------------------------------
-./mixed/Misc/loops
-...............................................................................
-
 MiscTests.cpp:115: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -3618,10 +2414,6 @@ PASSED:
 with expansion:
   "valid string" != {null string}
 
--------------------------------------------------------------------------------
-./succeeding/Misc/null strings
-...............................................................................
-
 MiscTests.cpp:134:
 PASSED:
   REQUIRE( makeString( true ) == static_cast<char*>(__null) )
@@ -3648,10 +2440,6 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/checkedif
-...............................................................................
-
 MiscTests.cpp:155:
 PASSED:
   REQUIRE( testCheckedIf( true ) )
@@ -3667,10 +2455,6 @@ MiscTests.cpp:147: FAILED:
 with expansion:
   false
 
--------------------------------------------------------------------------------
-./failing/checkedif
-...............................................................................
-
 MiscTests.cpp:160: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
@@ -3686,10 +2470,6 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-./succeeding/checkedelse
-...............................................................................
-
 MiscTests.cpp:173:
 PASSED:
   REQUIRE( testCheckedElse( true ) )
@@ -3705,10 +2485,6 @@ MiscTests.cpp:165: FAILED:
 with expansion:
   false
 
--------------------------------------------------------------------------------
-./failing/checkedelse
-...............................................................................
-
 MiscTests.cpp:178: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
@@ -3759,30 +2535,18 @@ PASSED:
 with expansion:
   "this string contains 'abc' as a substring" contains: "string"
 
--------------------------------------------------------------------------------
-./succeeding/matchers
-...............................................................................
-
 MiscTests.cpp:217:
 PASSED:
   CHECK_THAT( testStringForMatching() Contains( "abc" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "abc"
 
--------------------------------------------------------------------------------
-./succeeding/matchers
-...............................................................................
-
 MiscTests.cpp:219:
 PASSED:
   CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "this"
 
--------------------------------------------------------------------------------
-./succeeding/matchers
-...............................................................................
-
 MiscTests.cpp:220:
 PASSED:
   CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
@@ -3847,10 +2611,6 @@ with expansion:
   "this string contains 'abc' as a substring" ( contains: "string" or
   contains: "not there" )
 
--------------------------------------------------------------------------------
-./succeeding/matchers/AnyOf
-...............................................................................
-
 MiscTests.cpp:253:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
@@ -3879,40 +2639,24 @@ PASSED:
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-example/factorial
-...............................................................................
-
 MiscTests.cpp:270:
 PASSED:
   REQUIRE( Factorial(1) == 1 )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-example/factorial
-...............................................................................
-
 MiscTests.cpp:271:
 PASSED:
   REQUIRE( Factorial(2) == 2 )
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-example/factorial
-...............................................................................
-
 MiscTests.cpp:272:
 PASSED:
   REQUIRE( Factorial(3) == 6 )
 with expansion:
   6 == 6
 
--------------------------------------------------------------------------------
-example/factorial
-...............................................................................
-
 MiscTests.cpp:273:
 PASSED:
   REQUIRE( Factorial(10) == 3628800 )
@@ -3934,10 +2678,6 @@ MiscTests.cpp:282:
 warning:
   This one ran
 
--------------------------------------------------------------------------------
-Nice descriptive name
-...............................................................................
-
 
 No assertions in test case, 'Nice descriptive name'
 
@@ -4381,10 +3121,6 @@ PASSED:
 with expansion:
   2 == 2
 
--------------------------------------------------------------------------------
-meta/Misc/Sections
-...............................................................................
-
 TestMain.cpp:58:
 PASSED:
   CHECK( totals.assertions.failed == 1 )
@@ -4918,50 +3654,30 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/test filter
-...............................................................................
-
 TestMain.cpp:292:
 PASSED:
   CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
--------------------------------------------------------------------------------
-selftest/test filter
-...............................................................................
-
 TestMain.cpp:297:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
--------------------------------------------------------------------------------
-selftest/test filter
-...............................................................................
-
 TestMain.cpp:298:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/test filter
-...............................................................................
-
 TestMain.cpp:300:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/test filter
-...............................................................................
-
 TestMain.cpp:301:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
@@ -4978,30 +3694,18 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/test filters
-...............................................................................
-
 TestMain.cpp:314:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
--------------------------------------------------------------------------------
-selftest/test filters
-...............................................................................
-
 TestMain.cpp:315:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/test filters
-...............................................................................
-
 TestMain.cpp:316:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
@@ -5018,10 +3722,6 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/filter/prefix wildcard
-...............................................................................
-
 TestMain.cpp:323:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
@@ -5038,30 +3738,18 @@ PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/filter/wildcard at both ends
-...............................................................................
-
 TestMain.cpp:329:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/filter/wildcard at both ends
-...............................................................................
-
 TestMain.cpp:330:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
 with expansion:
   true
 
--------------------------------------------------------------------------------
-selftest/filter/wildcard at both ends
-...............................................................................
-
 TestMain.cpp:331:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
@@ -5076,30 +3764,18 @@ TestMain.cpp:351:
 PASSED:
   CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) )
 
--------------------------------------------------------------------------------
-selftest/option parsers
-...............................................................................
-
 TestMain.cpp:353:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
--------------------------------------------------------------------------------
-selftest/option parsers
-...............................................................................
-
 TestMain.cpp:354:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
--------------------------------------------------------------------------------
-selftest/option parsers
-...............................................................................
-
 TestMain.cpp:355:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
@@ -5324,10 +4000,6 @@ warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
 
--------------------------------------------------------------------------------
-./inprogress/failing/Tricky/trailing expression
-...............................................................................
-
 
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
@@ -5340,10 +4012,6 @@ warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
 
--------------------------------------------------------------------------------
-./inprogress/failing/Tricky/compound lhs
-...............................................................................
-
 
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
@@ -5356,10 +4024,6 @@ TrickyTests.cpp:95: FAILED:
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
--------------------------------------------------------------------------------
-./failing/Tricky/non streamable type
-...............................................................................
-
 TrickyTests.cpp:96: FAILED:
   CHECK( o1 == o2 )
 with expansion:
@@ -5384,10 +4048,6 @@ PASSED:
 with expansion:
   7 == 7
 
--------------------------------------------------------------------------------
-./succeeding/side-effects
-...............................................................................
-
 TrickyTests.cpp:120:
 PASSED:
   REQUIRE( i++ == 8 )
@@ -5425,117 +4085,223 @@ with expansion:
   0x<hex digits> == 3221225472
 
 -------------------------------------------------------------------------------
-./succeeding/boolean member
+./succeeding/boolean member
+...............................................................................
+
+TrickyTests.cpp:239:
+PASSED:
+  REQUIRE( obj.prop != __null )
+with expansion:
+  0x<hex digits> != 0
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to true
+...............................................................................
+
+TrickyTests.cpp:259:
+PASSED:
+  REQUIRE( is_true<true>::value == true )
+with expansion:
+  true == true
+
+TrickyTests.cpp:260:
+PASSED:
+  REQUIRE( true == is_true<true>::value )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to false
+...............................................................................
+
+TrickyTests.cpp:264:
+PASSED:
+  REQUIRE( is_true<false>::value == false )
+with expansion:
+  false == false
+
+TrickyTests.cpp:265:
+PASSED:
+  REQUIRE( false == is_true<false>::value )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  negation
+...............................................................................
+
+TrickyTests.cpp:270:
+PASSED:
+  REQUIRE( !is_true<false>::value )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  double negation
+...............................................................................
+
+TrickyTests.cpp:275:
+PASSED:
+  REQUIRE( !!is_true<true>::value )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  direct
+...............................................................................
+
+TrickyTests.cpp:280:
+PASSED:
+  REQUIRE( is_true<true>::value )
+with expansion:
+  true
+
+TrickyTests.cpp:281:
+PASSED:
+  REQUIRE_FALSE( !is_true<false>::value )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+./succeeding/SafeBool
+...............................................................................
+
+TrickyTests.cpp:313:
+PASSED:
+  CHECK( True )
+with expansion:
+  true
+
+TrickyTests.cpp:314:
+PASSED:
+  CHECK( !False )
+with expansion:
+  true
+
+TrickyTests.cpp:315:
+PASSED:
+  CHECK_FALSE( !False )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Assertions then sections
 ...............................................................................
 
-TrickyTests.cpp:239:
+TrickyTests.cpp:323:
 PASSED:
-  REQUIRE( obj.prop != __null )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
-  0x<hex digits> != 0
+  true
 
 -------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  compare to true
+Assertions then sections
+  A section
 ...............................................................................
 
-TrickyTests.cpp:259:
-PASSED:
-  REQUIRE( is_true<true>::value == true )
-with expansion:
-  true == true
-
-TrickyTests.cpp:260:
+TrickyTests.cpp:327:
 PASSED:
-  REQUIRE( true == is_true<true>::value )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
-  true == true
+  true
 
 -------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  compare to false
+Assertions then sections
+  A section
+  Another section
 ...............................................................................
 
-TrickyTests.cpp:264:
-PASSED:
-  REQUIRE( is_true<false>::value == false )
-with expansion:
-  false == false
-
-TrickyTests.cpp:265:
+TrickyTests.cpp:331:
 PASSED:
-  REQUIRE( false == is_true<false>::value )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
-  false == false
+  true
 
 -------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  negation
+Assertions then sections
 ...............................................................................
 
-TrickyTests.cpp:270:
+TrickyTests.cpp:323:
 PASSED:
-  REQUIRE( !is_true<false>::value )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
   true
 
 -------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  double negation
+Assertions then sections
+  A section
 ...............................................................................
 
-TrickyTests.cpp:275:
+TrickyTests.cpp:327:
 PASSED:
-  REQUIRE( !!is_true<true>::value )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
   true
 
 -------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  direct
+Assertions then sections
+  A section
+  Another other section
 ...............................................................................
 
-TrickyTests.cpp:280:
+TrickyTests.cpp:335:
 PASSED:
-  REQUIRE( is_true<true>::value )
+  REQUIRE( Catch::isTrue( true ) )
 with expansion:
   true
 
-TrickyTests.cpp:281:
+-------------------------------------------------------------------------------
+sort
+...............................................................................
+
+TrickyTests.cpp:357:
 PASSED:
-  REQUIRE_FALSE( !is_true<false>::value )
+  REQUIRE( v == sorted )
 with expansion:
-  !false
+  { 2, 3, 4 } == { 2, 3, 4 }
 
 -------------------------------------------------------------------------------
-./succeeding/SafeBool
+sort
+  already sorted
 ...............................................................................
 
-TrickyTests.cpp:313:
+TrickyTests.cpp:362:
 PASSED:
-  CHECK( True )
+  REQUIRE( v == sorted )
 with expansion:
-  true
+  { 2, 3, 4 } == { 2, 3, 4 }
 
 -------------------------------------------------------------------------------
-./succeeding/SafeBool
+sort
 ...............................................................................
 
-TrickyTests.cpp:314:
+TrickyTests.cpp:357:
 PASSED:
-  CHECK( !False )
+  REQUIRE( v == sorted )
 with expansion:
-  true
+  { 2, 3, 4 } == { 2, 3, 4 }
 
 -------------------------------------------------------------------------------
-./succeeding/SafeBool
+sort
+  reverse sorted
 ...............................................................................
 
-TrickyTests.cpp:315:
+TrickyTests.cpp:368:
 PASSED:
-  CHECK_FALSE( !False )
+  REQUIRE( v != sorted )
 with expansion:
-  !false
+  { 4, 3, 2 } != { 2, 3, 4 }
+
+TrickyTests.cpp:372:
+PASSED:
+  REQUIRE( v == sorted )
+with expansion:
+  { 2, 3, 4 } == { 2, 3, 4 }
 
 -------------------------------------------------------------------------------
 Scenario: Do that thing with the thing
@@ -5565,7 +4331,7 @@ with expansion:
   true
 
 ===============================================================================
-100 test cases - 47 failed (619 assertions - 104 failed)
+102 test cases - 47 failed (630 assertions - 104 failed)
 
 
 CatchSelfTest is a CATCH v0.9 b21 (integration) host application.
@@ -5581,50 +4347,30 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:21:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:22:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:24:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:25:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
-...............................................................................
-
 ApproxTests.cpp:26:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
@@ -5641,10 +4387,6 @@ PASSED:
 with expansion:
   1.23 != Approx( 1.231 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/epsilon
-...............................................................................
-
 ApproxTests.cpp:39:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
@@ -5661,10 +4403,6 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/float
-...............................................................................
-
 ApproxTests.cpp:50:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
@@ -5679,10 +4417,6 @@ ApproxTests.cpp:60:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/int
-...............................................................................
-
 ApproxTests.cpp:61:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
@@ -5697,40 +4431,24 @@ PASSED:
 with expansion:
   1 == Approx( 1 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:76:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:77:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
   0 == Approx( 1e-05 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:78:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234 == Approx( 1.234 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
-...............................................................................
-
 ApproxTests.cpp:79:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
@@ -5747,70 +4465,42 @@ PASSED:
 with expansion:
   1.23 == Approx( 1.23 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:94:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:95:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:96:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:98:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:99:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:100:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
-...............................................................................
-
 ApproxTests.cpp:101:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
@@ -5827,10 +4517,6 @@ PASSED:
 with expansion:
   3.142857142857143 == Approx( 3.141 )
 
--------------------------------------------------------------------------------
-Approximate PI
-...............................................................................
-
 ApproxTests.cpp:111:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
@@ -5885,60 +4571,36 @@ PASSED:
 with expansion:
   7 == 7
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:56:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1 == Approx( 9.1 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:57:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.14159 )
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:58:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:59:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:60:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:63:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
@@ -5954,10 +4616,6 @@ ConditionTests.cpp:71: FAILED:
 with expansion:
   7 == 6
 
--------------------------------------------------------------------------------
-./failing/conditions/equality
-...............................................................................
-
 ConditionTests.cpp:72: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
@@ -5967,7 +4625,7 @@ with expansion:
 13 test cases - 3 failed (40 assertions - 4 failed)
 
 <testsuites>
-  <testsuite name="~dummy" errors="9" failures="77" tests="619" hostname="tbd" time="tbd" timestamp="tbd">
+  <testsuite name="~dummy" errors="9" failures="77" tests="630" hostname="tbd" time="tbd" timestamp="tbd">
     <testcase classname="global" name="./succeeding/Approx/simple" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/epsilon" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/float" time="tbd"/>
@@ -6403,6 +5061,8 @@ TrickyTests.cpp:106
     <testcase classname="global" name="./succeeding/boolean member" time="tbd"/>
     <testcase classname="global" name="./succeeding/unimplemented static bool" time="tbd"/>
     <testcase classname="global" name="./succeeding/SafeBool" time="tbd"/>
+    <testcase classname="global" name="Assertions then sections" time="tbd"/>
+    <testcase classname="global" name="sort" time="tbd"/>
     <testcase classname="global" name="Scenario: Do that thing with the thing" time="tbd"/>
   </testsuite>
   <system-out>
@@ -11227,6 +9887,118 @@ TrickyTests.cpp" line="315">
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="Assertions then sections">
+TrickyTests.cpp" line="323">
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="A section">
+TrickyTests.cpp" line="327">
+          <Original>
+            Catch::isTrue( true )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another section">
+TrickyTests.cpp" line="331">
+            <Original>
+              Catch::isTrue( true )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+TrickyTests.cpp" line="323">
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="A section">
+TrickyTests.cpp" line="327">
+          <Original>
+            Catch::isTrue( true )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another other section">
+TrickyTests.cpp" line="335">
+            <Original>
+              Catch::isTrue( true )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="sort">
+TrickyTests.cpp" line="357">
+        <Original>
+          v == sorted
+        </Original>
+        <Expanded>
+          { 2, 3, 4 } == { 2, 3, 4 }
+        </Expanded>
+      </Expression>
+      <Section name="already sorted">
+TrickyTests.cpp" line="362">
+          <Original>
+            v == sorted
+          </Original>
+          <Expanded>
+            { 2, 3, 4 } == { 2, 3, 4 }
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+TrickyTests.cpp" line="357">
+        <Original>
+          v == sorted
+        </Original>
+        <Expanded>
+          { 2, 3, 4 } == { 2, 3, 4 }
+        </Expanded>
+      </Expression>
+      <Section name="reverse sorted">
+TrickyTests.cpp" line="368">
+          <Original>
+            v != sorted
+          </Original>
+          <Expanded>
+            { 4, 3, 2 } != { 2, 3, 4 }
+          </Expanded>
+        </Expression>
+TrickyTests.cpp" line="372">
+          <Original>
+            v == sorted
+          </Original>
+          <Expanded>
+            { 2, 3, 4 } == { 2, 3, 4 }
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="Scenario: Do that thing with the thing">
       <Section name="Given: This stuff exists">
         <Section name=" When: I do this">
@@ -11258,9 +10030,9 @@ BDDTests.cpp" line="35">
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="515" failures="104"/>
+    <OverallResults successes="526" failures="104"/>
   </Group>
-  <OverallResults successes="515" failures="104"/>
+  <OverallResults successes="526" failures="104"/>
 </Catch>
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
@@ -12600,6 +11372,41 @@ TrickyTests.cpp:314: !False succeeded for: true
 TrickyTests.cpp:315: !False succeeded for: !false
 [Finished: './succeeding/SafeBool' All tests passed (3 assertions in 1 test case)]
 
+[Running: Assertions then sections]
+TrickyTests.cpp:323: Catch::isTrue( true ) succeeded for: true
+[Started section: 'A section']
+TrickyTests.cpp:327: Catch::isTrue( true ) succeeded for: true
+[Started section: 'Another section']
+TrickyTests.cpp:331: Catch::isTrue( true ) succeeded for: true
+[End of section: 'Another section' 1 assertion passed]
+
+[End of section: 'A section' All 2 assertions passed]
+
+TrickyTests.cpp:323: Catch::isTrue( true ) succeeded for: true
+[Started section: 'A section']
+TrickyTests.cpp:327: Catch::isTrue( true ) succeeded for: true
+[Started section: 'Another other section']
+TrickyTests.cpp:335: Catch::isTrue( true ) succeeded for: true
+[End of section: 'Another other section' 1 assertion passed]
+
+[End of section: 'A section' All 2 assertions passed]
+
+[Finished: 'Assertions then sections' All tests passed (6 assertions in 1 test case)]
+
+[Running: sort]
+TrickyTests.cpp:357: v == sorted succeeded for: { 2, 3, 4 } == { 2, 3, 4 }
+[Started section: 'already sorted']
+TrickyTests.cpp:362: v == sorted succeeded for: { 2, 3, 4 } == { 2, 3, 4 }
+[End of section: 'already sorted' 1 assertion passed]
+
+TrickyTests.cpp:357: v == sorted succeeded for: { 2, 3, 4 } == { 2, 3, 4 }
+[Started section: 'reverse sorted']
+TrickyTests.cpp:368: v != sorted succeeded for: { 4, 3, 2 } != { 2, 3, 4 }
+TrickyTests.cpp:372: v == sorted succeeded for: { 2, 3, 4 } == { 2, 3, 4 }
+[End of section: 'reverse sorted' All 2 assertions passed]
+
+[Finished: 'sort' All tests passed (5 assertions in 1 test case)]
+
 [Running: Scenario: Do that thing with the thing]
 [Started section: 'Given: This stuff exists']
 [Started section: ' When: I do this']
@@ -12616,10 +11423,10 @@ BDDTests.cpp:35: itDoesThat() succeeded for: true
 [End of section: 'Given: This stuff exists' All 2 assertions passed]
 
 [Finished: 'Scenario: Do that thing with the thing' All tests passed (2 assertions in 1 test case)]
-[End of group: '~dummy'. 47 of 100 test cases failed (104 of 619 assertions failed)]
+[End of group: '~dummy'. 47 of 102 test cases failed (104 of 630 assertions failed)]
 
 
-[Testing completed. 47 of 100 test cases failed (104 of 619 assertions failed)]
+[Testing completed. 47 of 102 test cases failed (104 of 630 assertions failed)]
 
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
diff --git a/projects/SelfTest/TrickyTests.cpp b/projects/SelfTest/TrickyTests.cpp
index f15d236c..bd24471c 100644
--- a/projects/SelfTest/TrickyTests.cpp
+++ b/projects/SelfTest/TrickyTests.cpp
@@ -314,3 +314,62 @@ TEST_CASE( "./succeeding/SafeBool", "Objects that evaluated in boolean contexts
     CHECK( !False );
     CHECK_FALSE( False );
 }
+
+TEST_CASE( "Assertions then sections", "" )
+{
+    // This was causing a failure due to the way the console reporter was handling
+    // the current section
+    
+    REQUIRE( Catch::isTrue( true ) );
+    
+    SECTION( "A section", "" )
+    {
+        REQUIRE( Catch::isTrue( true ) );
+        
+        SECTION( "Another section", "" )
+        {
+            REQUIRE( Catch::isTrue( true ) );
+        }
+        SECTION( "Another other section", "" )
+        {
+            REQUIRE( Catch::isTrue( true ) );
+        }
+    }
+}
+
+inline void sort( std::vector<int>& v ) {
+    std::sort( v.begin(), v.end() );
+}
+
+TEST_CASE( "sort", "" ) {
+    std::vector<int> v;
+    v.push_back( 3 );
+    v.push_back( 2 );
+    v.push_back( 4 );
+    
+    std::vector<int> sorted;
+    sorted.push_back( 2 );
+    sorted.push_back( 3 );
+    sorted.push_back( 4 );
+    
+    sort( v );
+    
+    REQUIRE( v == sorted );
+    
+    SECTION( "already sorted", "" ) {
+        sort( v );
+        
+        REQUIRE( v == sorted );
+        
+    }
+    SECTION( "reverse sorted", "" ) {
+        std::reverse( v.begin(), v.end() );
+        
+        REQUIRE( v != sorted );
+        
+        sort( v );
+        
+        REQUIRE( v == sorted );
+        
+    }
+}