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

More console reporter tweaks and approved new output

Commit
21c479f5aa15dda79f223f65fddc0ca9f85c82dd
Author
Phil Nash ·
Parents
bb76e477041a

Files · Download .tar.gz

Changes

 include/reporters/catch_reporter_console.hpp    |   19 +-
 projects/SelfTest/Baselines/approvedResults.txt | 5721 ++++++++++++-----------
 2 files changed, 3046 insertions(+), 2694 deletions(-)

diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 4b7ce2a3..da6271d2 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -140,17 +140,20 @@ namespace Catch {
         }
         
         bool printResultType( AssertionResult const& _result ) {
-            if( _result.succeeded() ) {
+            if( _result.getResultType() == ResultWas::Info ||
+                _result.getResultType() == ResultWas::Warning ) {
+            }
+            else if( _result.succeeded() ) {
                 TextColour successColour( TextColour::Success );
-                stream << "passed";
+                stream << "passed ";
             }
             else if( _result.isOk() ) {
                 TextColour okAnywayColour( TextColour::Success );
-                stream << "failed - but was ok";
+                stream << "failed - but was ok ";
             }
             else {
                 TextColour errorColour( TextColour::Error );
-                stream << "failed";
+                stream << "failed ";
             }
             return false;
         }
@@ -170,7 +173,7 @@ namespace Catch {
         }
         bool printReconstructedExpression( AssertionResult const& _result ) {
             if( _result.hasExpandedExpression() ) {
-                stream << " with expansion:\n";
+                stream << "with expansion:\n";
                 TextColour colour( TextColour::ReconstructedExpression );
                 stream << wrapLongStrings( _result.getExpandedExpression() ) << "\n";
                 return true;
@@ -181,7 +184,7 @@ namespace Catch {
             std::pair<std::string, std::string> message = getMessage( _result );
             bool endsWithNewLine = false;
             if( !message.first.empty() ) {
-                stream << " " << message.first << ":" << "\n";
+                stream << message.first << ":" << "\n";
                 endsWithNewLine = true;
             }
             if( !message.second.empty() ) {
@@ -197,9 +200,9 @@ namespace Catch {
                 case ResultWas::DidntThrowException:
                     return std::make_pair( "because no exception was thrown where one was expected", "" );
                 case ResultWas::Info:
-                    return std::make_pair( "with info", _result.getMessage() );
+                    return std::make_pair( "info", _result.getMessage() );
                 case ResultWas::Warning:
-                    return std::make_pair( "with warning", _result.getMessage() );
+                    return std::make_pair( "warning", _result.getMessage() );
                 case ResultWas::ExplicitFailure:
                     return std::make_pair( "explicitly with message", _result.getMessage() );
 
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 2a354847..b2b1a77e 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,3671 +1,3990 @@
--- Started testing: 'CatchSelfTest' ----------------------------
--- Group: '~dummy' ---------------------------------------------
--- Test case: './succeeding/Approx/simple' ---------------------
+
+CatchSelfTest is a CATCH v0.9 b12 (integration) host application.
+Run with -? for options
+
+----------------------------------------------------------------
+Test case: './succeeding/Approx/simple'
+----------------------------------------------------------------
+
 ApproxTests.cpp:20:
-[20]  d == Approx( 1.23 )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( d == Approx( 1.23 ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[21]  d != Approx( 1.22 )
-succeeded
-for:  1.23 != Approx( 1.22 )
+ApproxTests.cpp:21:
+  REQUIRE( d != Approx( 1.22 ) )
+passed with expansion:
+  1.23 != Approx( 1.22 )
 
-[22]  d != Approx( 1.24 )
-succeeded
-for:  1.23 != Approx( 1.24 )
+ApproxTests.cpp:22:
+  REQUIRE( d != Approx( 1.24 ) )
+passed with expansion:
+  1.23 != Approx( 1.24 )
 
-[24]  Approx( d ) == 1.23
-succeeded
-for:  Approx( 1.23 ) == 1.23
+ApproxTests.cpp:24:
+  REQUIRE( Approx( d ) == 1.23 )
+passed with expansion:
+  Approx( 1.23 ) == 1.23
 
-[25]  Approx( d ) != 1.22
-succeeded
-for:  Approx( 1.23 ) != 1.22
+ApproxTests.cpp:25:
+  REQUIRE( Approx( d ) != 1.22 )
+passed with expansion:
+  Approx( 1.23 ) != 1.22
 
-[26]  Approx( d ) != 1.24
-succeeded
-for:  Approx( 1.23 ) != 1.24
+ApproxTests.cpp:26:
+  REQUIRE( Approx( d ) != 1.24 )
+passed with expansion:
+  Approx( 1.23 ) != 1.24
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/simple':
-All tests passed (6 assertions in 1 test case)
+Test case: './succeeding/Approx/epsilon'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/epsilon' --------------------
 ApproxTests.cpp:38:
-[38]  d != Approx( 1.231 )
-succeeded
-for:  1.23 != Approx( 1.231 )
+  REQUIRE( d != Approx( 1.231 ) )
+passed with expansion:
+  1.23 != Approx( 1.231 )
 
-[39]  d == Approx( 1.231 ).epsilon( 0.1 )
-succeeded
-for:  1.23 == Approx( 1.231 )
+ApproxTests.cpp:39:
+  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
+passed with expansion:
+  1.23 == Approx( 1.231 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/epsilon':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/float'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/float' ----------------------
 ApproxTests.cpp:49:
-[49]  1.23f == Approx( 1.23f )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( 1.23f == Approx( 1.23f ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[50]  0.0f == Approx( 0.0f )
-succeeded
-for:  0 == Approx( 0 )
+ApproxTests.cpp:50:
+  REQUIRE( 0.0f == Approx( 0.0f ) )
+passed with expansion:
+  0 == Approx( 0 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/float':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/int'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/int' ------------------------
 ApproxTests.cpp:60:
-[60]  1 == Approx( 1 )
-succeeded
+  REQUIRE( 1 == Approx( 1 ) )
+passed
 
-[61]  0 == Approx( 0 )
-succeeded
+ApproxTests.cpp:61:
+  REQUIRE( 0 == Approx( 0 ) )
+passed
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/int':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/mixed'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/mixed' ----------------------
 ApproxTests.cpp:75:
-[75]  1.0f == Approx( 1 )
-succeeded
-for:  1 == Approx( 1 )
+  REQUIRE( 1.0f == Approx( 1 ) )
+passed with expansion:
+  1 == Approx( 1 )
 
-[76]  0 == Approx( dZero)
-succeeded
-for:  0 == Approx( 0 )
+ApproxTests.cpp:76:
+  REQUIRE( 0 == Approx( dZero) )
+passed with expansion:
+  0 == Approx( 0 )
 
-[77]  0 == Approx( dSmall ).epsilon( 0.001 )
-succeeded
-for:  0 == Approx( 1e-05 )
+ApproxTests.cpp:77:
+  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
+passed with expansion:
+  0 == Approx( 1e-05 )
 
-[78]  1.234f == Approx( dMedium )
-succeeded
-for:  1.234 == Approx( 1.234 )
+ApproxTests.cpp:78:
+  REQUIRE( 1.234f == Approx( dMedium ) )
+passed with expansion:
+  1.234 == Approx( 1.234 )
 
-[79]  dMedium == Approx( 1.234f )
-succeeded
-for:  1.234 == Approx( 1.234 )
+ApproxTests.cpp:79:
+  REQUIRE( dMedium == Approx( 1.234f ) )
+passed with expansion:
+  1.234 == Approx( 1.234 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/mixed':
-All tests passed (5 assertions in 1 test case)
+Test case: './succeeding/Approx/custom'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/custom' ---------------------
 ApproxTests.cpp:93:
-[93]  d == approx( 1.23 )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( d == approx( 1.23 ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[94]  d == approx( 1.22 )
-succeeded
-for:  1.23 == Approx( 1.22 )
+ApproxTests.cpp:94:
+  REQUIRE( d == approx( 1.22 ) )
+passed with expansion:
+  1.23 == Approx( 1.22 )
 
-[95]  d == approx( 1.24 )
-succeeded
-for:  1.23 == Approx( 1.24 )
+ApproxTests.cpp:95:
+  REQUIRE( d == approx( 1.24 ) )
+passed with expansion:
+  1.23 == Approx( 1.24 )
 
-[96]  d != approx( 1.25 )
-succeeded
-for:  1.23 != Approx( 1.25 )
+ApproxTests.cpp:96:
+  REQUIRE( d != approx( 1.25 ) )
+passed with expansion:
+  1.23 != Approx( 1.25 )
 
-[98]  approx( d ) == 1.23
-succeeded
-for:  Approx( 1.23 ) == 1.23
+ApproxTests.cpp:98:
+  REQUIRE( approx( d ) == 1.23 )
+passed with expansion:
+  Approx( 1.23 ) == 1.23
 
-[99]  approx( d ) == 1.22
-succeeded
-for:  Approx( 1.23 ) == 1.22
+ApproxTests.cpp:99:
+  REQUIRE( approx( d ) == 1.22 )
+passed with expansion:
+  Approx( 1.23 ) == 1.22
 
-[100]  approx( d ) == 1.24
-succeeded
-for:   Approx( 1.23 ) == 1.24
+ApproxTests.cpp:100:
+  REQUIRE( approx( d ) == 1.24 )
+passed with expansion:
+  Approx( 1.23 ) == 1.24
 
-[101]  approx( d ) != 1.25
-succeeded
-for:   Approx( 1.23 ) != 1.25
+ApproxTests.cpp:101:
+  REQUIRE( approx( d ) != 1.25 )
+passed with expansion:
+  Approx( 1.23 ) != 1.25
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/custom':
-All tests passed (8 assertions in 1 test case)
+Test case: './succeeding/TestClass/succeedingCase'
+----------------------------------------------------------------
 
--- Test case: './succeeding/TestClass/succeedingCase' ----------
 ClassTests.cpp:24:
-[24]  s == "hello"
-succeeded
-for:  "hello" == "hello"
+  REQUIRE( s == "hello" )
+passed with expansion:
+  "hello" == "hello"
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/TestClass/succeedingCase':
-All tests passed (1 assertion in 1 test case)
+Test case: './failing/TestClass/failingCase'
+----------------------------------------------------------------
 
--- Test case: './failing/TestClass/failingCase' ----------------
 ClassTests.cpp:28:
-[28]  s == "world"
-failed
-for:  "hello" == "world"
+  REQUIRE( s == "world" )
+failed with expansion:
+  "hello" == "world"
 
 ----------------------------------------------------------------
-Summary for test case './failing/TestClass/failingCase':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/Fixture/succeedingCase'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Fixture/succeedingCase' ------------
 ClassTests.cpp:47:
-[47]  m_a == 1
-succeeded
-for:  1 == 1
+  REQUIRE( m_a == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Fixture/succeedingCase':
-All tests passed (1 assertion in 1 test case)
+Test case: './failing/Fixture/failingCase'
+----------------------------------------------------------------
 
--- Test case: './failing/Fixture/failingCase' ------------------
 ClassTests.cpp:55:
-[55]  m_a == 2
-failed
-for:  1 == 2
+  REQUIRE( m_a == 2 )
+failed with expansion:
+  1 == 2
 
 ----------------------------------------------------------------
-Summary for test case './failing/Fixture/failingCase':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/conditions/equality'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/equality' ---------------
 ConditionTests.cpp:55:
-[55]  data.int_seven == 7
-succeeded
-for:  7 == 7
+  REQUIRE( data.int_seven == 7 )
+passed with expansion:
+  7 == 7
 
-[56]  data.float_nine_point_one == Approx( 9.1f )
-succeeded
-for:  9.1 == Approx( 9.1 )
+ConditionTests.cpp:56:
+  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
+passed with expansion:
+  9.1 == Approx( 9.1 )
 
-[57]  data.double_pi == Approx( 3.1415926535 )
-succeeded
-for:  3.14159 == Approx( 3.14159 )
+ConditionTests.cpp:57:
+  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
+passed with expansion:
+  3.14159 == Approx( 3.14159 )
 
-[58]  data.str_hello == "hello"
-succeeded
-for:  "hello" == "hello"
+ConditionTests.cpp:58:
+  REQUIRE( data.str_hello == "hello" )
+passed with expansion:
+  "hello" == "hello"
 
-[59]  "hello" == data.str_hello
-succeeded
-for:  "hello" == "hello"
+ConditionTests.cpp:59:
+  REQUIRE( "hello" == data.str_hello )
+passed with expansion:
+  "hello" == "hello"
 
-[60]  data.str_hello.size() == 5
-succeeded
-for:  5 == 5
+ConditionTests.cpp:60:
+  REQUIRE( data.str_hello.size() == 5 )
+passed with expansion:
+  5 == 5
 
-[63]  x == Approx( 1.3 )
-succeeded
-for:  1.3 == Approx( 1.3 )
+ConditionTests.cpp:63:
+  REQUIRE( x == Approx( 1.3 ) )
+passed with expansion:
+  1.3 == Approx( 1.3 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/equality':
-All tests passed (7 assertions in 1 test case)
+Test case: './failing/conditions/equality'
+----------------------------------------------------------------
 
--- Test case: './failing/conditions/equality' ------------------
 ConditionTests.cpp:71:
-[71]  data.int_seven == 6
-failed
-for:  7 == 6
+  CHECK( data.int_seven == 6 )
+failed with expansion:
+  7 == 6
 
-[72]  data.int_seven == 8
-failed
-for:  7 == 8
+ConditionTests.cpp:72:
+  CHECK( data.int_seven == 8 )
+failed with expansion:
+  7 == 8
 
-[73]  data.int_seven == 0
-failed
-for:  7 == 0
+ConditionTests.cpp:73:
+  CHECK( data.int_seven == 0 )
+failed with expansion:
+  7 == 0
 
-[74]  data.float_nine_point_one == Approx( 9.11f )
-failed
-for:  9.1 == Approx( 9.11 )
+ConditionTests.cpp:74:
+  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
+failed with expansion:
+  9.1 == Approx( 9.11 )
 
-[75]  data.float_nine_point_one == Approx( 9.0f )
-failed
-for:  9.1 == Approx( 9 )
+ConditionTests.cpp:75:
+  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
+failed with expansion:
+  9.1 == Approx( 9 )
 
-[76]  data.float_nine_point_one == Approx( 1 )
-failed
-for:  9.1 == Approx( 1 )
+ConditionTests.cpp:76:
+  CHECK( data.float_nine_point_one == Approx( 1 ) )
+failed with expansion:
+  9.1 == Approx( 1 )
 
-[77]  data.float_nine_point_one == Approx( 0 )
-failed
-for:  9.1 == Approx( 0 )
+ConditionTests.cpp:77:
+  CHECK( data.float_nine_point_one == Approx( 0 ) )
+failed with expansion:
+  9.1 == Approx( 0 )
 
-[78]  data.double_pi == Approx( 3.1415 )
-failed
-for:  3.14159 == Approx( 3.1415 )
+ConditionTests.cpp:78:
+  CHECK( data.double_pi == Approx( 3.1415 ) )
+failed with expansion:
+  3.14159 == Approx( 3.1415 )
 
-[79]  data.str_hello == "goodbye"
-failed
-for:  "hello" == "goodbye"
+ConditionTests.cpp:79:
+  CHECK( data.str_hello == "goodbye" )
+failed with expansion:
+  "hello" == "goodbye"
 
-[80]  data.str_hello == "hell"
-failed
-for:  "hello" == "hell"
+ConditionTests.cpp:80:
+  CHECK( data.str_hello == "hell" )
+failed with expansion:
+  "hello" == "hell"
 
-[81]  data.str_hello == "hello1"
-failed
-for:  "hello" == "hello1"
+ConditionTests.cpp:81:
+  CHECK( data.str_hello == "hello1" )
+failed with expansion:
+  "hello" == "hello1"
 
-[82]  data.str_hello.size() == 6
-failed
-for:  5 == 6
+ConditionTests.cpp:82:
+  CHECK( data.str_hello.size() == 6 )
+failed with expansion:
+  5 == 6
 
-[85]  x == Approx( 1.301 )
-failed
-for:  1.3 == Approx( 1.301 )
+ConditionTests.cpp:85:
+  CHECK( x == Approx( 1.301 ) )
+failed with expansion:
+  1.3 == Approx( 1.301 )
 
 ----------------------------------------------------------------
-Summary for test case './failing/conditions/equality':
-1 test case - failed (13 assertions - all failed)
+Test case: './succeeding/conditions/inequality'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/inequality' -------------
 ConditionTests.cpp:93:
-[93]  data.int_seven != 6
-succeeded
-for:  7 != 6
+  REQUIRE( data.int_seven != 6 )
+passed with expansion:
+  7 != 6
 
-[94]  data.int_seven != 8
-succeeded
-for:  7 != 8
+ConditionTests.cpp:94:
+  REQUIRE( data.int_seven != 8 )
+passed with expansion:
+  7 != 8
 
-[95]  data.float_nine_point_one != Approx( 9.11f )
-succeeded
-for:  9.1 != Approx( 9.11 )
+ConditionTests.cpp:95:
+  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
+passed with expansion:
+  9.1 != Approx( 9.11 )
 
-[96]  data.float_nine_point_one != Approx( 9.0f )
-succeeded
-for:  9.1 != Approx( 9 )
+ConditionTests.cpp:96:
+  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
+passed with expansion:
+  9.1 != Approx( 9 )
 
-[97]  data.float_nine_point_one != Approx( 1 )
-succeeded
-for:  9.1 != Approx( 1 )
+ConditionTests.cpp:97:
+  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
+passed with expansion:
+  9.1 != Approx( 1 )
 
-[98]  data.float_nine_point_one != Approx( 0 )
-succeeded
-for:  9.1 != Approx( 0 )
+ConditionTests.cpp:98:
+  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
+passed with expansion:
+  9.1 != Approx( 0 )
 
-[99]  data.double_pi != Approx( 3.1415 )
-succeeded
-for:  3.14159 != Approx( 3.1415 )
+ConditionTests.cpp:99:
+  REQUIRE( data.double_pi != Approx( 3.1415 ) )
+passed with expansion:
+  3.14159 != Approx( 3.1415 )
 
-[100]  data.str_hello != "goodbye"
-succeeded
-for:   "hello" != "goodbye"
+ConditionTests.cpp:100:
+  REQUIRE( data.str_hello != "goodbye" )
+passed with expansion:
+  "hello" != "goodbye"
 
-[101]  data.str_hello != "hell"
-succeeded
-for:   "hello" != "hell"
+ConditionTests.cpp:101:
+  REQUIRE( data.str_hello != "hell" )
+passed with expansion:
+  "hello" != "hell"
 
-[102]  data.str_hello != "hello1"
-succeeded
-for:   "hello" != "hello1"
+ConditionTests.cpp:102:
+  REQUIRE( data.str_hello != "hello1" )
+passed with expansion:
+  "hello" != "hello1"
 
-[103]  data.str_hello.size() != 6
-succeeded
-for:   5 != 6
+ConditionTests.cpp:103:
+  REQUIRE( data.str_hello.size() != 6 )
+passed with expansion:
+  5 != 6
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/inequality':
-All tests passed (11 assertions in 1 test case)
+Test case: './failing/conditions/inequality'
+----------------------------------------------------------------
 
--- Test case: './failing/conditions/inequality' ----------------
 ConditionTests.cpp:111:
-[111]  data.int_seven != 7
-failed
-for:   7 != 7
+  CHECK( data.int_seven != 7 )
+failed with expansion:
+  7 != 7
 
-[112]  data.float_nine_point_one != Approx( 9.1f )
-failed
-for:   9.1 != Approx( 9.1 )
+ConditionTests.cpp:112:
+  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
+failed with expansion:
+  9.1 != Approx( 9.1 )
 
-[113]  data.double_pi != Approx( 3.1415926535 )
-failed
-for:   3.14159 != Approx( 3.14159 )
+ConditionTests.cpp:113:
+  CHECK( data.double_pi != Approx( 3.1415926535 ) )
+failed with expansion:
+  3.14159 != Approx( 3.14159 )
 
-[114]  data.str_hello != "hello"
-failed
-for:   "hello" != "hello"
+ConditionTests.cpp:114:
+  CHECK( data.str_hello != "hello" )
+failed with expansion:
+  "hello" != "hello"
 
-[115]  data.str_hello.size() != 5
-failed
-for:   5 != 5
+ConditionTests.cpp:115:
+  CHECK( data.str_hello.size() != 5 )
+failed with expansion:
+  5 != 5
 
 ----------------------------------------------------------------
-Summary for test case './failing/conditions/inequality':
-1 test case - failed (5 assertions - all failed)
+Test case: './succeeding/conditions/ordered'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/ordered' ----------------
 ConditionTests.cpp:124:
-[124]  data.int_seven < 8
-succeeded
-for:   7 < 8
-
-[125]  data.int_seven > 6
-succeeded
-for:   7 > 6
-
-[126]  data.int_seven > 0
-succeeded
-for:   7 > 0
-
-[127]  data.int_seven > -1
-succeeded
-for:   7 > -1
-
-[129]  data.int_seven >= 7
-succeeded
-for:   7 >= 7
-
-[130]  data.int_seven >= 6
-succeeded
-for:   7 >= 6
-
-[131]  data.int_seven <= 7
-succeeded
-for:   7 <= 7
-
-[132]  data.int_seven <= 8
-succeeded
-for:   7 <= 8
-
-[134]  data.float_nine_point_one > 9
-succeeded
-for:   9.1 > 9
-
-[135]  data.float_nine_point_one < 10
-succeeded
-for:   9.1 < 10
-
-[136]  data.float_nine_point_one < 9.2
-succeeded
-for:   9.1 < 9.2
-
-[138]  data.str_hello <= "hello"
-succeeded
-for:   "hello" <= "hello"
-
-[139]  data.str_hello >= "hello"
-succeeded
-for:   "hello" >= "hello"
-
-[141]  data.str_hello < "hellp"
-succeeded
-for:   "hello" < "hellp"
-
-[142]  data.str_hello < "zebra"
-succeeded
-for:   "hello" < "zebra"
-
-[143]  data.str_hello > "hellm"
-succeeded
-for:   "hello" > "hellm"
-
-[144]  data.str_hello > "a"
-succeeded
-for:   "hello" > "a"
-
+  REQUIRE( data.int_seven < 8 )
+passed with expansion:
+  7 < 8
+
+ConditionTests.cpp:125:
+  REQUIRE( data.int_seven > 6 )
+passed with expansion:
+  7 > 6
+
+ConditionTests.cpp:126:
+  REQUIRE( data.int_seven > 0 )
+passed with expansion:
+  7 > 0
+
+ConditionTests.cpp:127:
+  REQUIRE( data.int_seven > -1 )
+passed with expansion:
+  7 > -1
+
+ConditionTests.cpp:129:
+  REQUIRE( data.int_seven >= 7 )
+passed with expansion:
+  7 >= 7
+
+ConditionTests.cpp:130:
+  REQUIRE( data.int_seven >= 6 )
+passed with expansion:
+  7 >= 6
+
+ConditionTests.cpp:131:
+  REQUIRE( data.int_seven <= 7 )
+passed with expansion:
+  7 <= 7
+
+ConditionTests.cpp:132:
+  REQUIRE( data.int_seven <= 8 )
+passed with expansion:
+  7 <= 8
+
+ConditionTests.cpp:134:
+  REQUIRE( data.float_nine_point_one > 9 )
+passed with expansion:
+  9.1 > 9
+
+ConditionTests.cpp:135:
+  REQUIRE( data.float_nine_point_one < 10 )
+passed with expansion:
+  9.1 < 10
+
+ConditionTests.cpp:136:
+  REQUIRE( data.float_nine_point_one < 9.2 )
+passed with expansion:
+  9.1 < 9.2
+
+ConditionTests.cpp:138:
+  REQUIRE( data.str_hello <= "hello" )
+passed with expansion:
+  "hello" <= "hello"
+
+ConditionTests.cpp:139:
+  REQUIRE( data.str_hello >= "hello" )
+passed with expansion:
+  "hello" >= "hello"
+
+ConditionTests.cpp:141:
+  REQUIRE( data.str_hello < "hellp" )
+passed with expansion:
+  "hello" < "hellp"
+
+ConditionTests.cpp:142:
+  REQUIRE( data.str_hello < "zebra" )
+passed with expansion:
+  "hello" < "zebra"
+
+ConditionTests.cpp:143:
+  REQUIRE( data.str_hello > "hellm" )
+passed with expansion:
+  "hello" > "hellm"
+
+ConditionTests.cpp:144:
+  REQUIRE( data.str_hello > "a" )
+passed with expansion:
+  "hello" > "a"
+
+----------------------------------------------------------------
+Test case: './failing/conditions/ordered'
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/ordered':
-All tests passed (17 assertions in 1 test case)
 
--- Test case: './failing/conditions/ordered' -------------------
 ConditionTests.cpp:152:
-[152]  data.int_seven > 7
-failed
-for:   7 > 7
+  CHECK( data.int_seven > 7 )
+failed with expansion:
+  7 > 7
 
-[153]  data.int_seven < 7
-failed
-for:   7 < 7
+ConditionTests.cpp:153:
+  CHECK( data.int_seven < 7 )
+failed with expansion:
+  7 < 7
 
-[154]  data.int_seven > 8
-failed
-for:   7 > 8
+ConditionTests.cpp:154:
+  CHECK( data.int_seven > 8 )
+failed with expansion:
+  7 > 8
 
-[155]  data.int_seven < 6
-failed
-for:   7 < 6
+ConditionTests.cpp:155:
+  CHECK( data.int_seven < 6 )
+failed with expansion:
+  7 < 6
 
-[156]  data.int_seven < 0
-failed
-for:   7 < 0
+ConditionTests.cpp:156:
+  CHECK( data.int_seven < 0 )
+failed with expansion:
+  7 < 0
 
-[157]  data.int_seven < -1
-failed
-for:   7 < -1
+ConditionTests.cpp:157:
+  CHECK( data.int_seven < -1 )
+failed with expansion:
+  7 < -1
 
-[159]  data.int_seven >= 8
-failed
-for:   7 >= 8
+ConditionTests.cpp:159:
+  CHECK( data.int_seven >= 8 )
+failed with expansion:
+  7 >= 8
 
-[160]  data.int_seven <= 6
-failed
-for:   7 <= 6
+ConditionTests.cpp:160:
+  CHECK( data.int_seven <= 6 )
+failed with expansion:
+  7 <= 6
 
-[162]  data.float_nine_point_one < 9
-failed
-for:   9.1 < 9
+ConditionTests.cpp:162:
+  CHECK( data.float_nine_point_one < 9 )
+failed with expansion:
+  9.1 < 9
 
-[163]  data.float_nine_point_one > 10
-failed
-for:   9.1 > 10
+ConditionTests.cpp:163:
+  CHECK( data.float_nine_point_one > 10 )
+failed with expansion:
+  9.1 > 10
 
-[164]  data.float_nine_point_one > 9.2
-failed
-for:   9.1 > 9.2
+ConditionTests.cpp:164:
+  CHECK( data.float_nine_point_one > 9.2 )
+failed with expansion:
+  9.1 > 9.2
 
-[166]  data.str_hello > "hello"
-failed
-for:   "hello" > "hello"
+ConditionTests.cpp:166:
+  CHECK( data.str_hello > "hello" )
+failed with expansion:
+  "hello" > "hello"
 
-[167]  data.str_hello < "hello"
-failed
-for:   "hello" < "hello"
+ConditionTests.cpp:167:
+  CHECK( data.str_hello < "hello" )
+failed with expansion:
+  "hello" < "hello"
 
-[168]  data.str_hello > "hellp"
-failed
-for:   "hello" > "hellp"
+ConditionTests.cpp:168:
+  CHECK( data.str_hello > "hellp" )
+failed with expansion:
+  "hello" > "hellp"
 
-[169]  data.str_hello > "z"
-failed
-for:   "hello" > "z"
+ConditionTests.cpp:169:
+  CHECK( data.str_hello > "z" )
+failed with expansion:
+  "hello" > "z"
 
-[170]  data.str_hello < "hellm"
-failed
-for:   "hello" < "hellm"
+ConditionTests.cpp:170:
+  CHECK( data.str_hello < "hellm" )
+failed with expansion:
+  "hello" < "hellm"
 
-[171]  data.str_hello < "a"
-failed
-for:   "hello" < "a"
+ConditionTests.cpp:171:
+  CHECK( data.str_hello < "a" )
+failed with expansion:
+  "hello" < "a"
 
-[173]  data.str_hello >= "z"
-failed
-for:   "hello" >= "z"
+ConditionTests.cpp:173:
+  CHECK( data.str_hello >= "z" )
+failed with expansion:
+  "hello" >= "z"
 
-[174]  data.str_hello <= "a"
-failed
-for:   "hello" <= "a"
+ConditionTests.cpp:174:
+  CHECK( data.str_hello <= "a" )
+failed with expansion:
+  "hello" <= "a"
 
 ----------------------------------------------------------------
-Summary for test case './failing/conditions/ordered':
-1 test case - failed (19 assertions - all failed)
+Test case: './succeeding/conditions/int literals'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/int literals' -----------
 ConditionTests.cpp:188:
-[188]  i == 1
-succeeded
-for:   1 == 1
-
-[189]  ui == 2
-succeeded
-for:   2 == 2
-
-[190]  l == 3
-succeeded
-for:   3 == 3
-
-[191]  ul == 4
-succeeded
-for:   4 == 4
-
-[192]  c == 5
-succeeded
-for:   5 == 5
-
-[193]  uc == 6
-succeeded
-for:   6 == 6
-
-[195]  1 == i
-succeeded
-for:   1 == 1
-
-[196]  2 == ui
-succeeded
-for:   2 == 2
-
-[197]  3 == l
-succeeded
-for:   3 == 3
-
-[198]  4 == ul
-succeeded
-for:   4 == 4
-
-[199]  5 == c
-succeeded
-for:   5 == 5
-
-[200]  6 == uc
-succeeded
-for:   6 == 6
-
-[202]  (std::numeric_limits<unsigned long>::max)() > ul
-succeeded
-for:   0x<hex digits> > 4
-
+  REQUIRE( i == 1 )
+passed with expansion:
+  1 == 1
+
+ConditionTests.cpp:189:
+  REQUIRE( ui == 2 )
+passed with expansion:
+  2 == 2
+
+ConditionTests.cpp:190:
+  REQUIRE( l == 3 )
+passed with expansion:
+  3 == 3
+
+ConditionTests.cpp:191:
+  REQUIRE( ul == 4 )
+passed with expansion:
+  4 == 4
+
+ConditionTests.cpp:192:
+  REQUIRE( c == 5 )
+passed with expansion:
+  5 == 5
+
+ConditionTests.cpp:193:
+  REQUIRE( uc == 6 )
+passed with expansion:
+  6 == 6
+
+ConditionTests.cpp:195:
+  REQUIRE( 1 == i )
+passed with expansion:
+  1 == 1
+
+ConditionTests.cpp:196:
+  REQUIRE( 2 == ui )
+passed with expansion:
+  2 == 2
+
+ConditionTests.cpp:197:
+  REQUIRE( 3 == l )
+passed with expansion:
+  3 == 3
+
+ConditionTests.cpp:198:
+  REQUIRE( 4 == ul )
+passed with expansion:
+  4 == 4
+
+ConditionTests.cpp:199:
+  REQUIRE( 5 == c )
+passed with expansion:
+  5 == 5
+
+ConditionTests.cpp:200:
+  REQUIRE( 6 == uc )
+passed with expansion:
+  6 == 6
+
+ConditionTests.cpp:202:
+  REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
+passed with expansion:
+  0x<hex digits> > 4
+
+----------------------------------------------------------------
+Test case: './succeeding/conditions//long_to_unsigned_x'
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/int literals':
-All tests passed (13 assertions in 1 test case)
 
--- Test case: './succeeding/conditions//long_to_unsigned_x' ----
 ConditionTests.cpp:223:
-[223]  long_var == unsigned_char_var
-succeeded
-for:   1 == 1
+  REQUIRE( long_var == unsigned_char_var )
+passed with expansion:
+  1 == 1
 
-[224]  long_var == unsigned_short_var
-succeeded
-for:   1 == 1
+ConditionTests.cpp:224:
+  REQUIRE( long_var == unsigned_short_var )
+passed with expansion:
+  1 == 1
 
-[225]  long_var == unsigned_int_var
-succeeded
-for:   1 == 1
+ConditionTests.cpp:225:
+  REQUIRE( long_var == unsigned_int_var )
+passed with expansion:
+  1 == 1
 
-[226]  long_var == unsigned_long_var
-succeeded
-for:   1 == 1
+ConditionTests.cpp:226:
+  REQUIRE( long_var == unsigned_long_var )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions//long_to_unsigned_x':
-All tests passed (4 assertions in 1 test case)
+Test case: './succeeding/conditions/const ints to int literal'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/const ints to int literal'
 ConditionTests.cpp:237:
-[237]  unsigned_char_var == 1
-succeeded
-for:   1 == 1
+  REQUIRE( unsigned_char_var == 1 )
+passed with expansion:
+  1 == 1
 
-[238]  unsigned_short_var == 1
-succeeded
-for:   1 == 1
+ConditionTests.cpp:238:
+  REQUIRE( unsigned_short_var == 1 )
+passed with expansion:
+  1 == 1
 
-[239]  unsigned_int_var == 1
-succeeded
-for:   1 == 1
+ConditionTests.cpp:239:
+  REQUIRE( unsigned_int_var == 1 )
+passed with expansion:
+  1 == 1
 
-[240]  unsigned_long_var == 1
-succeeded
-for:   1 == 1
+ConditionTests.cpp:240:
+  REQUIRE( unsigned_long_var == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/const ints to int literal':
-All tests passed (4 assertions in 1 test case)
+Test case: './succeeding/conditions/negative ints'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/negative ints' ----------
 ConditionTests.cpp:246:
-[246]  ( -1 > 2u )
-succeeded
-for:   true
+  CHECK( ( -1 > 2u ) )
+passed with expansion:
+  true
 
-[247]  -1 > 2u
-succeeded
-for:   -1 > 2
+ConditionTests.cpp:247:
+  CHECK( -1 > 2u )
+passed with expansion:
+  -1 > 2
 
-[249]  ( 2u < -1 )
-succeeded
-for:   true
+ConditionTests.cpp:249:
+  CHECK( ( 2u < -1 ) )
+passed with expansion:
+  true
 
-[250]  2u < -1
-succeeded
-for:   2 < -1
+ConditionTests.cpp:250:
+  CHECK( 2u < -1 )
+passed with expansion:
+  2 < -1
 
-[253]  ( minInt > 2u )
-succeeded
-for:   true
+ConditionTests.cpp:253:
+  CHECK( ( minInt > 2u ) )
+passed with expansion:
+  true
 
-[254]  minInt > 2u
-succeeded
-for:   -2147483648 > 2
+ConditionTests.cpp:254:
+  CHECK( minInt > 2u )
+passed with expansion:
+  -2147483648 > 2
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/negative ints':
-All tests passed (6 assertions in 1 test case)
+Test case: './succeeding/conditions/computed ints'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/computed ints' ----------
 ConditionTests.cpp:269:
-[269]  54 == 6*9
-succeeded
-for:   54 == 54
+  CHECK( 54 == 6*9 )
+passed with expansion:
+  54 == 54
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/computed ints':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/conditions/ptr'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/ptr' --------------------
 ConditionTests.cpp:285:
-[285]  p == __null
-succeeded
-for:   __null == 0
+  REQUIRE( p == __null )
+passed with expansion:
+  __null == 0
 
-[286]  p == pNULL
-succeeded
-for:   __null == __null
+ConditionTests.cpp:286:
+  REQUIRE( p == pNULL )
+passed with expansion:
+  __null == __null
 
-[291]  p != __null
-succeeded
-for:   0x<hex digits> != 0
+ConditionTests.cpp:291:
+  REQUIRE( p != __null )
+passed with expansion:
+  0x<hex digits> != 0
 
-[294]  cp != __null
-succeeded
-for:   0x<hex digits> != 0
+ConditionTests.cpp:294:
+  REQUIRE( cp != __null )
+passed with expansion:
+  0x<hex digits> != 0
 
-[297]  cpc != __null
-succeeded
-for:   0x<hex digits> != 0
+ConditionTests.cpp:297:
+  REQUIRE( cpc != __null )
+passed with expansion:
+  0x<hex digits> != 0
 
-[299]  returnsNull() == __null
-succeeded
-for:   {null string} == 0
+ConditionTests.cpp:299:
+  REQUIRE( returnsNull() == __null )
+passed with expansion:
+  {null string} == 0
 
-[300]  returnsConstNull() == __null
-succeeded
-for:   {null string} == 0
+ConditionTests.cpp:300:
+  REQUIRE( returnsConstNull() == __null )
+passed with expansion:
+  {null string} == 0
 
-[302]  __null != p
-succeeded
-for:   0 != 0x<hex digits>
+ConditionTests.cpp:302:
+  REQUIRE( __null != p )
+passed with expansion:
+  0 != 0x<hex digits>
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/ptr':
-All tests passed (8 assertions in 1 test case)
+Test case: './succeeding/conditions/not'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/not' --------------------
 ConditionTests.cpp:317:
-[317]  false == false
-succeeded
+  REQUIRE( false == false )
+passed
 
-[318]  true == true
-succeeded
+ConditionTests.cpp:318:
+  REQUIRE( true == true )
+passed
 
-[319]  !false
-succeeded
-for:   true
+ConditionTests.cpp:319:
+  REQUIRE( !false )
+passed with expansion:
+  true
 
-[320]  !false
-succeeded
+ConditionTests.cpp:320:
+  REQUIRE_FALSE( !false )
+passed
 
-[322]  !falseValue
-succeeded
-for:   true
+ConditionTests.cpp:322:
+  REQUIRE( !falseValue )
+passed with expansion:
+  true
 
-[323]  !falseValue
-succeeded
-for:   !false
+ConditionTests.cpp:323:
+  REQUIRE_FALSE( !falseValue )
+passed with expansion:
+  !false
 
-[325]  !(1 == 2)
-succeeded
-for:   true
+ConditionTests.cpp:325:
+  REQUIRE( !(1 == 2) )
+passed with expansion:
+  true
 
-[326]  !1 == 2
-succeeded
-for:   !(1 == 2)
+ConditionTests.cpp:326:
+  REQUIRE_FALSE( !1 == 2 )
+passed with expansion:
+  !(1 == 2)
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/not':
-All tests passed (8 assertions in 1 test case)
+Test case: './failing/conditions/not'
+----------------------------------------------------------------
 
--- Test case: './failing/conditions/not' -----------------------
 ConditionTests.cpp:334:
-[334]  false != false
+  CHECK( false != false )
 failed
 
-[335]  true != true
+ConditionTests.cpp:335:
+  CHECK( true != true )
 failed
 
-[336]  !true
-failed
-for:   false
+ConditionTests.cpp:336:
+  CHECK( !true )
+failed with expansion:
+  false
 
-[337]  !true
+ConditionTests.cpp:337:
+  CHECK_FALSE( !true )
 failed
 
-[339]  !trueValue
-failed
-for:   false
+ConditionTests.cpp:339:
+  CHECK( !trueValue )
+failed with expansion:
+  false
 
-[340]  !trueValue
-failed
-for:   !true
+ConditionTests.cpp:340:
+  CHECK_FALSE( !trueValue )
+failed with expansion:
+  !true
 
-[342]  !(1 == 1)
-failed
-for:   false
+ConditionTests.cpp:342:
+  CHECK( !(1 == 1) )
+failed with expansion:
+  false
 
-[343]  !1 == 1
-failed
-for:   !(1 == 1)
+ConditionTests.cpp:343:
+  CHECK_FALSE( !1 == 1 )
+failed with expansion:
+  !(1 == 1)
 
 ----------------------------------------------------------------
-Summary for test case './failing/conditions/not':
-1 test case - failed (8 assertions - all failed)
+Test case: './succeeding/exceptions/explicit'
+----------------------------------------------------------------
 
--- Test case: './succeeding/exceptions/explicit' ---------------
 ExceptionTests.cpp:39:
-[39]  thisThrows()
-succeeded
+  REQUIRE_THROWS_AS( thisThrows() )
+passed
 
-[40]  thisDoesntThrow()
-succeeded
+ExceptionTests.cpp:40:
+  REQUIRE_NOTHROW( thisDoesntThrow() )
+passed
 
-[41]  thisThrows()
-succeeded
+ExceptionTests.cpp:41:
+  REQUIRE_THROWS( thisThrows() )
+passed
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/exceptions/explicit':
-All tests passed (3 assertions in 1 test case)
+Test case: './failing/exceptions/explicit'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/explicit' ------------------
 ExceptionTests.cpp:47:
-[47]  thisThrows()
-failed with unexpected exception with message: 'expected exception'
+  CHECK_THROWS_AS( thisThrows() )
+failed due to unexpected exception with message:
+  expected exception
 
-[48]  thisDoesntThrow()
-failed because no exception was thrown where one was expected
+ExceptionTests.cpp:48:
+  CHECK_THROWS_AS( thisDoesntThrow() )
+failed because no exception was thrown where one was expected:
 
-[49]  thisThrows()
-failed with unexpected exception with message: 'expected exception'
+ExceptionTests.cpp:49:
+  CHECK_NOTHROW( thisThrows() )
+failed due to unexpected exception with message:
+  expected exception
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/explicit':
-1 test case - failed (3 assertions - all failed)
+Test case: './failing/exceptions/implicit'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/implicit' ------------------
 ExceptionTests.cpp:52:
-[52]  Unexpected exception with message: 'unexpected exception'
+failed due to unexpected exception with message:
+  unexpected exception
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/implicit':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/exceptions/implicit/2'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/implicit/2' ----------------
 ExceptionTests.cpp:60:
-[60]  1 == 1
-succeeded
+  CHECK( 1 == 1 )
+passed
 
-[60]  {Unknown expression after this line}
-failed with unexpected exception with message: 'unexpected exception'
+ExceptionTests.cpp:60:
+  {Unknown expression after this line}
+failed due to unexpected exception with message:
+  unexpected exception
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/implicit/2':
-1 test case - failed (2 assertions - 1 failed)
+Test case: './succeeding/exceptions/implicit'
+----------------------------------------------------------------
 
--- Test case: './succeeding/exceptions/implicit' ---------------
 
 No assertions in test case, './succeeding/exceptions/implicit'
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/exceptions/implicit':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/exceptions/custom'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/custom' --------------------
 ExceptionTests.cpp:102:
-[102]  Unexpected exception with message: 'custom exception'
+failed due to unexpected exception with message:
+  custom exception
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/custom':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/exceptions/custom/nothrow'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/custom/nothrow' ------------
 ExceptionTests.cpp:109:
-[109]  throw CustomException( "unexpected custom exception" )
-failed with unexpected exception with message: 'unexpected custom exception'
+  REQUIRE_NOTHROW( throw CustomException( "unexpected custom exception" ) )
+failed due to unexpected exception with message:
+  unexpected custom exception
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/custom/nothrow':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/exceptions/custom/throw'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/custom/throw' --------------
 ExceptionTests.cpp:114:
-[114]  throw CustomException( "custom exception - not std" )
-failed with unexpected exception with message: 'custom exception - not std'
+  REQUIRE_THROWS_AS( throw CustomException( "custom exception - not std" ) )
+failed due to unexpected exception with message:
+  custom exception - not std
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/custom/throw':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/exceptions/custom/double'
+----------------------------------------------------------------
 
--- Test case: './failing/exceptions/custom/double' -------------
 ExceptionTests.cpp:118:
-[118]  Unexpected exception with message: '3.14'
+failed due to unexpected exception with message:
+  3.14
 
 ----------------------------------------------------------------
-Summary for test case './failing/exceptions/custom/double':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/exceptions/notimplemented'
+----------------------------------------------------------------
 
--- Test case: './succeeding/exceptions/notimplemented' ---------
 ExceptionTests.cpp:129:
-[129]  thisFunctionNotImplemented( 7 )
-succeeded
+  REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
+passed
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/exceptions/notimplemented':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/generators/1'
+----------------------------------------------------------------
 
--- Test case: './succeeding/generators/1' ----------------------
 GeneratorTests.cpp:26:
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  200 == 200
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  200 == 200
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  202 == 202
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  202 == 202
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  204 == 204
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  204 == 204
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  206 == 206
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  206 == 206
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  208 == 208
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  208 == 208
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  210 == 210
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  210 == 210
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  212 == 212
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  212 == 212
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  2 == 2
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  2 == 2
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  4 == 4
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  4 == 4
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  6 == 6
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  6 == 6
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  8 == 8
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  8 == 8
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  10 == 10
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  10 == 10
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  30 == 30
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  30 == 30
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  40 == 40
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  40 == 40
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  42 == 42
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  42 == 42
+
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
+
+GeneratorTests.cpp:26:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+passed with expansion:
+  72 == 72
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:27:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+passed with expansion:
+  214 == 214
+
+----------------------------------------------------------------
+Test case: './succeeding/generators/2'
+----------------------------------------------------------------
 
-[26]  multiply( i, 2 ) == i*2
-succeeded
-for:  72 == 72
+GeneratorTests.cpp:40:
+  CATCH_REQUIRE( i->first == i->second-1 )
+passed with expansion:
+  0 == 0
 
-[27]  multiply( j, 2 ) == j*2
-succeeded
-for:  214 == 214
+GeneratorTests.cpp:40:
+  CATCH_REQUIRE( i->first == i->second-1 )
+passed with expansion:
+  2 == 2
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/generators/1':
-All tests passed (144 assertions in 1 test case)
+Test case: './succeeding/message'
+----------------------------------------------------------------
 
--- Test case: './succeeding/message' ---------------------------
 MessageTests.cpp:14:
-[14]  [warning: this is a warning]
+warning:
+  this is a warning
 
 
 No assertions in test case, './succeeding/message'
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/message':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/succeed'
+----------------------------------------------------------------
 
--- Test case: './succeeding/succeed' ---------------------------
 MessageTests.cpp:18:
-[18]   succeeded
-[with message: this is a success]
+passed with message:
+  this is a success
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/succeed':
-All tests passed (1 assertion in 1 test case)
+Test case: './failing/message/info/1'
+----------------------------------------------------------------
 
--- Test case: './failing/message/info/1' -----------------------
 MessageTests.cpp:23:
-[23]  [info: this message should be logged]
+info:
+  this message should be logged
 
-[24]  [info: so should this]
+MessageTests.cpp:24:
+info:
+  so should this
 
-[26]  a == 1
-failed
-for:  2 == 1
+MessageTests.cpp:26:
+  REQUIRE( a == 1 )
+failed with expansion:
+  2 == 1
 
 ----------------------------------------------------------------
-Summary for test case './failing/message/info/1':
-1 test case - failed (1 assertion - failed)
+Test case: './mixed/message/info/2'
+----------------------------------------------------------------
 
--- Test case: './mixed/message/info/2' -------------------------
 MessageTests.cpp:33:
-[33]  a == 2
-succeeded
-for:  2 == 2
+  CHECK( a == 2 )
+passed with expansion:
+  2 == 2
 
-[31]  [info: this message should be logged]
+MessageTests.cpp:31:
+info:
+  this message should be logged
 
-[35]  [info: this message should be logged, too]
+MessageTests.cpp:35:
+info:
+  this message should be logged, too
 
-[37]  a == 1
-failed
-for:  2 == 1
+MessageTests.cpp:37:
+  CHECK( a == 1 )
+failed with expansion:
+  2 == 1
 
-[39]  [info: and this, but later]
+MessageTests.cpp:39:
+info:
+  and this, but later
 
-[41]  a == 0
-failed
-for:  2 == 0
+MessageTests.cpp:41:
+  CHECK( a == 0 )
+failed with expansion:
+  2 == 0
 
-[45]  a == 2
-succeeded
-for:  2 == 2
+MessageTests.cpp:45:
+  CHECK( a == 2 )
+passed with expansion:
+  2 == 2
 
 ----------------------------------------------------------------
-Summary for test case './mixed/message/info/2':
-1 test case - failed (4 assertions - 2 failed)
+Test case: './failing/message/fail'
+----------------------------------------------------------------
 
--- Test case: './failing/message/fail' -------------------------
 MessageTests.cpp:51:
-[51]  failed with message: 'This is a failure'
+failed explicitly with message:
+  This is a failure
 
 ----------------------------------------------------------------
-Summary for test case './failing/message/fail':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/message/sections'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'one'
+----------------------------------------------------------------
 
--- Test case: './failing/message/sections' ---------------------
--- Section: 'one' ----------------------------------------------
 MessageTests.cpp:58:
-[58]  failed with message: 'Message from section one'
+failed explicitly with message:
+  Message from section one
 
 ----------------------------------------------------------------
-Summary for section 'one':
-1 assertion - failed
+Section: 'two'
+----------------------------------------------------------------
 
--- Section: 'two' ----------------------------------------------
 MessageTests.cpp:63:
-[63]  failed with message: 'Message from section two'
+failed explicitly with message:
+  Message from section two
 
+Message from section one
+----------------------------------------------------------------
+Test case: './succeeding/message/sections/stdout'
 ----------------------------------------------------------------
-Summary for section 'two':
-1 assertion - failed
-
 ----------------------------------------------------------------
-Summary for test case './failing/message/sections':
-1 test case - failed (2 assertions - both failed)
+Section: 'one'
+----------------------------------------------------------------
 
-Message from section one
--- Test case: './succeeding/message/sections/stdout' -----------
--- Section: 'one' ----------------------------------------------
 
 No assertions in section, 'one'
 
+Message from section two
+----------------------------------------------------------------
+Section: 'two'
 ----------------------------------------------------------------
-Summary for section 'one':
-1 assertion - failed
 
-Message from section two
--- Section: 'two' ----------------------------------------------
 
 No assertions in section, 'two'
 
 ----------------------------------------------------------------
-Summary for section 'two':
-1 assertion - failed
-
+Test case: './mixed/message/scoped'
 ----------------------------------------------------------------
-Summary for test case './succeeding/message/sections/stdout':
-1 test case - failed (2 assertions - both failed)
 
--- Test case: './mixed/message/scoped' -------------------------
 MessageTests.cpp:86:
-[86]  i < 10
-succeeded
-for:  0 < 10
+  REQUIRE( i < 10 )
+passed with expansion:
+  0 < 10
 
-[86]  i < 10
-succeeded
-for:  1 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  1 < 10
 
-[86]  i < 10
-succeeded
-for:  2 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  2 < 10
 
-[86]  i < 10
-succeeded
-for:  3 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  3 < 10
 
-[86]  i < 10
-succeeded
-for:  4 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  4 < 10
 
-[86]  i < 10
-succeeded
-for:  5 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  5 < 10
 
-[86]  i < 10
-succeeded
-for:  6 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  6 < 10
 
-[86]  i < 10
-succeeded
-for:  7 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  7 < 10
 
-[86]  i < 10
-succeeded
-for:  8 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  8 < 10
 
-[86]  i < 10
-succeeded
-for:  9 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+passed with expansion:
+  9 < 10
 
-[86]  i < 10
-succeeded[info: current counter 10]
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+info:
+  current counter 10
 
-[86]  i < 10
-succeeded[info: i := 10]
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+info:
+  i := 10
 
-[86]  i < 10
-failed
-for:  10 < 10
+MessageTests.cpp:86:
+  REQUIRE( i < 10 )
+failed with expansion:
+  10 < 10
 
 ----------------------------------------------------------------
-Summary for test case './mixed/message/scoped':
-1 test case - failed (11 assertions - 1 failed)
+Test case: './succeeding/nofail'
+----------------------------------------------------------------
 
--- Test case: './succeeding/nofail' ----------------------------
 MessageTests.cpp:92:
-[92]  1 == 2
+  CHECK_NOFAIL( 1 == 2 )
 failed - but was ok
 
 
 No assertions in test case, './succeeding/nofail'
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/nofail':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/Misc/Sections'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's1'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Misc/Sections' ---------------------
--- Section: 's1' -----------------------------------------------
 MiscTests.cpp:25:
-[25]  a != b
-succeeded
-for:  1 != 2
+  REQUIRE( a != b )
+passed with expansion:
+  1 != 2
 
-[26]  b != a
-succeeded
-for:  2 != 1
+MiscTests.cpp:26:
+  REQUIRE( b != a )
+passed with expansion:
+  2 != 1
 
 ----------------------------------------------------------------
-Summary for section 's1':
-All 2 assertions passed
+Section: 's2'
+----------------------------------------------------------------
 
--- Section: 's2' -----------------------------------------------
 MiscTests.cpp:31:
-[31]  a != b
-succeeded
-for:  1 != 2
+  REQUIRE( a != b )
+passed with expansion:
+  1 != 2
 
 ----------------------------------------------------------------
-Summary for section 's2':
-1 assertion passed
-
+Test case: './succeeding/Misc/Sections/nested'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's1'
 ----------------------------------------------------------------
-Summary for test case './succeeding/Misc/Sections':
-All tests passed (3 assertions in 1 test case)
 
--- Test case: './succeeding/Misc/Sections/nested' --------------
--- Section: 's1' -----------------------------------------------
 MiscTests.cpp:42:
-[42]  a != b
-succeeded
-for:  1 != 2
+  REQUIRE( a != b )
+passed with expansion:
+  1 != 2
 
-[43]  b != a
-succeeded
-for:  2 != 1
-
--- Section: 's2' -----------------------------------------------
-[47]  a != b
-succeeded
-for:  1 != 2
+MiscTests.cpp:43:
+  REQUIRE( b != a )
+passed with expansion:
+  2 != 1
 
 ----------------------------------------------------------------
-Summary for section 's2':
-1 assertion passed
-
+Section: 's2'
 ----------------------------------------------------------------
-Summary for section 's1':
-All 3 assertions passed
 
+MiscTests.cpp:47:
+  REQUIRE( a != b )
+passed with expansion:
+  1 != 2
+
+----------------------------------------------------------------
+Test case: './mixed/Misc/Sections/nested2'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's1'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's2'
 ----------------------------------------------------------------
-Summary for test case './succeeding/Misc/Sections/nested':
-All tests passed (3 assertions in 1 test case)
 
--- Test case: './mixed/Misc/Sections/nested2' ------------------
--- Section: 's1' -----------------------------------------------
--- Section: 's2' -----------------------------------------------
 MiscTests.cpp:61:
-[61]  a == b
-failed
-for:  1 == 2
+  REQUIRE( a == b )
+failed with expansion:
+  1 == 2
 
 ----------------------------------------------------------------
-Summary for section 's2':
-1 assertion - failed
-
+Section: 's1'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's3'
 ----------------------------------------------------------------
-Summary for section 's1':
-1 assertion - failed
 
--- Section: 's1' -----------------------------------------------
--- Section: 's3' -----------------------------------------------
 MiscTests.cpp:66:
-[66]  a != b
-succeeded
-for:  1 != 2
+  REQUIRE( a != b )
+passed with expansion:
+  1 != 2
 
 ----------------------------------------------------------------
-Summary for section 's3':
-1 assertion passed
-
+Section: 's1'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's4'
 ----------------------------------------------------------------
-Summary for section 's1':
-1 assertion passed
 
--- Section: 's1' -----------------------------------------------
--- Section: 's4' -----------------------------------------------
 MiscTests.cpp:70:
-[70]  a < b
-succeeded
-for:  1 < 2
+  REQUIRE( a < b )
+passed with expansion:
+  1 < 2
 
 ----------------------------------------------------------------
-Summary for section 's4':
-1 assertion passed
-
+Test case: './Sections/nested/a/b'
 ----------------------------------------------------------------
-Summary for section 's1':
-1 assertion passed
-
 ----------------------------------------------------------------
-Summary for test case './mixed/Misc/Sections/nested2':
-1 test case - failed (3 assertions - 1 failed)
+Section: 'c'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'd (leaf)'
+----------------------------------------------------------------
 
--- Test case: './Sections/nested/a/b' --------------------------
--- Section: 'c' ------------------------------------------------
--- Section: 'd (leaf)' -----------------------------------------
 
 No assertions in section, 'd (leaf)'
 
 ----------------------------------------------------------------
-Summary for section 'd (leaf)':
-1 assertion - failed
-
+Section: 'c'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'e (leaf)'
 ----------------------------------------------------------------
-Summary for section 'c':
-1 assertion - failed
 
--- Section: 'c' ------------------------------------------------
--- Section: 'e (leaf)' -----------------------------------------
 
 No assertions in section, 'e (leaf)'
 
 ----------------------------------------------------------------
-Summary for section 'e (leaf)':
-1 assertion - failed
-
+Section: 'f (leaf)'
 ----------------------------------------------------------------
-Summary for section 'c':
-1 assertion - failed
 
--- Section: 'f (leaf)' -----------------------------------------
 
 No assertions in section, 'f (leaf)'
 
 ----------------------------------------------------------------
-Summary for section 'f (leaf)':
-1 assertion - failed
-
+Test case: './mixed/Misc/Sections/loops'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 's1'
 ----------------------------------------------------------------
-Summary for test case './Sections/nested/a/b':
-1 test case - failed (3 assertions - all failed)
 
--- Test case: './mixed/Misc/Sections/loops' --------------------
--- Section: 's1' -----------------------------------------------
 MiscTests.cpp:103:
-[103]  b > a
-failed
-for:   0 > 1
+  CHECK( b > a )
+failed with expansion:
+  0 > 1
 
 ----------------------------------------------------------------
-Summary for section 's1':
-1 assertion - failed
-
+Test case: './mixed/Misc/loops'
 ----------------------------------------------------------------
-Summary for test case './mixed/Misc/Sections/loops':
-1 test case - failed (1 assertion - failed)
 
--- Test case: './mixed/Misc/loops' -----------------------------
 MiscTests.cpp:114:
-[114]  [info: Testing if fib[0] (1) is even]
-
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+info:
+  Testing if fib[0] (1) is even
 
-[114]  [info: Testing if fib[1] (1) is even]
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+MiscTests.cpp:114:
+info:
+  Testing if fib[1] (1) is even
 
-[115]  ( fib[i] % 2 ) == 0
-succeeded
-for:   0 == 0
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
-[114]  [info: Testing if fib[2] (2) is even]
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+passed with expansion:
+  0 == 0
 
-[114]  [info: Testing if fib[3] (3) is even]
+MiscTests.cpp:114:
+info:
+  Testing if fib[2] (2) is even
 
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+MiscTests.cpp:114:
+info:
+  Testing if fib[3] (3) is even
 
-[114]  [info: Testing if fib[4] (5) is even]
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+MiscTests.cpp:114:
+info:
+  Testing if fib[4] (5) is even
 
-[115]  ( fib[i] % 2 ) == 0
-succeeded
-for:   0 == 0
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
-[114]  [info: Testing if fib[5] (8) is even]
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+passed with expansion:
+  0 == 0
 
-[114]  [info: Testing if fib[6] (13) is even]
+MiscTests.cpp:114:
+info:
+  Testing if fib[5] (8) is even
 
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+MiscTests.cpp:114:
+info:
+  Testing if fib[6] (13) is even
 
-[114]  [info: Testing if fib[7] (21) is even]
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
-[115]  ( fib[i] % 2 ) == 0
-failed
-for:   1 == 0
+MiscTests.cpp:114:
+info:
+  Testing if fib[7] (21) is even
 
-----------------------------------------------------------------
-Summary for test case './mixed/Misc/loops':
-1 test case - failed (8 assertions - 6 failed)
+MiscTests.cpp:115:
+  CHECK( ( fib[i] % 2 ) == 0 )
+failed with expansion:
+  1 == 0
 
 Some information
 An error
--- Test case: './succeeding/Misc/stdout,stderr' ----------------
+----------------------------------------------------------------
+Test case: './succeeding/Misc/stdout,stderr'
+----------------------------------------------------------------
+
 
 No assertions in test case, './succeeding/Misc/stdout,stderr'
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Misc/stdout,stderr':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/Misc/null strings'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Misc/null strings' -----------------
 MiscTests.cpp:133:
-[133]  makeString( false ) != static_cast<char*>(__null)
-succeeded
-for:   "valid string" != {null string}
+  REQUIRE( makeString( false ) != static_cast<char*>(__null) )
+passed with expansion:
+  "valid string" != {null string}
 
-[134]  makeString( true ) == static_cast<char*>(__null)
-succeeded
-for:   {null string} == {null string}
+MiscTests.cpp:134:
+  REQUIRE( makeString( true ) == static_cast<char*>(__null) )
+passed with expansion:
+  {null string} == {null string}
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Misc/null strings':
-All tests passed (2 assertions in 1 test case)
+Test case: './failing/info'
+----------------------------------------------------------------
 
--- Test case: './failing/info' ---------------------------------
 MiscTests.cpp:139:
-[139]  [info: hi]
+info:
+  hi
 
-[141]  [info: i := 7]
+MiscTests.cpp:141:
+info:
+  i := 7
 
-[142]  false
+MiscTests.cpp:142:
+  REQUIRE( false )
 failed
 
 ----------------------------------------------------------------
-Summary for test case './failing/info':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/checkedif'
+----------------------------------------------------------------
 
--- Test case: './succeeding/checkedif' -------------------------
 MiscTests.cpp:147:
-[147]  flag
-succeeded
-for:   true
+  CHECKED_IF( flag )
+passed with expansion:
+  true
 
-[155]  testCheckedIf( true )
-succeeded
-for:   true
+MiscTests.cpp:155:
+  REQUIRE( testCheckedIf( true ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/checkedif':
-All tests passed (2 assertions in 1 test case)
+Test case: './failing/checkedif'
+----------------------------------------------------------------
 
--- Test case: './failing/checkedif' ----------------------------
 MiscTests.cpp:147:
-[147]  flag
-failed
-for:   false
+  CHECKED_IF( flag )
+failed with expansion:
+  false
 
-[160]  testCheckedIf( false )
-failed
-for:   false
+MiscTests.cpp:160:
+  REQUIRE( testCheckedIf( false ) )
+failed with expansion:
+  false
 
 ----------------------------------------------------------------
-Summary for test case './failing/checkedif':
-1 test case - failed (2 assertions - both failed)
+Test case: './succeeding/checkedelse'
+----------------------------------------------------------------
 
--- Test case: './succeeding/checkedelse' -----------------------
 MiscTests.cpp:165:
-[165]  flag
-succeeded
-for:   true
+  CHECKED_ELSE( flag )
+passed with expansion:
+  true
 
-[173]  testCheckedElse( true )
-succeeded
-for:   true
+MiscTests.cpp:173:
+  REQUIRE( testCheckedElse( true ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/checkedelse':
-All tests passed (2 assertions in 1 test case)
+Test case: './failing/checkedelse'
+----------------------------------------------------------------
 
--- Test case: './failing/checkedelse' --------------------------
 MiscTests.cpp:165:
-[165]  flag
-failed
-for:   false
+  CHECKED_ELSE( flag )
+failed with expansion:
+  false
 
-[178]  testCheckedElse( false )
-failed
-for:   false
+MiscTests.cpp:178:
+  REQUIRE( testCheckedElse( false ) )
+failed with expansion:
+  false
 
 ----------------------------------------------------------------
-Summary for test case './failing/checkedelse':
-1 test case - failed (2 assertions - both failed)
+Test case: './misc/xmlentitycheck'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'embedded xml'
+----------------------------------------------------------------
 
--- Test case: './misc/xmlentitycheck' --------------------------
--- Section: 'embedded xml' -------------------------------------
 
 No assertions in section, 'embedded xml'
 
 ----------------------------------------------------------------
-Summary for section 'embedded xml':
-1 assertion - failed
+Section: 'encoded chars'
+----------------------------------------------------------------
 
--- Section: 'encoded chars' ------------------------------------
 
 No assertions in section, 'encoded chars'
 
 ----------------------------------------------------------------
-Summary for section 'encoded chars':
-1 assertion - failed
-
+Test case: './manual/onechar'
 ----------------------------------------------------------------
-Summary for test case './misc/xmlentitycheck':
-1 test case - failed (2 assertions - both failed)
 
--- Test case: './manual/onechar' -------------------------------
 MiscTests.cpp:195:
-[195]  [info: 3]
+info:
+  3
 
-[196]  false
+MiscTests.cpp:196:
+  REQUIRE( false )
 failed
 
 ----------------------------------------------------------------
-Summary for test case './manual/onechar':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/atomic if'
+----------------------------------------------------------------
 
--- Test case: './succeeding/atomic if' -------------------------
 MiscTests.cpp:206:
-[206]  x == 0
-succeeded
-for:   0 == 0
+  REQUIRE( x == 0 )
+passed with expansion:
+  0 == 0
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/atomic if':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/matchers'
+----------------------------------------------------------------
 
--- Test case: './succeeding/matchers' --------------------------
 MiscTests.cpp:216:
-[216]  testStringForMatching() Contains( "string" )
-succeeded
-for:   "this string contains 'abc' as a substring" contains: "string"
+  REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" contains: "string"
 
-[217]  testStringForMatching() Contains( "abc" )
-succeeded
-for:   "this string contains 'abc' as a substring" contains: "abc"
+MiscTests.cpp:217:
+  CHECK_THAT( testStringForMatching() Contains( "abc" ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" contains: "abc"
 
-[219]  testStringForMatching() StartsWith( "this" )
-succeeded
-for:   "this string contains 'abc' as a substring" starts with: "this"
+MiscTests.cpp:219:
+  CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" starts with: "this"
 
-[220]  testStringForMatching() EndsWith( "substring" )
-succeeded
-for:   "this string contains 'abc' as a substring" ends with: "substring"
+MiscTests.cpp:220:
+  CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" ends with: "substring"
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/matchers':
-All tests passed (4 assertions in 1 test case)
+Test case: './failing/matchers/Contains'
+----------------------------------------------------------------
 
--- Test case: './failing/matchers/Contains' --------------------
 MiscTests.cpp:225:
-[225]  testStringForMatching() Contains( "not there" )
-failed
-for:   "this string contains 'abc' as a substring" contains: "not there"
+  CHECK_THAT( testStringForMatching() Contains( "not there" ) )
+failed with expansion:
+  "this string contains 'abc' as a substring" contains: "not there"
 
 ----------------------------------------------------------------
-Summary for test case './failing/matchers/Contains':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/matchers/StartsWith'
+----------------------------------------------------------------
 
--- Test case: './failing/matchers/StartsWith' ------------------
 MiscTests.cpp:230:
-[230]  testStringForMatching() StartsWith( "string" )
-failed
-for:   "this string contains 'abc' as a substring" starts with: "string"
+  CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
+failed with expansion:
+  "this string contains 'abc' as a substring" starts with: "string"
 
 ----------------------------------------------------------------
-Summary for test case './failing/matchers/StartsWith':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/matchers/EndsWith'
+----------------------------------------------------------------
 
--- Test case: './failing/matchers/EndsWith' --------------------
 MiscTests.cpp:235:
-[235]  testStringForMatching() EndsWith( "this" )
-failed
-for:   "this string contains 'abc' as a substring" ends with: "this"
+  CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
+failed with expansion:
+  "this string contains 'abc' as a substring" ends with: "this"
 
 ----------------------------------------------------------------
-Summary for test case './failing/matchers/EndsWith':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/matchers/Equals'
+----------------------------------------------------------------
 
--- Test case: './failing/matchers/Equals' ----------------------
 MiscTests.cpp:240:
-[240]  testStringForMatching() Equals( "something else" )
-failed
-for:   "this string contains 'abc' as a substring" equals: "something else"
+  CHECK_THAT( testStringForMatching() Equals( "something else" ) )
+failed with expansion:
+  "this string contains 'abc' as a substring" equals: "something else"
 
 ----------------------------------------------------------------
-Summary for test case './failing/matchers/Equals':
-1 test case - failed (1 assertion - failed)
+Test case: '/succeeding/matchers/AllOf'
+----------------------------------------------------------------
 
--- Test case: '/succeeding/matchers/AllOf' ---------------------
 MiscTests.cpp:248:
-[248]  testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
-succeeded
-for:   "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
+  CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string"
+  and contains: "abc" )
 
 ----------------------------------------------------------------
-Summary for test case '/succeeding/matchers/AllOf':
-All tests passed (1 assertion in 1 test case)
+Test case: '/succeeding/matchers/AnyOf'
+----------------------------------------------------------------
 
--- Test case: '/succeeding/matchers/AnyOf' ---------------------
 MiscTests.cpp:252:
-[252]  testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
-succeeded
-for:   "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
+  CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string" or
+  contains: "not there" )
 
-[253]  testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
-succeeded
-for:   "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
+MiscTests.cpp:253:
+  CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" ( contains: "not there"
+  or contains: "string" )
 
 ----------------------------------------------------------------
-Summary for test case '/succeeding/matchers/AnyOf':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/matchers/Equals'
+----------------------------------------------------------------
 
--- Test case: './succeeding/matchers/Equals' -------------------
 MiscTests.cpp:258:
-[258]  testStringForMatching() Equals( "this string contains 'abc' as a substring" )
-succeeded
-for:   "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
+  CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) )
+passed with expansion:
+  "this string contains 'abc' as a substring" equals: "this string
+  contains 'abc' as a substring"
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/matchers/Equals':
-All tests passed (1 assertion in 1 test case)
+Test case: 'example/factorial'
+----------------------------------------------------------------
 
--- Test case: 'example/factorial' ------------------------------
 MiscTests.cpp:269:
-[269]  Factorial(0) == 1
-succeeded
-for:   1 == 1
+  REQUIRE( Factorial(0) == 1 )
+passed with expansion:
+  1 == 1
 
-[270]  Factorial(1) == 1
-succeeded
-for:   1 == 1
+MiscTests.cpp:270:
+  REQUIRE( Factorial(1) == 1 )
+passed with expansion:
+  1 == 1
 
-[271]  Factorial(2) == 2
-succeeded
-for:   2 == 2
+MiscTests.cpp:271:
+  REQUIRE( Factorial(2) == 2 )
+passed with expansion:
+  2 == 2
 
-[272]  Factorial(3) == 6
-succeeded
-for:   6 == 6
+MiscTests.cpp:272:
+  REQUIRE( Factorial(3) == 6 )
+passed with expansion:
+  6 == 6
 
-[273]  Factorial(10) == 3628800
-succeeded
-for:   0x<hex digits> == 3628800
+MiscTests.cpp:273:
+  REQUIRE( Factorial(10) == 3628800 )
+passed with expansion:
+  0x<hex digits> == 3628800
 
 ----------------------------------------------------------------
-Summary for test case 'example/factorial':
-All tests passed (5 assertions in 1 test case)
+Test case: 'empty'
+----------------------------------------------------------------
 
--- Test case: 'empty' ------------------------------------------
 
 No assertions in test case, 'empty'
 
 ----------------------------------------------------------------
-Summary for test case 'empty':
-1 test case - failed (1 assertion - failed)
+Test case: 'Nice descriptive name'
+----------------------------------------------------------------
 
--- Test case: 'Nice descriptive name' --------------------------
 MiscTests.cpp:282:
-[282]  [warning: This one ran]
+warning:
+  This one ran
 
 
 No assertions in test case, 'Nice descriptive name'
 
 ----------------------------------------------------------------
-Summary for test case 'Nice descriptive name':
-1 test case - failed (1 assertion - failed)
+Test case: 'first tag'
+----------------------------------------------------------------
 
--- Test case: 'first tag' --------------------------------------
 
 No assertions in test case, 'first tag'
 
 ----------------------------------------------------------------
-Summary for test case 'first tag':
-1 test case - failed (1 assertion - failed)
+Test case: 'second tag'
+----------------------------------------------------------------
 
--- Test case: 'second tag' -------------------------------------
 
 No assertions in test case, 'second tag'
 
 ----------------------------------------------------------------
-Summary for test case 'second tag':
-1 test case - failed (1 assertion - failed)
+Test case: 'selftest/main'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'selftest/expected result'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'selftest/expected result/failing tests'
+----------------------------------------------------------------
 
--- Test case: 'selftest/main' ----------------------------------
--- Section: 'selftest/expected result' -------------------------
--- Section: 'selftest/expected result/failing tests' -----------
-catch_self_test.hpp:106:
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
-[106]   succeeded
-[with message: Tests failed, as expected]
+catch_self_test.hpp:114:
+passed with message:
+  Tests failed, as expected
 
 ----------------------------------------------------------------
-Summary for section 'selftest/expected result/failing tests':
-All 25 assertions passed
-
+Section: 'selftest/expected result'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'selftest/expected result/succeeding tests'
 ----------------------------------------------------------------
-Summary for section 'selftest/expected result':
-All 25 assertions passed
 
--- Section: 'selftest/expected result' -------------------------
--- Section: 'selftest/expected result/succeeding tests' --------
-catch_self_test.hpp:95:
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
 Message from section one
 Message from section two
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
 Some information
 An error
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
-
-[95]   succeeded
-[with message: Tests passed, as expected]
-
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-[95]   succeeded
-[with message: Tests passed, as expected]
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-----------------------------------------------------------------
-Summary for section 'selftest/expected result/succeeding tests':
-All 43 assertions passed
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
-----------------------------------------------------------------
-Summary for section 'selftest/expected result':
-All 43 assertions passed
+catch_self_test.hpp:103:
+passed with message:
+  Tests passed, as expected
 
 Message from section one
 Message from section two
 Some information
 An error
--- Section: 'selftest/test counts' -----------------------------
--- Section: 'selftest/test counts/succeeding tests' ------------
+----------------------------------------------------------------
+Section: 'selftest/test counts'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'selftest/test counts/succeeding tests'
+----------------------------------------------------------------
+
 TestMain.cpp:40:
-[40]  totals.assertions.passed == 291
-succeeded
-for:  291 == 291
+  CHECK( totals.assertions.passed == 291 )
+failed with expansion:
+  293 == 291
 
-[41]  totals.assertions.failed == 0
-succeeded
-for:  0 == 0
+TestMain.cpp:41:
+  CHECK( totals.assertions.failed == 0 )
+passed with expansion:
+  0 == 0
 
 ----------------------------------------------------------------
-Summary for section 'selftest/test counts/succeeding tests':
-All 2 assertions passed
-
+Section: 'selftest/test counts'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'selftest/test counts/failing tests'
 ----------------------------------------------------------------
-Summary for section 'selftest/test counts':
-All 2 assertions passed
 
--- Section: 'selftest/test counts' -----------------------------
--- Section: 'selftest/test counts/failing tests' ---------------
 TestMain.cpp:47:
-[47]  totals.assertions.passed == 1
-succeeded
-for:  1 == 1
-
-[48]  totals.assertions.failed == 72
-succeeded
-for:  72 == 72
+  CHECK( totals.assertions.passed == 1 )
+passed with expansion:
+  1 == 1
 
-----------------------------------------------------------------
-Summary for section 'selftest/test counts/failing tests':
-All 2 assertions passed
+TestMain.cpp:48:
+  CHECK( totals.assertions.failed == 72 )
+passed with expansion:
+  72 == 72
 
 ----------------------------------------------------------------
-Summary for section 'selftest/test counts':
-All 2 assertions passed
-
+Test case: 'meta/Misc/Sections'
 ----------------------------------------------------------------
-Summary for test case 'selftest/main':
-All tests passed (72 assertions in 1 test case)
 
--- Test case: 'meta/Misc/Sections' -----------------------------
 TestMain.cpp:57:
-[57]  totals.assertions.passed == 2
-succeeded
-for:  2 == 2
+  CHECK( totals.assertions.passed == 2 )
+passed with expansion:
+  2 == 2
 
-[58]  totals.assertions.failed == 1
-succeeded
-for:  1 == 1
+TestMain.cpp:58:
+  CHECK( totals.assertions.failed == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for test case 'meta/Misc/Sections':
-All tests passed (2 assertions in 1 test case)
+Test case: 'selftest/parser/2'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'default'
+----------------------------------------------------------------
 
--- Test case: 'selftest/parser/2' ------------------------------
--- Section: 'default' ------------------------------------------
 TestMain.cpp:97:
-[97]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[99]  config.shouldDebugBreak == false
-succeeded
-for:  false == false
+TestMain.cpp:99:
+  CHECK( config.shouldDebugBreak == false )
+passed with expansion:
+  false == false
 
-[100]  config.cutoff == -1
-succeeded
-for:   -1 == -1
+TestMain.cpp:100:
+  CHECK( config.cutoff == -1 )
+passed with expansion:
+  -1 == -1
 
-[101]  config.allowThrows == true
-succeeded
-for:   true == true
+TestMain.cpp:101:
+  CHECK( config.allowThrows == true )
+passed with expansion:
+  true == true
 
-[102]  config.reporter.empty()
-succeeded
-for:   true
+TestMain.cpp:102:
+  CHECK( config.reporter.empty() )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section 'default':
-All 5 assertions passed
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-t/1'
+----------------------------------------------------------------
 
--- Section: 'test lists' ---------------------------------------
--- Section: '-t/1' ---------------------------------------------
 TestMain.cpp:108:
-[108]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[110]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:110:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[111]  config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:111:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+passed with expansion:
+  false == false
 
-[112]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) )
-succeeded
-for:   true
+TestMain.cpp:112:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '-t/1':
-All 4 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-t/exclude:1'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 4 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '-t/exclude:1' -------------------------------------
 TestMain.cpp:116:
-[116]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[118]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:118:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[119]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:119:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
+passed with expansion:
+  false == false
 
-[120]  config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) )
-succeeded
-for:   true
+TestMain.cpp:120:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '-t/exclude:1':
-All 4 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--test/1'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 4 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '--test/1' -----------------------------------------
 TestMain.cpp:125:
-[125]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[127]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:127:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[128]  config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:128:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+passed with expansion:
+  false == false
 
-[129]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) )
-succeeded
-for:   true
+TestMain.cpp:129:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '--test/1':
-All 4 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--test/exclude:1'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 4 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '--test/exclude:1' ---------------------------------
 TestMain.cpp:134:
-[134]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[136]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:136:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[137]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:137:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
+passed with expansion:
+  false == false
 
-[138]  config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) )
-succeeded
-for:   true
+TestMain.cpp:138:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '--test/exclude:1':
-All 4 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--test/exclude:2'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 4 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '--test/exclude:2' ---------------------------------
 TestMain.cpp:143:
-[143]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[145]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:145:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[146]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:146:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
+passed with expansion:
+  false == false
 
-[147]  config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) )
-succeeded
-for:   true
+TestMain.cpp:147:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '--test/exclude:2':
-All 4 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-t/2'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 4 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '-t/2' ---------------------------------------------
 TestMain.cpp:152:
-[152]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[154]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:154:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[155]  config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:155:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+passed with expansion:
+  false == false
 
-[156]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) )
-succeeded
-for:   true
+TestMain.cpp:156:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
+passed with expansion:
+  true
 
-[157]  config.filters[0].shouldInclude( fakeTestCase( "test2" ) )
-succeeded
-for:   true
+TestMain.cpp:157:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '-t/2':
-All 5 assertions passed
-
+Section: 'test lists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-t/0'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-All 5 assertions passed
 
--- Section: 'test lists' ---------------------------------------
--- Section: '-t/0' ---------------------------------------------
 TestMain.cpp:162:
-[162]  parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" )
-succeeded
-for:   "Error while parsing arguments. Expected at least 1 argument." contains: "at least 1"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) )
+passed with expansion:
+  "Error while parsing arguments. Expected at least 1 argument."
+  contains: "at least 1"
 
 ----------------------------------------------------------------
-Summary for section '-t/0':
-1 assertion passed
-
+Section: 'reporter'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-r/console'
 ----------------------------------------------------------------
-Summary for section 'test lists':
-1 assertion passed
 
--- Section: 'reporter' -----------------------------------------
--- Section: '-r/console' ---------------------------------------
 TestMain.cpp:169:
-[169]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[171]  config.reporter == "console"
-succeeded
-for:   "console" == "console"
+TestMain.cpp:171:
+  REQUIRE( config.reporter == "console" )
+passed with expansion:
+  "console" == "console"
 
 ----------------------------------------------------------------
-Summary for section '-r/console':
-All 2 assertions passed
-
+Section: 'reporter'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-r/xml'
 ----------------------------------------------------------------
-Summary for section 'reporter':
-All 2 assertions passed
 
--- Section: 'reporter' -----------------------------------------
--- Section: '-r/xml' -------------------------------------------
 TestMain.cpp:175:
-[175]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[177]  config.reporter == "xml"
-succeeded
-for:   "xml" == "xml"
+TestMain.cpp:177:
+  REQUIRE( config.reporter == "xml" )
+passed with expansion:
+  "xml" == "xml"
 
 ----------------------------------------------------------------
-Summary for section '-r/xml':
-All 2 assertions passed
-
+Section: 'reporter'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--reporter/junit'
 ----------------------------------------------------------------
-Summary for section 'reporter':
-All 2 assertions passed
 
--- Section: 'reporter' -----------------------------------------
--- Section: '--reporter/junit' ---------------------------------
 TestMain.cpp:181:
-[181]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[183]  config.reporter == "junit"
-succeeded
-for:   "junit" == "junit"
+TestMain.cpp:183:
+  REQUIRE( config.reporter == "junit" )
+passed with expansion:
+  "junit" == "junit"
 
 ----------------------------------------------------------------
-Summary for section '--reporter/junit':
-All 2 assertions passed
-
+Section: 'reporter'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-r/error'
 ----------------------------------------------------------------
-Summary for section 'reporter':
-All 2 assertions passed
 
--- Section: 'reporter' -----------------------------------------
--- Section: '-r/error' -----------------------------------------
 TestMain.cpp:187:
-[187]  parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" )
-succeeded
-for:   "Error while parsing arguments. Expected 1 argument. Arguments were: one two" contains: "1 argument"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) )
+passed with expansion:
+  "Error while parsing arguments. Expected 1 argument. Arguments
+  were: one two" contains: "1 argument"
 
 ----------------------------------------------------------------
-Summary for section '-r/error':
-1 assertion passed
-
+Section: 'debugger'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-b'
 ----------------------------------------------------------------
-Summary for section 'reporter':
-1 assertion passed
 
--- Section: 'debugger' -----------------------------------------
--- Section: '-b' -----------------------------------------------
 TestMain.cpp:194:
-[194]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[196]  config.shouldDebugBreak == true
-succeeded
-for:   true == true
+TestMain.cpp:196:
+  REQUIRE( config.shouldDebugBreak == true )
+passed with expansion:
+  true == true
 
 ----------------------------------------------------------------
-Summary for section '-b':
-All 2 assertions passed
-
+Section: 'debugger'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--break'
 ----------------------------------------------------------------
-Summary for section 'debugger':
-All 2 assertions passed
 
--- Section: 'debugger' -----------------------------------------
--- Section: '--break' ------------------------------------------
 TestMain.cpp:200:
-[200]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[202]  config.shouldDebugBreak
-succeeded
-for:   true
+TestMain.cpp:202:
+  REQUIRE( config.shouldDebugBreak )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '--break':
-All 2 assertions passed
-
+Section: 'debugger'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-b'
 ----------------------------------------------------------------
-Summary for section 'debugger':
-All 2 assertions passed
 
--- Section: 'debugger' -----------------------------------------
--- Section: '-b' -----------------------------------------------
 TestMain.cpp:206:
-[206]  parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" )
-succeeded
-for:   "Error while parsing arguments. Expected 0 arguments. Arguments were: unexpected" contains: "0 arguments"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) )
+passed with expansion:
+  "Error while parsing arguments. Expected 0 arguments. Arguments
+  were: unexpected" contains: "0 arguments"
 
 ----------------------------------------------------------------
-Summary for section '-b':
-1 assertion passed
-
+Section: 'abort'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a'
 ----------------------------------------------------------------
-Summary for section 'debugger':
-1 assertion passed
 
--- Section: 'abort' --------------------------------------------
--- Section: '-a' -----------------------------------------------
 TestMain.cpp:213:
-[213]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[215]  config.cutoff == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:215:
+  REQUIRE( config.cutoff == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for section '-a':
-All 2 assertions passed
-
+Section: 'abort'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a/2'
 ----------------------------------------------------------------
-Summary for section 'abort':
-All 2 assertions passed
 
--- Section: 'abort' --------------------------------------------
--- Section: '-a/2' ---------------------------------------------
 TestMain.cpp:219:
-[219]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[221]  config.cutoff == 2
-succeeded
-for:   2 == 2
+TestMain.cpp:221:
+  REQUIRE( config.cutoff == 2 )
+passed with expansion:
+  2 == 2
 
 ----------------------------------------------------------------
-Summary for section '-a/2':
-All 2 assertions passed
-
+Section: 'abort'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a/error/0'
 ----------------------------------------------------------------
-Summary for section 'abort':
-All 2 assertions passed
 
--- Section: 'abort' --------------------------------------------
--- Section: '-a/error/0' ---------------------------------------
 TestMain.cpp:225:
-[225]  parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" )
-succeeded
-for:   "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: 0" contains: "greater than zero"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
+passed with expansion:
+  "Error while parsing arguments. threshold must be a number greater
+  than zero. Arguments were: 0" contains: "greater than zero"
 
 ----------------------------------------------------------------
-Summary for section '-a/error/0':
-1 assertion passed
-
+Section: 'abort'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a/error/non numeric'
 ----------------------------------------------------------------
-Summary for section 'abort':
-1 assertion passed
 
--- Section: 'abort' --------------------------------------------
--- Section: '-a/error/non numeric' -----------------------------
 TestMain.cpp:229:
-[229]  parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" )
-succeeded
-for:   "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: oops" contains: "greater than zero"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
+passed with expansion:
+  "Error while parsing arguments. threshold must be a number greater
+  than zero. Arguments were: oops" contains: "greater than zero"
 
 ----------------------------------------------------------------
-Summary for section '-a/error/non numeric':
-1 assertion passed
-
+Section: 'abort'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a/error/two args'
 ----------------------------------------------------------------
-Summary for section 'abort':
-1 assertion passed
 
--- Section: 'abort' --------------------------------------------
--- Section: '-a/error/two args' --------------------------------
 TestMain.cpp:233:
-[233]  parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" )
-succeeded
-for:   "Error while parsing arguments. Expected between 0 and 1 argument. Arguments were: 1 2" contains: "0 and 1 argument"
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) )
+passed with expansion:
+  "Error while parsing arguments. Expected between 0 and 1 argument.
+  Arguments were: 1 2" contains: "0 and 1 argument"
 
 ----------------------------------------------------------------
-Summary for section '-a/error/two args':
-1 assertion passed
-
+Section: 'nothrow'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-nt'
 ----------------------------------------------------------------
-Summary for section 'abort':
-1 assertion passed
 
--- Section: 'nothrow' ------------------------------------------
--- Section: '-nt' ----------------------------------------------
 TestMain.cpp:240:
-[240]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[242]  config.allowThrows == false
-succeeded
-for:   false == false
+TestMain.cpp:242:
+  REQUIRE( config.allowThrows == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section '-nt':
-All 2 assertions passed
-
+Section: 'nothrow'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--nothrow'
 ----------------------------------------------------------------
-Summary for section 'nothrow':
-All 2 assertions passed
 
--- Section: 'nothrow' ------------------------------------------
--- Section: '--nothrow' ----------------------------------------
 TestMain.cpp:246:
-[246]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[248]  config.allowThrows == false
-succeeded
-for:   false == false
+TestMain.cpp:248:
+  REQUIRE( config.allowThrows == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section '--nothrow':
-All 2 assertions passed
-
+Section: 'streams'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-o filename'
 ----------------------------------------------------------------
-Summary for section 'nothrow':
-All 2 assertions passed
 
--- Section: 'streams' ------------------------------------------
--- Section: '-o filename' --------------------------------------
 TestMain.cpp:255:
-[255]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[257]  config.outputFilename == "filename.ext"
-succeeded
-for:   "filename.ext" == "filename.ext"
+TestMain.cpp:257:
+  REQUIRE( config.outputFilename == "filename.ext" )
+passed with expansion:
+  "filename.ext" == "filename.ext"
 
-[258]  config.stream.empty()
-succeeded
-for:   true
+TestMain.cpp:258:
+  REQUIRE( config.stream.empty() )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '-o filename':
-All 3 assertions passed
-
+Section: 'streams'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-o %stdout'
 ----------------------------------------------------------------
-Summary for section 'streams':
-All 3 assertions passed
 
--- Section: 'streams' ------------------------------------------
--- Section: '-o %stdout' ---------------------------------------
 TestMain.cpp:262:
-[262]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[264]  config.stream == "stdout"
-succeeded
-for:   "stdout" == "stdout"
+TestMain.cpp:264:
+  REQUIRE( config.stream == "stdout" )
+passed with expansion:
+  "stdout" == "stdout"
 
-[265]  config.outputFilename.empty()
-succeeded
-for:   true
+TestMain.cpp:265:
+  REQUIRE( config.outputFilename.empty() )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section '-o %stdout':
-All 3 assertions passed
-
+Section: 'streams'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '--out'
 ----------------------------------------------------------------
-Summary for section 'streams':
-All 3 assertions passed
 
--- Section: 'streams' ------------------------------------------
--- Section: '--out' --------------------------------------------
 TestMain.cpp:269:
-[269]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[271]  config.outputFilename == "filename.ext"
-succeeded
-for:   "filename.ext" == "filename.ext"
+TestMain.cpp:271:
+  REQUIRE( config.outputFilename == "filename.ext" )
+passed with expansion:
+  "filename.ext" == "filename.ext"
 
 ----------------------------------------------------------------
-Summary for section '--out':
-All 2 assertions passed
-
+Section: 'combinations'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: '-a -b'
 ----------------------------------------------------------------
-Summary for section 'streams':
-All 2 assertions passed
 
--- Section: 'combinations' -------------------------------------
--- Section: '-a -b' --------------------------------------------
 TestMain.cpp:278:
-[278]  parseIntoConfig( argv, config )
-succeeded
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+passed
 
-[280]  config.cutoff == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:280:
+  CHECK( config.cutoff == 1 )
+passed with expansion:
+  1 == 1
 
-[281]  config.shouldDebugBreak
-succeeded
-for:   true
+TestMain.cpp:281:
+  CHECK( config.shouldDebugBreak )
+passed with expansion:
+  true
 
-[282]  config.allowThrows == false
-succeeded
-for:   false == false
+TestMain.cpp:282:
+  CHECK( config.allowThrows == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section '-a -b':
-All 4 assertions passed
-
-----------------------------------------------------------------
-Summary for section 'combinations':
-All 4 assertions passed
-
+Test case: 'selftest/test filter'
 ----------------------------------------------------------------
-Summary for test case 'selftest/parser/2':
-All tests passed (66 assertions in 1 test case)
 
--- Test case: 'selftest/test filter' ---------------------------
 TestMain.cpp:291:
-[291]  matchAny.shouldInclude( fakeTestCase( "any" ) )
-succeeded
-for:   true
+  CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
+passed with expansion:
+  true
 
-[292]  matchNone.shouldInclude( fakeTestCase( "any" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:292:
+  CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
+passed with expansion:
+  false == false
 
-[297]  matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:297:
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
+passed with expansion:
+  false == false
 
-[298]  matchNonHidden.shouldInclude( fakeTestCase( "any" ) )
-succeeded
-for:   true
+TestMain.cpp:298:
+  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
+passed with expansion:
+  true
 
-[300]  matchHidden.shouldInclude( fakeTestCase( "./any" ) )
-succeeded
-for:   true
+TestMain.cpp:300:
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
+passed with expansion:
+  true
 
-[301]  matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:301:
+  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for test case 'selftest/test filter':
-All tests passed (6 assertions in 1 test case)
+Test case: 'selftest/test filters'
+----------------------------------------------------------------
 
--- Test case: 'selftest/test filters' --------------------------
 TestMain.cpp:312:
-[312]  matchHidden.shouldInclude( fakeTestCase( "./something" ) )
-succeeded
-for:   true
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
+passed with expansion:
+  true
 
-[314]  filters.shouldInclude( fakeTestCase( "any" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:314:
+  CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
+passed with expansion:
+  false == false
 
-[315]  filters.shouldInclude( fakeTestCase( "./something" ) )
-succeeded
-for:   true
+TestMain.cpp:315:
+  CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
+passed with expansion:
+  true
 
-[316]  filters.shouldInclude( fakeTestCase( "./anything" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:316:
+  CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for test case 'selftest/test filters':
-All tests passed (4 assertions in 1 test case)
+Test case: 'selftest/filter/prefix wildcard'
+----------------------------------------------------------------
 
--- Test case: 'selftest/filter/prefix wildcard' ----------------
 TestMain.cpp:322:
-[322]  matchBadgers.shouldInclude( fakeTestCase( "big badger" ) )
-succeeded
-for:   true
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
+passed with expansion:
+  true
 
-[323]  matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:323:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for test case 'selftest/filter/prefix wildcard':
-All tests passed (2 assertions in 1 test case)
+Test case: 'selftest/filter/wildcard at both ends'
+----------------------------------------------------------------
 
--- Test case: 'selftest/filter/wildcard at both ends' ----------
 TestMain.cpp:328:
-[328]  matchBadgers.shouldInclude( fakeTestCase( "big badger" ) )
-succeeded
-for:   true
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
+passed with expansion:
+  true
 
-[329]  matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) )
-succeeded
-for:   true
+TestMain.cpp:329:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
+passed with expansion:
+  true
 
-[330]  matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) )
-succeeded
-for:   true
+TestMain.cpp:330:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
+passed with expansion:
+  true
 
-[331]  matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:331:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for test case 'selftest/filter/wildcard at both ends':
-All tests passed (4 assertions in 1 test case)
+Test case: 'selftest/option parsers'
+----------------------------------------------------------------
 
--- Test case: 'selftest/option parsers' ------------------------
 TestMain.cpp:351:
-[351]  opt.parseIntoConfig( parser, config )
-succeeded
+  CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) )
+passed
 
-[353]  config.filters.size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:353:
+  REQUIRE( config.filters.size() == 1 )
+passed with expansion:
+  1 == 1
 
-[354]  config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false
-succeeded
-for:   false == false
+TestMain.cpp:354:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+passed with expansion:
+  false == false
 
-[355]  config.filters[0].shouldInclude( fakeTestCase( "test1" ) )
-succeeded
-for:   true
+TestMain.cpp:355:
+  REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for test case 'selftest/option parsers':
-All tests passed (4 assertions in 1 test case)
+Test case: 'selftest/tags'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'one tag'
+----------------------------------------------------------------
 
--- Test case: 'selftest/tags' ----------------------------------
--- Section: 'one tag' ------------------------------------------
 TestMain.cpp:369:
-[369]  oneTag.getTestCaseInfo().description == ""
-succeeded
-for:   "" == ""
+  CHECK( oneTag.getTestCaseInfo().description == "" )
+passed with expansion:
+  "" == ""
 
-[370]  oneTag.hasTag( "one" )
-succeeded
-for:   true
+TestMain.cpp:370:
+  CHECK( oneTag.hasTag( "one" ) )
+passed with expansion:
+  true
 
-[371]  oneTag.getTags().size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:371:
+  CHECK( oneTag.getTags().size() == 1 )
+passed with expansion:
+  1 == 1
 
-[373]  oneTag.matchesTags( p1 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:373:
+  CHECK( oneTag.matchesTags( p1 ) == true )
+passed with expansion:
+  true == true
 
-[374]  oneTag.matchesTags( p2 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:374:
+  CHECK( oneTag.matchesTags( p2 ) == true )
+passed with expansion:
+  true == true
 
-[375]  oneTag.matchesTags( p3 ) == false
-succeeded
-for:   false == false
+TestMain.cpp:375:
+  CHECK( oneTag.matchesTags( p3 ) == false )
+passed with expansion:
+  false == false
 
-[376]  oneTag.matchesTags( p4 ) == false
-succeeded
-for:   false == false
+TestMain.cpp:376:
+  CHECK( oneTag.matchesTags( p4 ) == false )
+passed with expansion:
+  false == false
 
-[377]  oneTag.matchesTags( p5 ) == false
-succeeded
-for:   false == false
+TestMain.cpp:377:
+  CHECK( oneTag.matchesTags( p5 ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section 'one tag':
-All 8 assertions passed
+Section: 'two tags'
+----------------------------------------------------------------
 
--- Section: 'two tags' -----------------------------------------
 TestMain.cpp:383:
-[383]  twoTags.getTestCaseInfo().description == ""
-succeeded
-for:   "" == ""
+  CHECK( twoTags.getTestCaseInfo().description == "" )
+passed with expansion:
+  "" == ""
 
-[384]  twoTags.hasTag( "one" )
-succeeded
-for:   true
+TestMain.cpp:384:
+  CHECK( twoTags.hasTag( "one" ) )
+passed with expansion:
+  true
 
-[385]  twoTags.hasTag( "two" )
-succeeded
-for:   true
+TestMain.cpp:385:
+  CHECK( twoTags.hasTag( "two" ) )
+passed with expansion:
+  true
 
-[386]  twoTags.hasTag( "three" ) == false
-succeeded
-for:   false == false
+TestMain.cpp:386:
+  CHECK( twoTags.hasTag( "three" ) == false )
+passed with expansion:
+  false == false
 
-[387]  twoTags.getTags().size() == 2
-succeeded
-for:   2 == 2
+TestMain.cpp:387:
+  CHECK( twoTags.getTags().size() == 2 )
+passed with expansion:
+  2 == 2
 
-[389]  twoTags.matchesTags( p1 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:389:
+  CHECK( twoTags.matchesTags( p1 ) == true )
+passed with expansion:
+  true == true
 
-[390]  twoTags.matchesTags( p2 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:390:
+  CHECK( twoTags.matchesTags( p2 ) == true )
+passed with expansion:
+  true == true
 
-[391]  twoTags.matchesTags( p3 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:391:
+  CHECK( twoTags.matchesTags( p3 ) == true )
+passed with expansion:
+  true == true
 
-[392]  twoTags.matchesTags( p4 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:392:
+  CHECK( twoTags.matchesTags( p4 ) == true )
+passed with expansion:
+  true == true
 
-[393]  twoTags.matchesTags( p5 ) == true
-succeeded
-for:   true == true
+TestMain.cpp:393:
+  CHECK( twoTags.matchesTags( p5 ) == true )
+passed with expansion:
+  true == true
 
 ----------------------------------------------------------------
-Summary for section 'two tags':
-All 10 assertions passed
+Section: 'one tag with characters either side'
+----------------------------------------------------------------
 
--- Section: 'one tag with characters either side' --------------
 TestMain.cpp:399:
-[399]  oneTagWithExtras.getTestCaseInfo().description == "1234"
-succeeded
-for:   "1234" == "1234"
+  CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
+passed with expansion:
+  "1234" == "1234"
 
-[400]  oneTagWithExtras.hasTag( "one" )
-succeeded
-for:   true
+TestMain.cpp:400:
+  CHECK( oneTagWithExtras.hasTag( "one" ) )
+passed with expansion:
+  true
 
-[401]  oneTagWithExtras.hasTag( "two" ) == false
-succeeded
-for:   false == false
+TestMain.cpp:401:
+  CHECK( oneTagWithExtras.hasTag( "two" ) == false )
+passed with expansion:
+  false == false
 
-[402]  oneTagWithExtras.getTags().size() == 1
-succeeded
-for:   1 == 1
+TestMain.cpp:402:
+  CHECK( oneTagWithExtras.getTags().size() == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for section 'one tag with characters either side':
-All 4 assertions passed
+Section: 'start of a tag, but not closed'
+----------------------------------------------------------------
 
--- Section: 'start of a tag, but not closed' -------------------
 TestMain.cpp:409:
-[409]  oneTagOpen.getTestCaseInfo().description == "[one"
-succeeded
-for:   "[one" == "[one"
+  CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
+passed with expansion:
+  "[one" == "[one"
 
-[410]  oneTagOpen.hasTag( "one" ) == false
-succeeded
-for:   false == false
+TestMain.cpp:410:
+  CHECK( oneTagOpen.hasTag( "one" ) == false )
+passed with expansion:
+  false == false
 
-[411]  oneTagOpen.getTags().size() == 0
-succeeded
-for:   0 == 0
+TestMain.cpp:411:
+  CHECK( oneTagOpen.getTags().size() == 0 )
+passed with expansion:
+  0 == 0
 
 ----------------------------------------------------------------
-Summary for section 'start of a tag, but not closed':
-All 3 assertions passed
+Section: 'hidden'
+----------------------------------------------------------------
 
--- Section: 'hidden' -------------------------------------------
 TestMain.cpp:417:
-[417]  oneTag.getTestCaseInfo().description == ""
-succeeded
-for:   "" == ""
+  CHECK( oneTag.getTestCaseInfo().description == "" )
+passed with expansion:
+  "" == ""
 
-[418]  oneTag.hasTag( "hide" )
-succeeded
-for:   true
+TestMain.cpp:418:
+  CHECK( oneTag.hasTag( "hide" ) )
+passed with expansion:
+  true
 
-[419]  oneTag.isHidden()
-succeeded
-for:   true
+TestMain.cpp:419:
+  CHECK( oneTag.isHidden() )
+passed with expansion:
+  true
 
-[421]  oneTag.matchesTags( "~[hide]" ) == false
-succeeded
-for:   false == false
+TestMain.cpp:421:
+  CHECK( oneTag.matchesTags( "~[hide]" ) == false )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section 'hidden':
-All 4 assertions passed
-
+Test case: './succeeding/Tricky/std::pair'
 ----------------------------------------------------------------
-Summary for test case 'selftest/tags':
-All tests passed (29 assertions in 1 test case)
 
--- Test case: './succeeding/Tricky/std::pair' ------------------
 TrickyTests.cpp:37:
-[37]  (std::pair<int, int>( 1, 2 )) == aNicePair
-succeeded
-for:
-	std::pair( 1, 2 )
-	==
-	std::pair( 1, 2 )
+  REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
+passed with expansion:
 
+  std::pair( 1, 2 )
+  ==
+  std::pair( 1, 2 )
+
+----------------------------------------------------------------
+Test case: './inprogress/failing/Tricky/trailing expression'
 ----------------------------------------------------------------
-Summary for test case './succeeding/Tricky/std::pair':
-All tests passed (1 assertion in 1 test case)
 
--- Test case: './inprogress/failing/Tricky/trailing expression'
 TrickyTests.cpp:55:
-[55]  [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
+warning:
+  Uncomment the code in this test to check that it gives a sensible
+  compiler error
 
 
 No assertions in test case, './inprogress/failing/Tricky/trailing expression'
 
 ----------------------------------------------------------------
-Summary for test case './inprogress/failing/Tricky/trailing expression':
-1 test case - failed (1 assertion - failed)
+Test case: './inprogress/failing/Tricky/compound lhs'
+----------------------------------------------------------------
 
--- Test case: './inprogress/failing/Tricky/compound lhs' -------
 TrickyTests.cpp:71:
-[71]  [warning: Uncomment the code in this test to check that it gives a sensible compiler error]
+warning:
+  Uncomment the code in this test to check that it gives a sensible
+  compiler error
 
 
 No assertions in test case, './inprogress/failing/Tricky/compound lhs'
 
 ----------------------------------------------------------------
-Summary for test case './inprogress/failing/Tricky/compound lhs':
-1 test case - failed (1 assertion - failed)
+Test case: './failing/Tricky/non streamable type'
+----------------------------------------------------------------
 
--- Test case: './failing/Tricky/non streamable type' -----------
 TrickyTests.cpp:95:
-[95]  &o1 == &o2
-failed
-for:  0x<hex digits> == 0x<hex digits>
+  CHECK( &o1 == &o2 )
+failed with expansion:
+  0x<hex digits> == 0x<hex digits>
 
-[96]  o1 == o2
-failed
-for:  {?} == {?}
+TrickyTests.cpp:96:
+  CHECK( o1 == o2 )
+failed with expansion:
+  {?} == {?}
 
 ----------------------------------------------------------------
-Summary for test case './failing/Tricky/non streamable type':
-1 test case - failed (2 assertions - both failed)
+Test case: './failing/string literals'
+----------------------------------------------------------------
 
--- Test case: './failing/string literals' ----------------------
 TrickyTests.cpp:106:
-[106]  std::string( "first" ) == "second"
-failed
-for:   "first" == "second"
+  REQUIRE( std::string( "first" ) == "second" )
+failed with expansion:
+  "first" == "second"
 
 ----------------------------------------------------------------
-Summary for test case './failing/string literals':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/side-effects'
+----------------------------------------------------------------
 
--- Test case: './succeeding/side-effects' ----------------------
 TrickyTests.cpp:119:
-[119]  i++ == 7
-succeeded
-for:   7 == 7
+  REQUIRE( i++ == 7 )
+passed with expansion:
+  7 == 7
 
-[120]  i++ == 8
-succeeded
-for:   8 == 8
+TrickyTests.cpp:120:
+  REQUIRE( i++ == 8 )
+passed with expansion:
+  8 == 8
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/side-effects':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/koenig'
+----------------------------------------------------------------
 
--- Test case: './succeeding/koenig' ----------------------------
 TrickyTests.cpp:186:
-[186]  0x<hex digits> == o
-succeeded
-for:   0x<hex digits> == {?}
+  REQUIRE( 0x<hex digits> == o )
+passed with expansion:
+  0x<hex digits> == {?}
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/koenig':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/non-const=='
+----------------------------------------------------------------
 
--- Test case: './succeeding/non-const==' -----------------------
 TrickyTests.cpp:212:
-[212]  t == 1u
-succeeded
-for:   {?} == 1
+  REQUIRE( t == 1u )
+passed with expansion:
+  {?} == 1
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/non-const==':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/enum/bits'
+----------------------------------------------------------------
 
--- Test case: './succeeding/enum/bits' -------------------------
 TrickyTests.cpp:224:
-[224]  0x<hex digits> == bit30and31
-succeeded
-for:   0x<hex digits> == 3221225472
+  REQUIRE( 0x<hex digits> == bit30and31 )
+passed with expansion:
+  0x<hex digits> == 3221225472
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/enum/bits':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/boolean member'
+----------------------------------------------------------------
 
--- Test case: './succeeding/boolean member' --------------------
 TrickyTests.cpp:239:
-[239]  obj.prop != __null
-succeeded
-for:   0x<hex digits> != 0
+  REQUIRE( obj.prop != __null )
+passed with expansion:
+  0x<hex digits> != 0
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/boolean member':
-All tests passed (1 assertion in 1 test case)
+Test case: './succeeding/unimplemented static bool'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'compare to true'
+----------------------------------------------------------------
 
--- Test case: './succeeding/unimplemented static bool' ---------
--- Section: 'compare to true' ----------------------------------
 TrickyTests.cpp:259:
-[259]  is_true<true>::value == true
-succeeded
-for:   true == true
+  REQUIRE( is_true<true>::value == true )
+passed with expansion:
+  true == true
 
-[260]  true == is_true<true>::value
-succeeded
-for:   true == true
+TrickyTests.cpp:260:
+  REQUIRE( true == is_true<true>::value )
+passed with expansion:
+  true == true
 
 ----------------------------------------------------------------
-Summary for section 'compare to true':
-All 2 assertions passed
+Section: 'compare to false'
+----------------------------------------------------------------
 
--- Section: 'compare to false' ---------------------------------
 TrickyTests.cpp:264:
-[264]  is_true<false>::value == false
-succeeded
-for:   false == false
+  REQUIRE( is_true<false>::value == false )
+passed with expansion:
+  false == false
 
-[265]  false == is_true<false>::value
-succeeded
-for:   false == false
+TrickyTests.cpp:265:
+  REQUIRE( false == is_true<false>::value )
+passed with expansion:
+  false == false
 
 ----------------------------------------------------------------
-Summary for section 'compare to false':
-All 2 assertions passed
+Section: 'negation'
+----------------------------------------------------------------
 
--- Section: 'negation' -----------------------------------------
 TrickyTests.cpp:270:
-[270]  !is_true<false>::value
-succeeded
-for:   true
+  REQUIRE( !is_true<false>::value )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section 'negation':
-1 assertion passed
+Section: 'double negation'
+----------------------------------------------------------------
 
--- Section: 'double negation' ----------------------------------
 TrickyTests.cpp:275:
-[275]  !!is_true<true>::value
-succeeded
-for:   true
+  REQUIRE( !!is_true<true>::value )
+passed with expansion:
+  true
 
 ----------------------------------------------------------------
-Summary for section 'double negation':
-1 assertion passed
+Section: 'direct'
+----------------------------------------------------------------
 
--- Section: 'direct' -------------------------------------------
 TrickyTests.cpp:280:
-[280]  is_true<true>::value
-succeeded
-for:   true
+  REQUIRE( is_true<true>::value )
+passed with expansion:
+  true
 
-[281]  !is_true<false>::value
-succeeded
-for:   !false
+TrickyTests.cpp:281:
+  REQUIRE_FALSE( !is_true<false>::value )
+passed with expansion:
+  !false
 
 ----------------------------------------------------------------
-Summary for section 'direct':
-All 2 assertions passed
-
+Test case: './succeeding/SafeBool'
 ----------------------------------------------------------------
-Summary for test case './succeeding/unimplemented static bool':
-All tests passed (8 assertions in 1 test case)
 
--- Test case: './succeeding/SafeBool' --------------------------
 TrickyTests.cpp:313:
-[313]  True
-succeeded
-for:   true
+  CHECK( True )
+passed with expansion:
+  true
 
-[314]  !False
-succeeded
-for:   true
+TrickyTests.cpp:314:
+  CHECK( !False )
+passed with expansion:
+  true
 
-[315]  !False
-succeeded
-for:   !false
+TrickyTests.cpp:315:
+  CHECK_FALSE( !False )
+passed with expansion:
+  !false
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/SafeBool':
-All tests passed (3 assertions in 1 test case)
+Test case: 'scenario name'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'This stuff exists'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'I do this'
+----------------------------------------------------------------
+----------------------------------------------------------------
+Section: 'it should do this'
+----------------------------------------------------------------
 
--- Test case: 'scenario name' ----------------------------------
--- Section: 'This stuff exists' --------------------------------
--- Section: 'I do this' ----------------------------------------
--- Section: 'it should do this' --------------------------------
 BDDTests.cpp:37:
-[37]  itDoesThis()
-succeeded
-for:  true
+  REQUIRE( itDoesThis() )
+passed with expansion:
+  true
 
-----------------------------------------------------------------
-Summary for section 'it should do this':
-1 assertion passed
+================================================================
+96 test cases - 45 failed (610 assertions - 102 failed)
 
-----------------------------------------------------------------
-Summary for section 'I do this':
-1 assertion passed
 
-----------------------------------------------------------------
-Summary for section 'This stuff exists':
-1 assertion passed
+CatchSelfTest is a CATCH v0.9 b12 (integration) host application.
+Run with -? for options
 
 ----------------------------------------------------------------
-Summary for test case 'scenario name':
-All tests passed (1 assertion in 1 test case)
-
+Test case: './succeeding/Approx/simple'
 ----------------------------------------------------------------
-Summary for group '~dummy':
-95 test cases - 44 failed (607 assertions - 101 failed)
 
-================================================================
-Summary for all tests in 'CatchSelfTest':
-95 test cases - 44 failed (607 assertions - 101 failed)
-
--- Started testing: 'CatchSelfTest' ----------------------------
--- Group: '~dummy' ---------------------------------------------
--- Test case: './succeeding/Approx/simple' ---------------------
 ApproxTests.cpp:20:
-[20]  d == Approx( 1.23 )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( d == Approx( 1.23 ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[21]  d != Approx( 1.22 )
-succeeded
-for:  1.23 != Approx( 1.22 )
+ApproxTests.cpp:21:
+  REQUIRE( d != Approx( 1.22 ) )
+passed with expansion:
+  1.23 != Approx( 1.22 )
 
-[22]  d != Approx( 1.24 )
-succeeded
-for:  1.23 != Approx( 1.24 )
+ApproxTests.cpp:22:
+  REQUIRE( d != Approx( 1.24 ) )
+passed with expansion:
+  1.23 != Approx( 1.24 )
 
-[24]  Approx( d ) == 1.23
-succeeded
-for:  Approx( 1.23 ) == 1.23
+ApproxTests.cpp:24:
+  REQUIRE( Approx( d ) == 1.23 )
+passed with expansion:
+  Approx( 1.23 ) == 1.23
 
-[25]  Approx( d ) != 1.22
-succeeded
-for:  Approx( 1.23 ) != 1.22
+ApproxTests.cpp:25:
+  REQUIRE( Approx( d ) != 1.22 )
+passed with expansion:
+  Approx( 1.23 ) != 1.22
 
-[26]  Approx( d ) != 1.24
-succeeded
-for:  Approx( 1.23 ) != 1.24
+ApproxTests.cpp:26:
+  REQUIRE( Approx( d ) != 1.24 )
+passed with expansion:
+  Approx( 1.23 ) != 1.24
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/simple':
-All tests passed (6 assertions in 1 test case)
+Test case: './succeeding/Approx/epsilon'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/epsilon' --------------------
 ApproxTests.cpp:38:
-[38]  d != Approx( 1.231 )
-succeeded
-for:  1.23 != Approx( 1.231 )
+  REQUIRE( d != Approx( 1.231 ) )
+passed with expansion:
+  1.23 != Approx( 1.231 )
 
-[39]  d == Approx( 1.231 ).epsilon( 0.1 )
-succeeded
-for:  1.23 == Approx( 1.231 )
+ApproxTests.cpp:39:
+  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
+passed with expansion:
+  1.23 == Approx( 1.231 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/epsilon':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/float'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/float' ----------------------
 ApproxTests.cpp:49:
-[49]  1.23f == Approx( 1.23f )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( 1.23f == Approx( 1.23f ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[50]  0.0f == Approx( 0.0f )
-succeeded
-for:  0 == Approx( 0 )
+ApproxTests.cpp:50:
+  REQUIRE( 0.0f == Approx( 0.0f ) )
+passed with expansion:
+  0 == Approx( 0 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/float':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/int'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/int' ------------------------
 ApproxTests.cpp:60:
-[60]  1 == Approx( 1 )
-succeeded
+  REQUIRE( 1 == Approx( 1 ) )
+passed
 
-[61]  0 == Approx( 0 )
-succeeded
+ApproxTests.cpp:61:
+  REQUIRE( 0 == Approx( 0 ) )
+passed
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/int':
-All tests passed (2 assertions in 1 test case)
+Test case: './succeeding/Approx/mixed'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/mixed' ----------------------
 ApproxTests.cpp:75:
-[75]  1.0f == Approx( 1 )
-succeeded
-for:  1 == Approx( 1 )
+  REQUIRE( 1.0f == Approx( 1 ) )
+passed with expansion:
+  1 == Approx( 1 )
 
-[76]  0 == Approx( dZero)
-succeeded
-for:  0 == Approx( 0 )
+ApproxTests.cpp:76:
+  REQUIRE( 0 == Approx( dZero) )
+passed with expansion:
+  0 == Approx( 0 )
 
-[77]  0 == Approx( dSmall ).epsilon( 0.001 )
-succeeded
-for:  0 == Approx( 1e-05 )
+ApproxTests.cpp:77:
+  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
+passed with expansion:
+  0 == Approx( 1e-05 )
 
-[78]  1.234f == Approx( dMedium )
-succeeded
-for:  1.234 == Approx( 1.234 )
+ApproxTests.cpp:78:
+  REQUIRE( 1.234f == Approx( dMedium ) )
+passed with expansion:
+  1.234 == Approx( 1.234 )
 
-[79]  dMedium == Approx( 1.234f )
-succeeded
-for:  1.234 == Approx( 1.234 )
+ApproxTests.cpp:79:
+  REQUIRE( dMedium == Approx( 1.234f ) )
+passed with expansion:
+  1.234 == Approx( 1.234 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/mixed':
-All tests passed (5 assertions in 1 test case)
+Test case: './succeeding/Approx/custom'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Approx/custom' ---------------------
 ApproxTests.cpp:93:
-[93]  d == approx( 1.23 )
-succeeded
-for:  1.23 == Approx( 1.23 )
+  REQUIRE( d == approx( 1.23 ) )
+passed with expansion:
+  1.23 == Approx( 1.23 )
 
-[94]  d == approx( 1.22 )
-succeeded
-for:  1.23 == Approx( 1.22 )
+ApproxTests.cpp:94:
+  REQUIRE( d == approx( 1.22 ) )
+passed with expansion:
+  1.23 == Approx( 1.22 )
 
-[95]  d == approx( 1.24 )
-succeeded
-for:  1.23 == Approx( 1.24 )
+ApproxTests.cpp:95:
+  REQUIRE( d == approx( 1.24 ) )
+passed with expansion:
+  1.23 == Approx( 1.24 )
 
-[96]  d != approx( 1.25 )
-succeeded
-for:  1.23 != Approx( 1.25 )
+ApproxTests.cpp:96:
+  REQUIRE( d != approx( 1.25 ) )
+passed with expansion:
+  1.23 != Approx( 1.25 )
 
-[98]  approx( d ) == 1.23
-succeeded
-for:  Approx( 1.23 ) == 1.23
+ApproxTests.cpp:98:
+  REQUIRE( approx( d ) == 1.23 )
+passed with expansion:
+  Approx( 1.23 ) == 1.23
 
-[99]  approx( d ) == 1.22
-succeeded
-for:  Approx( 1.23 ) == 1.22
+ApproxTests.cpp:99:
+  REQUIRE( approx( d ) == 1.22 )
+passed with expansion:
+  Approx( 1.23 ) == 1.22
 
-[100]  approx( d ) == 1.24
-succeeded
-for:   Approx( 1.23 ) == 1.24
+ApproxTests.cpp:100:
+  REQUIRE( approx( d ) == 1.24 )
+passed with expansion:
+  Approx( 1.23 ) == 1.24
 
-[101]  approx( d ) != 1.25
-succeeded
-for:   Approx( 1.23 ) != 1.25
+ApproxTests.cpp:101:
+  REQUIRE( approx( d ) != 1.25 )
+passed with expansion:
+  Approx( 1.23 ) != 1.25
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Approx/custom':
-All tests passed (8 assertions in 1 test case)
+Test case: './succeeding/TestClass/succeedingCase'
+----------------------------------------------------------------
 
--- Test case: './succeeding/TestClass/succeedingCase' ----------
 ClassTests.cpp:24:
-[24]  s == "hello"
-succeeded
-for:  "hello" == "hello"
+  REQUIRE( s == "hello" )
+passed with expansion:
+  "hello" == "hello"
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/TestClass/succeedingCase':
-All tests passed (1 assertion in 1 test case)
+Test case: './failing/TestClass/failingCase'
+----------------------------------------------------------------
 
--- Test case: './failing/TestClass/failingCase' ----------------
 ClassTests.cpp:28:
-[28]  s == "world"
-failed
-for:  "hello" == "world"
+  REQUIRE( s == "world" )
+failed with expansion:
+  "hello" == "world"
 
 ----------------------------------------------------------------
-Summary for test case './failing/TestClass/failingCase':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/Fixture/succeedingCase'
+----------------------------------------------------------------
 
--- Test case: './succeeding/Fixture/succeedingCase' ------------
 ClassTests.cpp:47:
-[47]  m_a == 1
-succeeded
-for:  1 == 1
+  REQUIRE( m_a == 1 )
+passed with expansion:
+  1 == 1
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/Fixture/succeedingCase':
-All tests passed (1 assertion in 1 test case)
+Test case: './failing/Fixture/failingCase'
+----------------------------------------------------------------
 
--- Test case: './failing/Fixture/failingCase' ------------------
 ClassTests.cpp:55:
-[55]  m_a == 2
-failed
-for:  1 == 2
+  REQUIRE( m_a == 2 )
+failed with expansion:
+  1 == 2
 
 ----------------------------------------------------------------
-Summary for test case './failing/Fixture/failingCase':
-1 test case - failed (1 assertion - failed)
+Test case: './succeeding/conditions/equality'
+----------------------------------------------------------------
 
--- Test case: './succeeding/conditions/equality' ---------------
 ConditionTests.cpp:55:
-[55]  data.int_seven == 7
-succeeded
-for:  7 == 7
+  REQUIRE( data.int_seven == 7 )
+passed with expansion:
+  7 == 7
 
-[56]  data.float_nine_point_one == Approx( 9.1f )
-succeeded
-for:  9.1 == Approx( 9.1 )
+ConditionTests.cpp:56:
+  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
+passed with expansion:
+  9.1 == Approx( 9.1 )
 
-[57]  data.double_pi == Approx( 3.1415926535 )
-succeeded
-for:  3.14159 == Approx( 3.14159 )
+ConditionTests.cpp:57:
+  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
+passed with expansion:
+  3.14159 == Approx( 3.14159 )
 
-[58]  data.str_hello == "hello"
-succeeded
-for:  "hello" == "hello"
+ConditionTests.cpp:58:
+  REQUIRE( data.str_hello == "hello" )
+passed with expansion:
+  "hello" == "hello"
 
-[59]  "hello" == data.str_hello
-succeeded
-for:  "hello" == "hello"
+ConditionTests.cpp:59:
+  REQUIRE( "hello" == data.str_hello )
+passed with expansion:
+  "hello" == "hello"
 
-[60]  data.str_hello.size() == 5
-succeeded
-for:  5 == 5
+ConditionTests.cpp:60:
+  REQUIRE( data.str_hello.size() == 5 )
+passed with expansion:
+  5 == 5
 
-[63]  x == Approx( 1.3 )
-succeeded
-for:  1.3 == Approx( 1.3 )
+ConditionTests.cpp:63:
+  REQUIRE( x == Approx( 1.3 ) )
+passed with expansion:
+  1.3 == Approx( 1.3 )
 
 ----------------------------------------------------------------
-Summary for test case './succeeding/conditions/equality':
-All tests passed (7 assertions in 1 test case)
+Test case: './failing/conditions/equality'
+----------------------------------------------------------------
 
--- Test case: './failing/conditions/equality' ------------------
 ConditionTests.cpp:71:
-[71]  data.int_seven == 6
-failed
-for:  7 == 6
+  CHECK( data.int_seven == 6 )
+failed with expansion:
+  7 == 6
 
-[72]  data.int_seven == 8
-failed
-for:  7 == 8
-
-----------------------------------------------------------------
-Summary for test case './failing/conditions/equality':
-1 test case - failed (2 assertions - both failed)
-
-----------------------------------------------------------------
-Summary for group '~dummy':
-12 test cases - 3 failed (38 assertions - 4 failed)
+ConditionTests.cpp:72:
+  CHECK( data.int_seven == 8 )
+failed with expansion:
+  7 == 8
 
 ================================================================
-Summary for all tests in 'CatchSelfTest':
 12 test cases - 3 failed (38 assertions - 4 failed)
 
 <testsuites>
-  <testsuite name="~dummy" errors="8" failures="76" tests="607" hostname="tbd" time="tbd" timestamp="tbd">
+  <testsuite name="~dummy" errors="8" failures="77" tests="610" 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"/>
@@ -3675,133 +3994,133 @@ Summary for all tests in 'CatchSelfTest':
     <testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="tbd"/>
     <testcase classname="TestClass" name="./failing/TestClass/failingCase" time="tbd">
       <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
-ClassTests.cpp:28:
+ClassTests.cpp:28
       </failure>
     </testcase>
     <testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="tbd"/>
     <testcase classname="Fixture" name="./failing/Fixture/failingCase" time="tbd">
       <failure message="1 == 2" type="REQUIRE">
-ClassTests.cpp:55:
+ClassTests.cpp:55
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/equality" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/equality" time="tbd">
       <failure message="7 == 6" type="CHECK">
-ConditionTests.cpp:71:
+ConditionTests.cpp:71
       </failure>
       <failure message="7 == 8" type="CHECK">
-ConditionTests.cpp:72:
+ConditionTests.cpp:72
       </failure>
       <failure message="7 == 0" type="CHECK">
-ConditionTests.cpp:73:
+ConditionTests.cpp:73
       </failure>
       <failure message="9.1 == Approx( 9.11 )" type="CHECK">
-ConditionTests.cpp:74:
+ConditionTests.cpp:74
       </failure>
       <failure message="9.1 == Approx( 9 )" type="CHECK">
-ConditionTests.cpp:75:
+ConditionTests.cpp:75
       </failure>
       <failure message="9.1 == Approx( 1 )" type="CHECK">
-ConditionTests.cpp:76:
+ConditionTests.cpp:76
       </failure>
       <failure message="9.1 == Approx( 0 )" type="CHECK">
-ConditionTests.cpp:77:
+ConditionTests.cpp:77
       </failure>
       <failure message="3.14159 == Approx( 3.1415 )" type="CHECK">
-ConditionTests.cpp:78:
+ConditionTests.cpp:78
       </failure>
       <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
-ConditionTests.cpp:79:
+ConditionTests.cpp:79
       </failure>
       <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
-ConditionTests.cpp:80:
+ConditionTests.cpp:80
       </failure>
       <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
-ConditionTests.cpp:81:
+ConditionTests.cpp:81
       </failure>
       <failure message="5 == 6" type="CHECK">
-ConditionTests.cpp:82:
+ConditionTests.cpp:82
       </failure>
       <failure message="1.3 == Approx( 1.301 )" type="CHECK">
-ConditionTests.cpp:85:
+ConditionTests.cpp:85
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/inequality" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/inequality" time="tbd">
       <failure message="7 != 7" type="CHECK">
-ConditionTests.cpp:111:
+ConditionTests.cpp:111
       </failure>
       <failure message="9.1 != Approx( 9.1 )" type="CHECK">
-ConditionTests.cpp:112:
+ConditionTests.cpp:112
       </failure>
       <failure message="3.14159 != Approx( 3.14159 )" type="CHECK">
-ConditionTests.cpp:113:
+ConditionTests.cpp:113
       </failure>
       <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:114:
+ConditionTests.cpp:114
       </failure>
       <failure message="5 != 5" type="CHECK">
-ConditionTests.cpp:115:
+ConditionTests.cpp:115
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/ordered" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/ordered" time="tbd">
       <failure message="7 > 7" type="CHECK">
-ConditionTests.cpp:152:
+ConditionTests.cpp:152
       </failure>
       <failure message="7 &lt; 7" type="CHECK">
-ConditionTests.cpp:153:
+ConditionTests.cpp:153
       </failure>
       <failure message="7 > 8" type="CHECK">
-ConditionTests.cpp:154:
+ConditionTests.cpp:154
       </failure>
       <failure message="7 &lt; 6" type="CHECK">
-ConditionTests.cpp:155:
+ConditionTests.cpp:155
       </failure>
       <failure message="7 &lt; 0" type="CHECK">
-ConditionTests.cpp:156:
+ConditionTests.cpp:156
       </failure>
       <failure message="7 &lt; -1" type="CHECK">
-ConditionTests.cpp:157:
+ConditionTests.cpp:157
       </failure>
       <failure message="7 >= 8" type="CHECK">
-ConditionTests.cpp:159:
+ConditionTests.cpp:159
       </failure>
       <failure message="7 &lt;= 6" type="CHECK">
-ConditionTests.cpp:160:
+ConditionTests.cpp:160
       </failure>
       <failure message="9.1 &lt; 9" type="CHECK">
-ConditionTests.cpp:162:
+ConditionTests.cpp:162
       </failure>
       <failure message="9.1 > 10" type="CHECK">
-ConditionTests.cpp:163:
+ConditionTests.cpp:163
       </failure>
       <failure message="9.1 > 9.2" type="CHECK">
-ConditionTests.cpp:164:
+ConditionTests.cpp:164
       </failure>
       <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:166:
+ConditionTests.cpp:166
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp:167:
+ConditionTests.cpp:167
       </failure>
       <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
-ConditionTests.cpp:168:
+ConditionTests.cpp:168
       </failure>
       <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:169:
+ConditionTests.cpp:169
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
-ConditionTests.cpp:170:
+ConditionTests.cpp:170
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:171:
+ConditionTests.cpp:171
       </failure>
       <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
-ConditionTests.cpp:173:
+ConditionTests.cpp:173
       </failure>
       <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
-ConditionTests.cpp:174:
+ConditionTests.cpp:174
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/int literals" time="tbd"/>
@@ -3813,120 +4132,121 @@ ConditionTests.cpp:174:
     <testcase classname="global" name="./succeeding/conditions/not" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/not" time="tbd">
       <failure message="false != false" type="CHECK">
-ConditionTests.cpp:334:
+ConditionTests.cpp:334
       </failure>
       <failure message="true != true" type="CHECK">
-ConditionTests.cpp:335:
+ConditionTests.cpp:335
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:336:
+ConditionTests.cpp:336
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:337:
+ConditionTests.cpp:337
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:339:
+ConditionTests.cpp:339
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:340:
+ConditionTests.cpp:340
       </failure>
       <failure message="false" type="CHECK">
-ConditionTests.cpp:342:
+ConditionTests.cpp:342
       </failure>
       <failure message="!(1 == 1)" type="CHECK_FALSE">
-ConditionTests.cpp:343:
+ConditionTests.cpp:343
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/explicit" time="tbd"/>
     <testcase classname="global" name="./failing/exceptions/explicit" time="tbd">
       <error message="thisThrows()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:47:
+ExceptionTests.cpp:47
       </error>
       < message="thisDoesntThrow()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:48:
+ExceptionTests.cpp:48
       </>
       <error message="thisThrows()" type="CHECK_NOTHROW">
-ExceptionTests.cpp:49:
+ExceptionTests.cpp:49
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:52:
+ExceptionTests.cpp:52
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/2" time="tbd">
       <error message="{Unknown expression after this line}">
-ExceptionTests.cpp:60:
+ExceptionTests.cpp:60
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/implicit" time="tbd"/>
     <testcase classname="global" name="./failing/exceptions/custom" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:102:
+ExceptionTests.cpp:102
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="tbd">
       <error message="throw CustomException( &quot;unexpected custom exception&quot; )" type="REQUIRE_NOTHROW">
-ExceptionTests.cpp:109:
+ExceptionTests.cpp:109
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/throw" time="tbd">
       <error message="throw CustomException( &quot;custom exception - not std&quot; )" type="REQUIRE_THROWS_AS">
-ExceptionTests.cpp:114:
+ExceptionTests.cpp:114
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/double" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:118:
+ExceptionTests.cpp:118
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="tbd"/>
     <testcase classname="global" name="./succeeding/generators/1" time="tbd"/>
+    <testcase classname="global" name="./succeeding/generators/2" time="tbd"/>
     <testcase classname="global" name="./succeeding/message" time="tbd">
       <warning type="WARN">
-MessageTests.cpp:14:
+MessageTests.cpp:14
       </warning>
     </testcase>
     <testcase classname="global" name="./succeeding/succeed" time="tbd"/>
     <testcase classname="global" name="./failing/message/info/1" time="tbd">
       <info type="INFO">
-MessageTests.cpp:23:
+MessageTests.cpp:23
       </info>
       <info type="INFO">
-MessageTests.cpp:24:
+MessageTests.cpp:24
       </info>
       <failure message="2 == 1" type="REQUIRE">
-MessageTests.cpp:26:
+MessageTests.cpp:26
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/message/info/2" time="tbd">
       <info type="INFO">
-MessageTests.cpp:31:
+MessageTests.cpp:31
       </info>
       <info type="INFO">
-MessageTests.cpp:35:
+MessageTests.cpp:35
       </info>
       <failure message="2 == 1" type="CHECK">
-MessageTests.cpp:37:
+MessageTests.cpp:37
       </failure>
       <info type="INFO">
-MessageTests.cpp:39:
+MessageTests.cpp:39
       </info>
       <failure message="2 == 0" type="CHECK">
-MessageTests.cpp:41:
+MessageTests.cpp:41
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/message/fail" time="tbd">
       <failure type="FAIL">
-MessageTests.cpp:51:
+MessageTests.cpp:51
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/message/sections" time="tbd">
       <failure type="FAIL">
-MessageTests.cpp:58:
+MessageTests.cpp:58
       </failure>
       <failure type="FAIL">
-MessageTests.cpp:63:
+MessageTests.cpp:63
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/message/sections/stdout" time="tbd">
@@ -3937,75 +4257,75 @@ Message from section two
     </testcase>
     <testcase classname="global" name="./mixed/message/scoped" time="tbd">
       <info message="i &lt; 10" type="REQUIRE">
-MessageTests.cpp:86:
+MessageTests.cpp:86
       </info>
       <info message="i &lt; 10" type="REQUIRE">
-MessageTests.cpp:86:
+MessageTests.cpp:86
       </info>
       <failure message="10 &lt; 10" type="REQUIRE">
-MessageTests.cpp:86:
+MessageTests.cpp:86
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/nofail" time="tbd">
       <failure message="1 == 2" type="CHECK_NOFAIL">
-MessageTests.cpp:92:
+MessageTests.cpp:92
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/Misc/Sections" time="tbd"/>
     <testcase classname="global" name="./succeeding/Misc/Sections/nested" time="tbd"/>
     <testcase classname="global" name="./mixed/Misc/Sections/nested2" time="tbd">
       <failure message="1 == 2" type="REQUIRE">
-MiscTests.cpp:61:
+MiscTests.cpp:61
       </failure>
     </testcase>
     <testcase classname="global" name="./Sections/nested/a/b" time="tbd"/>
     <testcase classname="global" name="./mixed/Misc/Sections/loops" time="tbd">
       <failure message="0 > 1" type="CHECK">
-MiscTests.cpp:103:
+MiscTests.cpp:103
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/Misc/loops" time="tbd">
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
       <info type="INFO">
-MiscTests.cpp:114:
+MiscTests.cpp:114
       </info>
       <failure message="1 == 0" type="CHECK">
-MiscTests.cpp:115:
+MiscTests.cpp:115
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="tbd">
@@ -4019,62 +4339,62 @@ An error
     <testcase classname="global" name="./succeeding/Misc/null strings" time="tbd"/>
     <testcase classname="global" name="./failing/info" time="tbd">
       <info type="INFO">
-MiscTests.cpp:139:
+MiscTests.cpp:139
       </info>
       <info type="CAPTURE">
-MiscTests.cpp:141:
+MiscTests.cpp:141
       </info>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:142:
+MiscTests.cpp:142
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedif" time="tbd"/>
     <testcase classname="global" name="./failing/checkedif" time="tbd">
       <failure message="false" type="CHECKED_IF">
-MiscTests.cpp:147:
+MiscTests.cpp:147
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:160:
+MiscTests.cpp:160
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedelse" time="tbd"/>
     <testcase classname="global" name="./failing/checkedelse" time="tbd">
       <failure message="false" type="CHECKED_ELSE">
-MiscTests.cpp:165:
+MiscTests.cpp:165
       </failure>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:178:
+MiscTests.cpp:178
       </failure>
     </testcase>
     <testcase classname="global" name="./misc/xmlentitycheck" time="tbd"/>
     <testcase classname="global" name="./manual/onechar" time="tbd">
       <info type="INFO">
-MiscTests.cpp:195:
+MiscTests.cpp:195
       </info>
       <failure message="false" type="REQUIRE">
-MiscTests.cpp:196:
+MiscTests.cpp:196
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/atomic if" time="tbd"/>
     <testcase classname="global" name="./succeeding/matchers" time="tbd"/>
     <testcase classname="global" name="./failing/matchers/Contains" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
-MiscTests.cpp:225:
+MiscTests.cpp:225
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/StartsWith" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
-MiscTests.cpp:230:
+MiscTests.cpp:230
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/EndsWith" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
-MiscTests.cpp:235:
+MiscTests.cpp:235
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/Equals" time="tbd">
       <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
-MiscTests.cpp:240:
+MiscTests.cpp:240
       </failure>
     </testcase>
     <testcase classname="global" name="/succeeding/matchers/AllOf" time="tbd"/>
@@ -4084,12 +4404,15 @@ MiscTests.cpp:240:
     <testcase classname="global" name="empty" time="tbd"/>
     <testcase classname="global" name="Nice descriptive name" time="tbd">
       <warning type="WARN">
-MiscTests.cpp:282:
+MiscTests.cpp:282
       </warning>
     </testcase>
     <testcase classname="global" name="first tag" time="tbd"/>
     <testcase classname="global" name="second tag" time="tbd"/>
     <testcase classname="global" name="selftest/main" time="tbd">
+      <failure message="293 == 291" type="CHECK">
+TestMain.cpp:40
+      </failure>
       <system-out>
 Message from section one
 Message from section two
@@ -4114,25 +4437,25 @@ An error
     <testcase classname="global" name="./succeeding/Tricky/std::pair" time="tbd"/>
     <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="tbd">
       <warning type="WARN">
-TrickyTests.cpp:55:
+TrickyTests.cpp:55
       </warning>
     </testcase>
     <testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="tbd">
       <warning type="WARN">
-TrickyTests.cpp:71:
+TrickyTests.cpp:71
       </warning>
     </testcase>
     <testcase classname="global" name="./failing/Tricky/non streamable type" time="tbd">
       <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-TrickyTests.cpp:95:
+TrickyTests.cpp:95
       </failure>
       <failure message="{?} == {?}" type="CHECK">
-TrickyTests.cpp:96:
+TrickyTests.cpp:96
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/string literals" time="tbd">
       <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
-TrickyTests.cpp:106:
+TrickyTests.cpp:106
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/side-effects" time="tbd"/>
@@ -6759,6 +7082,25 @@ GeneratorTests.cpp" line="27">
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="./succeeding/generators/2">
+GeneratorTests.cpp" line="40">
+        <Original>
+          i->first == i->second-1
+        </Original>
+        <Expanded>
+          0 == 0
+        </Expanded>
+      </Expression>
+GeneratorTests.cpp" line="40">
+        <Original>
+          i->first == i->second-1
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="./succeeding/message">
       <Warning>
         this is a warning
@@ -7556,9 +7898,9 @@ MiscTests.cpp" line="273">
       </Section>
       <Section name="selftest/expected result" description="Tests do what they claim">
         <Section name="selftest/expected result/succeeding tests" description="Tests in the 'succeeding' branch succeed">
-          <OverallResults successes="43" failures="0"/>
+          <OverallResults successes="44" failures="0"/>
         </Section>
-        <OverallResults successes="43" failures="0"/>
+        <OverallResults successes="44" failures="0"/>
       </Section>
       <Section name="selftest/expected result" description="Tests do what they claim">
         <OverallResults successes="0" failures="0"/>
@@ -7570,7 +7912,7 @@ TestMain.cpp" line="40">
               totals.assertions.passed == 291
             </Original>
             <Expanded>
-              291 == 291
+              293 == 291
             </Expanded>
           </Expression>
 TestMain.cpp" line="41">
@@ -7581,9 +7923,9 @@ TestMain.cpp" line="41">
               0 == 0
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="1" failures="1"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="1" failures="1"/>
       </Section>
       <Section name="selftest/test counts" description="Number of test cases that run is fixed">
         <Section name="selftest/test counts/failing tests" description="Number of 'failing' tests is fixed">
@@ -7607,7 +7949,7 @@ TestMain.cpp" line="48">
         </Section>
         <OverallResults successes="2" failures="0"/>
       </Section>
-      <OverallResult success="true"/>
+      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="meta/Misc/Sections">
 TestMain.cpp" line="57">
@@ -9003,9 +9345,9 @@ BDDTests.cpp" line="37">
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="506" failures="101"/>
+    <OverallResults successes="508" failures="102"/>
   </Group>
-  <OverallResults successes="506" failures="101"/>
+  <OverallResults successes="508" failures="102"/>
 </Catch>
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
@@ -9429,6 +9771,11 @@ GeneratorTests.cpp:26: multiply( i, 2 ) == i*2 succeeded for: 72 == 72
 GeneratorTests.cpp:27: multiply( j, 2 ) == j*2 succeeded for: 214 == 214
 [Finished: './succeeding/generators/1' All tests passed (144 assertions in 1 test case)]
 
+[Running: ./succeeding/generators/2]
+GeneratorTests.cpp:40: i->first == i->second-1 succeeded for: 0 == 0
+GeneratorTests.cpp:40: i->first == i->second-1 succeeded for: 2 == 2
+[Finished: './succeeding/generators/2' All tests passed (2 assertions in 1 test case)]
+
 [Running: ./succeeding/message]
 MessageTests.cpp:14: [warning: this is a warning]
 
@@ -9761,55 +10108,55 @@ No assertions in test case, 'second tag'
 [Running: selftest/main]
 [Started section: 'selftest/expected result']
 [Started section: 'selftest/expected result/failing tests']
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
-catch_self_test.hpp:106:  succeeded
+catch_self_test.hpp:114:  succeeded
 [with message: Tests failed, as expected]
 [End of section: 'selftest/expected result/failing tests' All 25 assertions passed]
 
@@ -9817,99 +10164,101 @@ catch_self_test.hpp:106:  succeeded
 
 [Started section: 'selftest/expected result']
 [Started section: 'selftest/expected result/succeeding tests']
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
+[with message: Tests passed, as expected]
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
 Message from section one
 Message from section two
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
 Some information
 An error
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-catch_self_test.hpp:95:  succeeded
+catch_self_test.hpp:103:  succeeded
 [with message: Tests passed, as expected]
-[End of section: 'selftest/expected result/succeeding tests' All 43 assertions passed]
+[End of section: 'selftest/expected result/succeeding tests' All 44 assertions passed]
 
-[End of section: 'selftest/expected result' All 43 assertions passed]
+[End of section: 'selftest/expected result' All 44 assertions passed]
 
 Message from section one
 Message from section two
@@ -9917,11 +10266,11 @@ Some information
 An error
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/succeeding tests']
-TestMain.cpp:40: totals.assertions.passed == 291 succeeded for: 291 == 291
+TestMain.cpp:40: totals.assertions.passed == 291 failed for: 293 == 291
 TestMain.cpp:41: totals.assertions.failed == 0 succeeded for: 0 == 0
-[End of section: 'selftest/test counts/succeeding tests' All 2 assertions passed]
+[End of section: 'selftest/test counts/succeeding tests' 1 of 2 assertions failed]
 
-[End of section: 'selftest/test counts' All 2 assertions passed]
+[End of section: 'selftest/test counts' 1 of 2 assertions failed]
 
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/failing tests']
@@ -9931,7 +10280,7 @@ TestMain.cpp:48: totals.assertions.failed == 72 succeeded for: 72 == 72
 
 [End of section: 'selftest/test counts' All 2 assertions passed]
 
-[Finished: 'selftest/main' All tests passed (72 assertions in 1 test case)]
+[Finished: 'selftest/main' 1 test case failed (1 of 73 assertions failed)]
 
 [Running: meta/Misc/Sections]
 TestMain.cpp:57: totals.assertions.passed == 2 succeeded for: 2 == 2
@@ -10344,10 +10693,10 @@ BDDTests.cpp:37: itDoesThis() succeeded for: true
 [End of section: 'This stuff exists' 1 assertion passed]
 
 [Finished: 'scenario name' All tests passed (1 assertion in 1 test case)]
-[End of group: '~dummy'. 44 of 95 test cases failed (101 of 607 assertions failed)]
+[End of group: '~dummy'. 45 of 96 test cases failed (102 of 610 assertions failed)]
 
 
-[Testing completed. 44 of 95 test cases failed (101 of 607 assertions failed)]
+[Testing completed. 45 of 96 test cases failed (102 of 610 assertions failed)]
 
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']