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

Sort test ordering during Approval testing

Commit
79acc0504bf62020eefbb305c948718328aebade
Author
Phil Nash ·
Parents
f9afa2a68d53

Files · Download .tar.gz

Changes

 .../SelfTest/Baselines/console.std.approved.txt    |   830 +-
 .../SelfTest/Baselines/console.sw.approved.txt     |  9142 +++++++-------
 .../SelfTest/Baselines/console.swa4.approved.txt   |   601 +-
 projects/SelfTest/Baselines/junit.sw.approved.txt  |   892 +-
 projects/SelfTest/Baselines/xml.sw.approved.txt    | 11932 +++++++++----------
 scripts/approvalTests.py                           |    11 +-
 6 files changed, 11417 insertions(+), 11991 deletions(-)

diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index ee8d8072..7c5da08c 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -3,6 +3,46 @@
 CatchSelfTest is a <version> host application.
 Run with -? for options
 
+-------------------------------------------------------------------------------
+'Not' checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( false != false )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( true != true )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !true )
+with expansion:
+  false
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( true )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !trueValue )
+with expansion:
+  false
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( trueValue )
+with expansion:
+  !true
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !(1 == 1) )
+with expansion:
+  false
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( 1 == 1 )
+with expansion:
+  !(1 == 1)
+
 -------------------------------------------------------------------------------
 A METHOD_AS_TEST_CASE based test run that fails
 -------------------------------------------------------------------------------
@@ -25,6 +65,97 @@ ClassTests.cpp:<line number>: FAILED:
 with expansion:
   1 == 2
 
+-------------------------------------------------------------------------------
+A couple of nested sections followed by a failure
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+A failing expression with a non streamable type is still captured
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>: FAILED:
+  CHECK( &o1 == &o2 )
+with expansion:
+  0x<hex digits> == 0x<hex digits>
+
+TrickyTests.cpp:<line number>: FAILED:
+  CHECK( o1 == o2 )
+with expansion:
+  {?} == {?}
+
+-------------------------------------------------------------------------------
+An unchecked exception reports the line of the last assertion
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+Contains string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
+with expansion:
+  "this string contains 'abc' as a substring" contains: "not there"
+
+-------------------------------------------------------------------------------
+Custom exceptions can be translated when testing for nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_NOTHROW( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+Custom exceptions can be translated when testing for throwing as something else
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_AS( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
+
+-------------------------------------------------------------------------------
+EndsWith string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ends with: "this"
+
 -------------------------------------------------------------------------------
 Equality checks that should fail
 -------------------------------------------------------------------------------
@@ -96,6 +227,100 @@ ConditionTests.cpp:<line number>: FAILED:
 with expansion:
   1.3 == Approx( 1.301 )
 
+-------------------------------------------------------------------------------
+Equals string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
+with expansion:
+  "this string contains 'abc' as a substring" equals: "something else"
+
+-------------------------------------------------------------------------------
+Expected exceptions that don't throw or unexpected exceptions fail the test
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_THROWS_AS( thisThrows() )
+due to unexpected exception with message:
+  expected exception
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_THROWS_AS( thisDoesntThrow() )
+because no exception was thrown where one was expected:
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_NOTHROW( thisThrows() )
+due to unexpected exception with message:
+  expected exception
+
+-------------------------------------------------------------------------------
+FAIL aborts the test
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  This is a failure
+
+-------------------------------------------------------------------------------
+FAIL does not require an argument
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+
+-------------------------------------------------------------------------------
+INFO and WARN do not abort tests
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+warning:
+  this is a warning
+
+-------------------------------------------------------------------------------
+INFO gets logged on failure
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( a == 1 )
+with expansion:
+  2 == 1
+with messages:
+  this message should be logged
+  so should this
+
+-------------------------------------------------------------------------------
+INFO gets logged on failure, even if captured before successful assertions
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+  CHECK( a == 1 )
+with expansion:
+  2 == 1
+with messages:
+  this message may be logged later
+  this message should be logged
+
+MessageTests.cpp:<line number>: FAILED:
+  CHECK( a == 0 )
+with expansion:
+  2 == 0
+with message:
+  and this, but later
+
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
@@ -128,30 +353,84 @@ with expansion:
   5 != 5
 
 -------------------------------------------------------------------------------
-Ordering comparison checks that should fail
+Matchers can be composed with both && and || - failing
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven > 7 )
-with expansion:
-  7 > 7
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 7 )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
 with expansion:
-  7 < 7
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "random" )
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven > 8 )
-with expansion:
-  7 > 8
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 6 )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
 with expansion:
-  7 < 6
+  "this string contains 'abc' as a substring" not contains: "substring"
+
+-------------------------------------------------------------------------------
+Mismatching exception messages failing the test
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
+with expansion:
+  expected exception
+
+-------------------------------------------------------------------------------
+Nice descriptive name
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+warning:
+  This one ran
+
+-------------------------------------------------------------------------------
+Non-std exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
+-------------------------------------------------------------------------------
+Ordering comparison checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven > 7 )
+with expansion:
+  7 > 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 7 )
+with expansion:
+  7 < 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven > 8 )
+with expansion:
+  7 > 8
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 6 )
+with expansion:
+  7 < 6
 
 ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 0 )
@@ -229,89 +508,102 @@ with expansion:
   "hello" <= "a"
 
 -------------------------------------------------------------------------------
-'Not' checks that should fail
+Output from all sections is reported
+  one
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( false != false )
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section one
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( true != true )
+-------------------------------------------------------------------------------
+Output from all sections is reported
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !true )
-with expansion:
-  false
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section two
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( true )
+-------------------------------------------------------------------------------
+Pointers can be converted to strings
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !trueValue )
-with expansion:
-  false
+MessageTests.cpp:<line number>:
+warning:
+  actual address of p: 0x<hex digits>
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( trueValue )
-with expansion:
-  !true
+MessageTests.cpp:<line number>:
+warning:
+  toString(p): 0x<hex digits>
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !(1 == 1) )
-with expansion:
-  false
+-------------------------------------------------------------------------------
+SCOPED_INFO is reset for each loop
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( 1 == 1 )
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( i < 10 )
 with expansion:
-  !(1 == 1)
+  10 < 10
+with messages:
+  current counter 10
+  i := 10
 
+A string sent directly to stdout
+A string sent directly to stderr
+Message from section one
+Message from section two
 -------------------------------------------------------------------------------
-Expected exceptions that don't throw or unexpected exceptions fail the test
+StartsWith string matcher
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_THROWS_AS( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_THROWS_AS( thisDoesntThrow() )
-because no exception was thrown where one was expected:
-
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_NOTHROW( thisThrows() )
-due to unexpected exception with message:
-  expected exception
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
+with expansion:
+  "this string contains 'abc' as a substring" starts with: "string"
 
+hello
+hello
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown directly they are always failures
+Tabs and newlines show in output
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( s1 == s2 )
+with expansion:
+  "if ($b == 10) {
+  		$a= 20;
+  }"
+  ==
+  "if ($b == 10) {
+  $a = 20;
+  }
+  "
 
 -------------------------------------------------------------------------------
-An unchecked exception reports the line of the last assertion
+Unexpected exceptions can be translated
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
 
 ExceptionTests.cpp:<line number>: FAILED:
-  {Unknown expression after the reported line}
 due to unexpected exception with message:
-  unexpected exception
+  3.14
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown from sections they are always failures
-  section name
+When unchecked exceptions are thrown directly they are always failures
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
@@ -321,7 +613,8 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown from functions they are always failures
+When unchecked exceptions are thrown during a CHECK the test should abort and
+fail
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
@@ -344,8 +637,7 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown during a CHECK the test should abort and
-fail
+When unchecked exceptions are thrown from functions they are always failures
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
@@ -356,217 +648,79 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-Non-std exceptions can be translated
+When unchecked exceptions are thrown from sections they are always failures
+  section name
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
 
 ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
-  custom exception
+  unexpected exception
 
 -------------------------------------------------------------------------------
-Custom std-exceptions can be custom translated
+Where the LHS is not a simple value
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom std exception
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
 
 -------------------------------------------------------------------------------
-Custom exceptions can be translated when testing for nothrow
+Where there is more to the expression after the RHS
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_NOTHROW( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
 
 -------------------------------------------------------------------------------
-Custom exceptions can be translated when testing for throwing as something else
+checkedElse, failing
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_THROWS_AS( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-Unexpected exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
+MiscTests.cpp:<line number>: FAILED:
+  CHECKED_ELSE( flag )
+with expansion:
+  false
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  3.14
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( testCheckedElse( false ) )
+with expansion:
+  false
 
 -------------------------------------------------------------------------------
-Mismatching exception messages failing the test
+checkedIf, failing
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
+MiscTests.cpp:<line number>: FAILED:
+  CHECKED_IF( flag )
 with expansion:
-  expected exception
+  false
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( testCheckedIf( false ) )
+with expansion:
+  false
 
 -------------------------------------------------------------------------------
-INFO and WARN do not abort tests
+just failure
 -------------------------------------------------------------------------------
 MessageTests.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
-warning:
-  this is a warning
-
--------------------------------------------------------------------------------
-INFO gets logged on failure
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( a == 1 )
-with expansion:
-  2 == 1
-with messages:
-  this message should be logged
-  so should this
-
--------------------------------------------------------------------------------
-INFO gets logged on failure, even if captured before successful assertions
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-  CHECK( a == 1 )
-with expansion:
-  2 == 1
-with messages:
-  this message may be logged later
-  this message should be logged
-
-MessageTests.cpp:<line number>: FAILED:
-  CHECK( a == 0 )
-with expansion:
-  2 == 0
-with message:
-  and this, but later
-
--------------------------------------------------------------------------------
-FAIL aborts the test
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  This is a failure
-
--------------------------------------------------------------------------------
-FAIL does not require an argument
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-
--------------------------------------------------------------------------------
-Output from all sections is reported
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Message from section one
-
--------------------------------------------------------------------------------
-Output from all sections is reported
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Message from section two
-
-Message from section one
-Message from section two
--------------------------------------------------------------------------------
-SCOPED_INFO is reset for each loop
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( i < 10 )
-with expansion:
-  10 < 10
-with messages:
-  current counter 10
-  i := 10
-
--------------------------------------------------------------------------------
-just failure
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Previous info should not be seen
-
--------------------------------------------------------------------------------
-sends information to INFO
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( false )
-with messages:
-  hi
-  i := 7
-
--------------------------------------------------------------------------------
-Pointers can be converted to strings
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>:
-warning:
-  actual address of p: 0x<hex digits>
-
-MessageTests.cpp:<line number>:
-warning:
-  toString(p): 0x<hex digits>
-
--------------------------------------------------------------------------------
-more nested SECTION tests
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( a == b )
-with expansion:
-  1 == 2
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Previous info should not be seen
 
 -------------------------------------------------------------------------------
 looped SECTION tests
@@ -628,39 +782,18 @@ with expansion:
 with message:
   Testing if fib[7] (21) is even
 
-A string sent directly to stdout
-A string sent directly to stderr
 -------------------------------------------------------------------------------
-checkedIf, failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECKED_IF( flag )
-with expansion:
-  false
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( testCheckedIf( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-checkedElse, failing
+more nested SECTION tests
+  s1
+  s2
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECKED_ELSE( flag )
-with expansion:
-  false
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( testCheckedElse( false ) )
+  REQUIRE( a == b )
 with expansion:
-  false
+  1 == 2
 
 -------------------------------------------------------------------------------
 send a single char to INFO
@@ -674,149 +807,16 @@ with message:
   3
 
 -------------------------------------------------------------------------------
-Contains string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "not there"
-
--------------------------------------------------------------------------------
-StartsWith string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "string"
-
--------------------------------------------------------------------------------
-EndsWith string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "this"
-
--------------------------------------------------------------------------------
-Equals string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
-with expansion:
-  "this string contains 'abc' as a substring" equals: "something else"
-
--------------------------------------------------------------------------------
-Matchers can be composed with both && and || - failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( ( contains: "string" or
-  contains: "different" ) and contains: "random" )
-
--------------------------------------------------------------------------------
-Matchers can be negated (Not) with the ! operator - failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" not contains: "substring"
-
--------------------------------------------------------------------------------
-Nice descriptive name
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-warning:
-  This one ran
-
--------------------------------------------------------------------------------
-A couple of nested sections followed by a failure
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-Tabs and newlines show in output
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( s1 == s2 )
-with expansion:
-  "if ($b == 10) {
-  		$a= 20;
-  }"
-  ==
-  "if ($b == 10) {
-  $a = 20;
-  }
-  "
-
-hello
-hello
--------------------------------------------------------------------------------
-Where there is more to the expression after the RHS
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
-
-TrickyTests.cpp:<line number>:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
-  error
-
--------------------------------------------------------------------------------
-Where the LHS is not a simple value
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
-
-TrickyTests.cpp:<line number>:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
-  error
-
--------------------------------------------------------------------------------
-A failing expression with a non streamable type is still captured
+sends information to INFO
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
-  CHECK( &o1 == &o2 )
-with expansion:
-  0x<hex digits> == 0x<hex digits>
-
-TrickyTests.cpp:<line number>: FAILED:
-  CHECK( o1 == o2 )
-with expansion:
-  {?} == {?}
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with messages:
+  hi
+  i := 7
 
 -------------------------------------------------------------------------------
 string literals of different sizes can be compared
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 3359a0fa..b9fdceab 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -4,270 +4,348 @@ CatchSelfTest is a <version> host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
-toString(enum)
+# A test name that starts with a #
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "0" )
-with expansion:
-  "0" == "0"
-
-EnumToString.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( Catch::toString(e1) == "1" )
-with expansion:
-  "1" == "1"
+with message:
+  yay
 
 -------------------------------------------------------------------------------
-toString(enum w/operator<<)
+'Not' checks that should fail
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "E2{0}" )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( false != false )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( true != true )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !true )
 with expansion:
-  "E2{0}" == "E2{0}"
+  false
 
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "E2{1}" )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( true )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !trueValue )
 with expansion:
-  "E2{1}" == "E2{1}"
+  false
 
--------------------------------------------------------------------------------
-toString(enum class)
--------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
-...............................................................................
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( trueValue )
+with expansion:
+  !true
 
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "0" )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( !(1 == 1) )
 with expansion:
-  "0" == "0"
+  false
 
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "1" )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK_FALSE( 1 == 1 )
 with expansion:
-  "1" == "1"
+  !(1 == 1)
 
 -------------------------------------------------------------------------------
-toString(enum class w/operator<<)
+'Not' checks that should succeed
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( Catch::toString(e0) == "E2/V0" )
-with expansion:
-  "E2/V0" == "E2/V0"
+  REQUIRE( false == false )
 
-EnumToString.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( Catch::toString(e1) == "E2/V1" )
-with expansion:
-  "E2/V1" == "E2/V1"
+  REQUIRE( true == true )
 
-EnumToString.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( Catch::toString(e3) == "Unknown enum value 10" )
+  REQUIRE( !false )
 with expansion:
-  "Unknown enum value 10"
-  ==
-  "Unknown enum value 10"
+  true
 
--------------------------------------------------------------------------------
-Some simple comparisons between doubles
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( false )
 
-ApproxTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d == Approx( 1.23 ) )
+  REQUIRE( !falseValue )
 with expansion:
-  1.23 == Approx( 1.23 )
+  true
 
-ApproxTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d != Approx( 1.22 ) )
+  REQUIRE_FALSE( falseValue )
 with expansion:
-  1.23 != Approx( 1.22 )
+  !false
 
-ApproxTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d != Approx( 1.24 ) )
+  REQUIRE( !(1 == 2) )
 with expansion:
-  1.23 != Approx( 1.24 )
+  true
 
-ApproxTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Approx( d ) == 1.23 )
+  REQUIRE_FALSE( 1 == 2 )
 with expansion:
-  Approx( 1.23 ) == 1.23
+  !(1 == 2)
 
-ApproxTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+(unimplemented) static bools can be evaluated
+  compare to true
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Approx( d ) != 1.22 )
+  REQUIRE( is_true<true>::value == true )
 with expansion:
-  Approx( 1.23 ) != 1.22
+  true == true
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Approx( d ) != 1.24 )
+  REQUIRE( true == is_true<true>::value )
 with expansion:
-  Approx( 1.23 ) != 1.24
+  true == true
 
 -------------------------------------------------------------------------------
-Approximate comparisons with different epsilons
+(unimplemented) static bools can be evaluated
+  compare to false
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d != Approx( 1.231 ) )
+  REQUIRE( is_true<false>::value == false )
 with expansion:
-  1.23 != Approx( 1.231 )
+  false == false
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
+  REQUIRE( false == is_true<false>::value )
 with expansion:
-  1.23 == Approx( 1.231 )
+  false == false
 
 -------------------------------------------------------------------------------
-Approximate comparisons with floats
+(unimplemented) static bools can be evaluated
+  negation
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 1.23f == Approx( 1.23f ) )
+  REQUIRE( !is_true<false>::value )
 with expansion:
-  1.23f == Approx( 1.2300000191 )
+  true
 
-ApproxTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+(unimplemented) static bools can be evaluated
+  double negation
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 0.0f == Approx( 0.0f ) )
+  REQUIRE( !!is_true<true>::value )
 with expansion:
-  0.0f == Approx( 0.0 )
+  true
 
 -------------------------------------------------------------------------------
-Approximate comparisons with ints
+(unimplemented) static bools can be evaluated
+  direct
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 1 == Approx( 1 ) )
+  REQUIRE( is_true<true>::value )
 with expansion:
-  1 == Approx( 1.0 )
+  true
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 0 == Approx( 0 ) )
+  REQUIRE_FALSE( is_true<false>::value )
 with expansion:
-  0 == Approx( 0.0 )
+  !false
 
 -------------------------------------------------------------------------------
-Approximate comparisons with mixed numeric types
+A METHOD_AS_TEST_CASE based test run that fails
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+ClassTests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1.0f == Approx( 1 ) )
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( s == "world" )
 with expansion:
-  1.0f == Approx( 1.0 )
+  "hello" == "world"
 
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 0 == Approx( dZero) )
-with expansion:
-  0 == Approx( 0.0 )
+-------------------------------------------------------------------------------
+A METHOD_AS_TEST_CASE based test run that succeeds
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
 
-ApproxTests.cpp:<line number>:
+ClassTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
+  REQUIRE( s == "hello" )
 with expansion:
-  0 == Approx( 0.00001 )
+  "hello" == "hello"
 
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1.234f == Approx( dMedium ) )
-with expansion:
-  1.234f == Approx( 1.234 )
+-------------------------------------------------------------------------------
+A TEST_CASE_METHOD based test run that fails
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
 
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( dMedium == Approx( 1.234f ) )
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( m_a == 2 )
 with expansion:
-  1.234 == Approx( 1.2339999676 )
+  1 == 2
 
 -------------------------------------------------------------------------------
-Use a custom approx
+A TEST_CASE_METHOD based test run that succeeds
 -------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
+ClassTests.cpp:<line number>
 ...............................................................................
 
-ApproxTests.cpp:<line number>:
+ClassTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d == approx( 1.23 ) )
+  REQUIRE( m_a == 1 )
 with expansion:
-  1.23 == Approx( 1.23 )
+  1 == 1
 
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == approx( 1.22 ) )
-with expansion:
-  1.23 == Approx( 1.22 )
+-------------------------------------------------------------------------------
+A couple of nested sections followed by a failure
+  Outer
+  Inner
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ApproxTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d == approx( 1.24 ) )
+with message:
+  that's not flying - that's failing in style
+
+-------------------------------------------------------------------------------
+A couple of nested sections followed by a failure
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+A failing expression with a non streamable type is still captured
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>: FAILED:
+  CHECK( &o1 == &o2 )
 with expansion:
-  1.23 == Approx( 1.24 )
+  0x<hex digits> == 0x<hex digits>
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>: FAILED:
+  CHECK( o1 == o2 )
+with expansion:
+  {?} == {?}
+
+-------------------------------------------------------------------------------
+AllOf matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( d != approx( 1.25 ) )
+  CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
 with expansion:
-  1.23 != Approx( 1.25 )
+  "this string contains 'abc' as a substring" ( contains: "string" and
+  contains: "abc" )
 
-ApproxTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+An expression with side-effects should only be evaluated once
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( approx( d ) == 1.23 )
+  REQUIRE( i++ == 7 )
 with expansion:
-  Approx( 1.23 ) == 1.23
+  7 == 7
 
-ApproxTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( approx( d ) == 1.22 )
+  REQUIRE( i++ == 8 )
 with expansion:
-  Approx( 1.23 ) == 1.22
+  8 == 8
 
-ApproxTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+An unchecked exception reports the line of the last assertion
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( approx( d ) == 1.24 )
+  CHECK( 1 == 1 )
+
+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+Anonymous test case 1
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:<line number>
+...............................................................................
+
+VariadicMacrosTests.cpp:<line number>:
+PASSED:
+with message:
+  anonymous test case
+
+-------------------------------------------------------------------------------
+AnyOf matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
 with expansion:
-  Approx( 1.23 ) == 1.24
+  "this string contains 'abc' as a substring" ( contains: "string" or contains:
+  "not there" )
 
-ApproxTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( approx( d ) != 1.25 )
+  CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
 with expansion:
-  Approx( 1.23 ) != 1.25
+  "this string contains 'abc' as a substring" ( contains: "not there" or
+  contains: "string" )
 
 -------------------------------------------------------------------------------
 Approximate PI
@@ -288,1096 +366,1074 @@ with expansion:
   3.1428571429 != Approx( 3.141 )
 
 -------------------------------------------------------------------------------
-A METHOD_AS_TEST_CASE based test run that succeeds
+Approximate comparisons with different epsilons
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( s == "hello" )
+  REQUIRE( d != Approx( 1.231 ) )
 with expansion:
-  "hello" == "hello"
-
--------------------------------------------------------------------------------
-A METHOD_AS_TEST_CASE based test run that fails
--------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
-...............................................................................
+  1.23 != Approx( 1.231 )
 
-ClassTests.cpp:<line number>: FAILED:
-  REQUIRE( s == "world" )
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
 with expansion:
-  "hello" == "world"
+  1.23 == Approx( 1.231 )
 
 -------------------------------------------------------------------------------
-A TEST_CASE_METHOD based test run that succeeds
+Approximate comparisons with floats
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( m_a == 1 )
+  REQUIRE( 1.23f == Approx( 1.23f ) )
 with expansion:
-  1 == 1
+  1.23f == Approx( 1.2300000191 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0.0f == Approx( 0.0f ) )
+with expansion:
+  0.0f == Approx( 0.0 )
 
 -------------------------------------------------------------------------------
-A TEST_CASE_METHOD based test run that fails
+Approximate comparisons with ints
 -------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-ClassTests.cpp:<line number>: FAILED:
-  REQUIRE( m_a == 2 )
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1 == Approx( 1 ) )
 with expansion:
-  1 == 2
+  1 == Approx( 1.0 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( 0 ) )
+with expansion:
+  0 == Approx( 0.0 )
 
 -------------------------------------------------------------------------------
-Equality checks that should succeed
+Approximate comparisons with mixed numeric types
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven == 7 )
+  REQUIRE( 1.0f == Approx( 1 ) )
 with expansion:
-  7 == 7
+  1.0f == Approx( 1.0 )
 
-ConditionTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
+  REQUIRE( 0 == Approx( dZero) )
 with expansion:
-  9.1f == Approx( 9.1000003815 )
+  0 == Approx( 0.0 )
 
-ConditionTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
+  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
-  3.1415926535 == Approx( 3.1415926535 )
+  0 == Approx( 0.00001 )
 
-ConditionTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello == "hello" )
+  REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
-  "hello" == "hello"
+  1.234f == Approx( 1.234 )
 
-ConditionTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( "hello" == data.str_hello )
+  REQUIRE( dMedium == Approx( 1.234f ) )
 with expansion:
-  "hello" == "hello"
+  1.234 == Approx( 1.2339999676 )
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello.size() == 5 )
-with expansion:
-  5 == 5
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( x == Approx( 1.3 ) )
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  1.3 == Approx( 1.3 )
+  true
 
 -------------------------------------------------------------------------------
-Equality checks that should fail
+Assertions then sections
+  A section
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven == 6 )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  7 == 6
+  true
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven == 8 )
-with expansion:
-  7 == 8
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+  Another section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven == 0 )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  7 == 0
+  true
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
-with expansion:
-  9.1f == Approx( 9.1099996567 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
-with expansion:
-  9.1f == Approx( 9.0 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 1 ) )
-with expansion:
-  9.1f == Approx( 1.0 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 0 ) )
-with expansion:
-  9.1f == Approx( 0.0 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.double_pi == Approx( 3.1415 ) )
-with expansion:
-  3.1415926535 == Approx( 3.1415 )
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello == "goodbye" )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  "hello" == "goodbye"
+  true
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello == "hell" )
-with expansion:
-  "hello" == "hell"
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello == "hello1" )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  "hello" == "hello1"
+  true
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello.size() == 6 )
-with expansion:
-  5 == 6
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+  Another other section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( x == Approx( 1.301 ) )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::alwaysTrue() )
 with expansion:
-  1.3 == Approx( 1.301 )
+  true
 
 -------------------------------------------------------------------------------
-Inequality checks that should succeed
+Comparing function pointers
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven != 6 )
+  REQUIRE( a )
 with expansion:
-  7 != 6
+  true
 
-ConditionTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven != 8 )
+  REQUIRE( a == &foo )
 with expansion:
-  7 != 8
+  0x<hex digits> == 0x<hex digits>
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
-with expansion:
-  9.1f != Approx( 9.1099996567 )
+-------------------------------------------------------------------------------
+Comparing member function pointers
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
+  CHECK( m == &S::f )
 with expansion:
-  9.1f != Approx( 9.0 )
+  0x<hex digits>
+  ==
+  0x<hex digits>
+
+-------------------------------------------------------------------------------
+Comparisons between ints where one side is computed
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
+  CHECK( 54 == 6*9 )
 with expansion:
-  9.1f != Approx( 1.0 )
+  54 == 54
+
+-------------------------------------------------------------------------------
+Comparisons between unsigned ints and negative signed ints match c++ standard
+behaviour
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
+  CHECK( ( -1 > 2u ) )
 with expansion:
-  9.1f != Approx( 0.0 )
+  true
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.double_pi != Approx( 3.1415 ) )
+  CHECK( -1 > 2u )
 with expansion:
-  3.1415926535 != Approx( 3.1415 )
+  -1 > 2
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello != "goodbye" )
+  CHECK( ( 2u < -1 ) )
 with expansion:
-  "hello" != "goodbye"
+  true
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello != "hell" )
+  CHECK( 2u < -1 )
 with expansion:
-  "hello" != "hell"
+  2 < -1
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello != "hello1" )
+  CHECK( ( minInt > 2u ) )
 with expansion:
-  "hello" != "hello1"
+  true
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello.size() != 6 )
-with expansion:
-  5 != 6
-
--------------------------------------------------------------------------------
-Inequality checks that should fail
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven != 7 )
-with expansion:
-  7 != 7
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
-with expansion:
-  9.1f != Approx( 9.1000003815 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.double_pi != Approx( 3.1415926535 ) )
-with expansion:
-  3.1415926535 != Approx( 3.1415926535 )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello != "hello" )
-with expansion:
-  "hello" != "hello"
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello.size() != 5 )
+  CHECK( minInt > 2u )
 with expansion:
-  5 != 5
+  -2147483648 > 2
 
 -------------------------------------------------------------------------------
-Ordering comparison checks that should succeed
+Comparisons with int literals don't warn when mixing signed/ unsigned
 -------------------------------------------------------------------------------
 ConditionTests.cpp:<line number>
 ...............................................................................
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven < 8 )
-with expansion:
-  7 < 8
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven > 6 )
+  REQUIRE( i == 1 )
 with expansion:
-  7 > 6
+  1 == 1
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven > 0 )
+  REQUIRE( ui == 2 )
 with expansion:
-  7 > 0
+  2 == 2
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven > -1 )
+  REQUIRE( l == 3 )
 with expansion:
-  7 > -1
+  3 == 3
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven >= 7 )
+  REQUIRE( ul == 4 )
 with expansion:
-  7 >= 7
+  4 == 4
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven >= 6 )
+  REQUIRE( c == 5 )
 with expansion:
-  7 >= 6
+  5 == 5
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven <= 7 )
+  REQUIRE( uc == 6 )
 with expansion:
-  7 <= 7
+  6 == 6
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.int_seven <= 8 )
+  REQUIRE( 1 == i )
 with expansion:
-  7 <= 8
+  1 == 1
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one > 9 )
+  REQUIRE( 2 == ui )
 with expansion:
-  9.1f > 9
+  2 == 2
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one < 10 )
+  REQUIRE( 3 == l )
 with expansion:
-  9.1f < 10
+  3 == 3
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.float_nine_point_one < 9.2 )
+  REQUIRE( 4 == ul )
 with expansion:
-  9.1f < 9.2
+  4 == 4
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello <= "hello" )
+  REQUIRE( 5 == c )
 with expansion:
-  "hello" <= "hello"
+  5 == 5
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello >= "hello" )
+  REQUIRE( 6 == uc )
 with expansion:
-  "hello" >= "hello"
+  6 == 6
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( data.str_hello < "hellp" )
+  REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
 with expansion:
-  "hello" < "hellp"
+  18446744073709551615 (0x<hex digits>)
+  >
+  4
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello < "zebra" )
-with expansion:
-  "hello" < "zebra"
+-------------------------------------------------------------------------------
+Contains string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello > "hellm" )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
 with expansion:
-  "hello" > "hellm"
+  "this string contains 'abc' as a substring" contains: "not there"
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello > "a" )
-with expansion:
-  "hello" > "a"
+-------------------------------------------------------------------------------
+Custom exceptions can be translated when testing for nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_NOTHROW( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
 
 -------------------------------------------------------------------------------
-Ordering comparison checks that should fail
+Custom exceptions can be translated when testing for throwing as something else
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven > 7 )
-with expansion:
-  7 > 7
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_AS( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 7 )
-with expansion:
-  7 < 7
+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven > 8 )
-with expansion:
-  7 > 8
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 6 )
-with expansion:
-  7 < 6
+-------------------------------------------------------------------------------
+Demonstrate that a non-const == is not used
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 0 )
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( t == 1u )
 with expansion:
-  7 < 0
+  {?} == 1
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < -1 )
+-------------------------------------------------------------------------------
+EndsWith string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
 with expansion:
-  7 < -1
+  "this string contains 'abc' as a substring" ends with: "this"
+
+-------------------------------------------------------------------------------
+Equality checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven >= 8 )
+  CHECK( data.int_seven == 6 )
 with expansion:
-  7 >= 8
+  7 == 6
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven <= 6 )
+  CHECK( data.int_seven == 8 )
 with expansion:
-  7 <= 6
+  7 == 8
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one < 9 )
+  CHECK( data.int_seven == 0 )
 with expansion:
-  9.1f < 9
+  7 == 0
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one > 10 )
+  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
-  9.1f > 10
+  9.1f == Approx( 9.1099996567 )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one > 9.2 )
+  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
-  9.1f > 9.2
+  9.1f == Approx( 9.0 )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello > "hello" )
+  CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
-  "hello" > "hello"
+  9.1f == Approx( 1.0 )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello < "hello" )
+  CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
-  "hello" < "hello"
+  9.1f == Approx( 0.0 )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello > "hellp" )
+  CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
-  "hello" > "hellp"
+  3.1415926535 == Approx( 3.1415 )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello > "z" )
+  CHECK( data.str_hello == "goodbye" )
 with expansion:
-  "hello" > "z"
+  "hello" == "goodbye"
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello < "hellm" )
+  CHECK( data.str_hello == "hell" )
 with expansion:
-  "hello" < "hellm"
+  "hello" == "hell"
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello < "a" )
+  CHECK( data.str_hello == "hello1" )
 with expansion:
-  "hello" < "a"
+  "hello" == "hello1"
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello >= "z" )
+  CHECK( data.str_hello.size() == 6 )
 with expansion:
-  "hello" >= "z"
+  5 == 6
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.str_hello <= "a" )
+  CHECK( x == Approx( 1.301 ) )
 with expansion:
-  "hello" <= "a"
+  1.3 == Approx( 1.301 )
 
 -------------------------------------------------------------------------------
-Comparisons with int literals don't warn when mixing signed/ unsigned
+Equality checks that should succeed
 -------------------------------------------------------------------------------
 ConditionTests.cpp:<line number>
 ...............................................................................
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( i == 1 )
+  REQUIRE( data.int_seven == 7 )
 with expansion:
-  1 == 1
+  7 == 7
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( ui == 2 )
+  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
-  2 == 2
+  9.1f == Approx( 9.1000003815 )
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( l == 3 )
+  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
-  3 == 3
+  3.1415926535 == Approx( 3.1415926535 )
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( ul == 4 )
+  REQUIRE( data.str_hello == "hello" )
 with expansion:
-  4 == 4
+  "hello" == "hello"
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( c == 5 )
+  REQUIRE( "hello" == data.str_hello )
 with expansion:
-  5 == 5
+  "hello" == "hello"
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( uc == 6 )
+  REQUIRE( data.str_hello.size() == 5 )
 with expansion:
-  6 == 6
+  5 == 5
 
 ConditionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 1 == i )
+  REQUIRE( x == Approx( 1.3 ) )
 with expansion:
-  1 == 1
+  1.3 == Approx( 1.3 )
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 2 == ui )
-with expansion:
-  2 == 2
+-------------------------------------------------------------------------------
+Equals
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 3 == l )
+  CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) )
 with expansion:
-  3 == 3
+  "this string contains 'abc' as a substring" equals: "this string contains
+  'abc' as a substring"
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 4 == ul )
-with expansion:
-  4 == 4
+-------------------------------------------------------------------------------
+Equals string matcher
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 5 == c )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
 with expansion:
-  5 == 5
+  "this string contains 'abc' as a substring" equals: "something else"
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 6 == uc )
-with expansion:
-  6 == 6
+-------------------------------------------------------------------------------
+Equals string matcher, with NULL
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
+  REQUIRE_THAT( "", Equals(nullptr) )
 with expansion:
-  18446744073709551615 (0x<hex digits>)
-  >
-  4
+  "" equals: ""
 
 -------------------------------------------------------------------------------
-comparisons between int variables
+Exception messages can be tested for
+  exact match
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( long_var == unsigned_char_var )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( long_var == unsigned_short_var )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
 
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( long_var == unsigned_int_var )
-with expansion:
-  1 == 1
+-------------------------------------------------------------------------------
+Exception messages can be tested for
+  different case
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( long_var == unsigned_long_var )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No ) )
 
 -------------------------------------------------------------------------------
-comparisons between const int variables
+Exception messages can be tested for
+  wildcarded
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( unsigned_char_var == 1 )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), StartsWith( "expected" ) )
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( unsigned_short_var == 1 )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), EndsWith( "exception" ) )
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( unsigned_int_var == 1 )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), Contains( "except" ) )
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( unsigned_long_var == 1 )
-with expansion:
-  1 == 1
+  REQUIRE_THROWS_WITH( thisThrows(), Contains( "exCept", Catch::CaseSensitive::No ) )
 
 -------------------------------------------------------------------------------
-Comparisons between unsigned ints and negative signed ints match c++ standard
-behaviour
+Expected exceptions that don't throw or unexpected exceptions fail the test
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_THROWS_AS( thisThrows() )
+due to unexpected exception with message:
+  expected exception
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_THROWS_AS( thisDoesntThrow() )
+because no exception was thrown where one was expected:
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK_NOTHROW( thisThrows() )
+due to unexpected exception with message:
+  expected exception
+
+-------------------------------------------------------------------------------
+FAIL aborts the test
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  This is a failure
+
+-------------------------------------------------------------------------------
+FAIL does not require an argument
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+
+-------------------------------------------------------------------------------
+Factorials are computed
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( ( -1 > 2u ) )
+  REQUIRE( Factorial(0) == 1 )
 with expansion:
-  true
+  1 == 1
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( -1 > 2u )
+  REQUIRE( Factorial(1) == 1 )
 with expansion:
-  -1 > 2
+  1 == 1
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( ( 2u < -1 ) )
+  REQUIRE( Factorial(2) == 2 )
 with expansion:
-  true
+  2 == 2
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( 2u < -1 )
+  REQUIRE( Factorial(3) == 6 )
 with expansion:
-  2 < -1
+  6 == 6
 
-ConditionTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( ( minInt > 2u ) )
+  REQUIRE( Factorial(10) == 3628800 )
 with expansion:
-  true
+  3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generator over a range of pairs
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  CHECK( minInt > 2u )
+  CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
-  -2147483648 > 2
+  0 == 0
 
 -------------------------------------------------------------------------------
-Comparisons between ints where one side is computed
+Generator over a range of pairs
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  CHECK( 54 == 6*9 )
+  CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
-  54 == 54
+  2 == 2
 
 -------------------------------------------------------------------------------
-Pointers can be compared to null
+Generators over two ranges
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( p == nullptr )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  NULL == nullptr
+  2 == 2
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( p == pNULL )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  NULL == NULL
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( p != nullptr )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  0x<hex digits> != nullptr
+  4 == 4
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( cp != nullptr )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  0x<hex digits> != nullptr
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( cpc != nullptr )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  0x<hex digits> != nullptr
+  6 == 6
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( returnsNull() == nullptr )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  {null string} == nullptr
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( returnsConstNull() == nullptr )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  {null string} == nullptr
+  8 == 8
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( nullptr != p )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  nullptr != 0x<hex digits>
+  200 == 200
 
 -------------------------------------------------------------------------------
-'Not' checks that should succeed
+Generators over two ranges
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( false == false )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( true == true )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( !false )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  true
+  30 == 30
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE_FALSE( false )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( !falseValue )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  true
+  40 == 40
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE_FALSE( falseValue )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  !false
+  200 == 200
 
-ConditionTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE( !(1 == 2) )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  true
+  42 == 42
 
-ConditionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE_FALSE( 1 == 2 )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  !(1 == 2)
+  200 == 200
 
 -------------------------------------------------------------------------------
-'Not' checks that should fail
+Generators over two ranges
 -------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( false != false )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( true != true )
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !true )
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  false
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( true )
+  72 == 72
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !trueValue )
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  false
+  200 == 200
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( trueValue )
-with expansion:
-  !true
+-------------------------------------------------------------------------------
+Generators over two ranges
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( !(1 == 1) )
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
-  false
+  2 == 2
 
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK_FALSE( 1 == 1 )
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  !(1 == 1)
+  202 == 202
 
 -------------------------------------------------------------------------------
-When checked exceptions are thrown they can be expected or unexpected
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_AS( thisThrows() )
-
-ExceptionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE_NOTHROW( thisDoesntThrow() )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  4 == 4
 
-ExceptionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  REQUIRE_THROWS( thisThrows() )
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-Expected exceptions that don't throw or unexpected exceptions fail the test
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_THROWS_AS( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_THROWS_AS( thisDoesntThrow() )
-because no exception was thrown where one was expected:
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
 
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK_NOTHROW( thisThrows() )
-due to unexpected exception with message:
-  expected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown directly they are always failures
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  8 == 8
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-An unchecked exception reports the line of the last assertion
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>:
+GeneratorTests.cpp:<line number>:
 PASSED:
-  CHECK( 1 == 1 )
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
 
-ExceptionTests.cpp:<line number>: FAILED:
-  {Unknown expression after the reported line}
-due to unexpected exception with message:
-  unexpected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown from sections they are always failures
-  section name
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-When unchecked exceptions are thrown from functions they are always failures
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
 
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK( thisThrows() == 0 )
-due to unexpected exception with message:
-  expected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown during a REQUIRE the test should abort
-fail
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE( thisThrows() == 0 )
-due to unexpected exception with message:
-  expected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  40 == 40
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-When unchecked exceptions are thrown during a CHECK the test should abort and
-fail
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  CHECK( thisThrows() == 0 )
-due to unexpected exception with message:
-  expected exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  42 == 42
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-Non-std exceptions can be translated
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  72 == 72
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
 
 -------------------------------------------------------------------------------
-Custom std-exceptions can be custom translated
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  custom std exception
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  2 == 2
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  204 == 204
 
 -------------------------------------------------------------------------------
-Custom exceptions can be translated when testing for nothrow
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_NOTHROW( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  4 == 4
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  204 == 204
 
 -------------------------------------------------------------------------------
-Custom exceptions can be translated when testing for throwing as something else
+Generators over two ranges
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_THROWS_AS( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-Unexpected exceptions can be translated
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>: FAILED:
-due to unexpected exception with message:
-  3.14
-
--------------------------------------------------------------------------------
-NotImplemented exception
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
-
--------------------------------------------------------------------------------
-Exception messages can be tested for
-  exact match
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
-
--------------------------------------------------------------------------------
-Exception messages can be tested for
-  different case
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No ) )
-
--------------------------------------------------------------------------------
-Exception messages can be tested for
-  wildcarded
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), StartsWith( "expected" ) )
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), EndsWith( "exception" ) )
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), Contains( "except" ) )
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), Contains( "exCept", Catch::CaseSensitive::No ) )
-
--------------------------------------------------------------------------------
-Mismatching exception messages failing the test
--------------------------------------------------------------------------------
-ExceptionTests.cpp:<line number>
-...............................................................................
-
-ExceptionTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
-
-ExceptionTests.cpp:<line number>: FAILED:
-  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
-with expansion:
-  expected exception
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
 GeneratorTests.cpp:<line number>:
@@ -1390,7 +1446,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1408,7 +1464,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1426,7 +1482,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1444,7 +1500,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1462,7 +1518,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1480,7 +1536,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1498,7 +1554,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  200 == 200
+  204 == 204
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1516,7 +1572,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1534,7 +1590,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1552,7 +1608,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1570,7 +1626,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1588,7 +1644,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1606,7 +1662,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1624,7 +1680,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1642,7 +1698,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1660,7 +1716,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  202 == 202
+  206 == 206
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1678,7 +1734,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1696,7 +1752,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1714,7 +1770,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1732,7 +1788,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1750,7 +1806,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1768,7 +1824,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1786,7 +1842,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1804,7 +1860,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1822,7 +1878,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  204 == 204
+  208 == 208
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1840,7 +1896,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1858,7 +1914,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1876,7 +1932,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1894,7 +1950,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1912,7 +1968,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1930,7 +1986,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1948,7 +2004,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1966,7 +2022,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -1984,7 +2040,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  206 == 206
+  210 == 210
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2002,7 +2058,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2020,7 +2076,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2038,7 +2094,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2056,7 +2112,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2074,7 +2130,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2092,7 +2148,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2110,7 +2166,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2128,7 +2184,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2146,7 +2202,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  208 == 208
+  212 == 212
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2164,7 +2220,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2182,7 +2238,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2200,7 +2256,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2218,7 +2274,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2236,7 +2292,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2254,7 +2310,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2272,7 +2328,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2290,7 +2346,7 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
 Generators over two ranges
@@ -2308,2769 +2364,634 @@ GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
-  210 == 210
+  214 == 214
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
+MessageTests.cpp:<line number>:
+warning:
+  this is a message
+  this is a warning
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+INFO gets logged on failure
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( a == 1 )
 with expansion:
-  212 == 212
+  2 == 1
+with messages:
+  this message should be logged
+  so should this
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+INFO gets logged on failure, even if captured before successful assertions
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+MessageTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( a == 2 )
 with expansion:
-  6 == 6
+  2 == 2
+with message:
+  this message may be logged later
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+MessageTests.cpp:<line number>: FAILED:
+  CHECK( a == 1 )
 with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  2 == 1
+with message:
+  this message should be logged
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+MessageTests.cpp:<line number>: FAILED:
+  CHECK( a == 0 )
 with expansion:
-  8 == 8
+  2 == 0
+with message:
+  and this, but later
 
-GeneratorTests.cpp:<line number>:
+MessageTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( a == 2 )
 with expansion:
-  212 == 212
+  2 == 2
+with message:
+  but not this
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Inequality checks that should fail
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven != 7 )
 with expansion:
-  10 == 10
+  7 != 7
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
-  212 == 212
+  9.1f != Approx( 9.1000003815 )
 
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.double_pi != Approx( 3.1415926535 ) )
+with expansion:
+  3.1415926535 != Approx( 3.1415926535 )
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello != "hello" )
 with expansion:
-  30 == 30
+  "hello" != "hello"
 
-GeneratorTests.cpp:<line number>:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello.size() != 5 )
 with expansion:
-  212 == 212
+  5 != 5
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Inequality checks that should succeed
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  REQUIRE( data.int_seven != 6 )
 with expansion:
-  40 == 40
+  7 != 6
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  REQUIRE( data.int_seven != 8 )
 with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  7 != 8
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
 with expansion:
-  42 == 42
+  9.1f != Approx( 9.1099996567 )
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
 with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  9.1f != Approx( 9.0 )
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
 with expansion:
-  72 == 72
+  9.1f != Approx( 1.0 )
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
 with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  9.1f != Approx( 0.0 )
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  REQUIRE( data.double_pi != Approx( 3.1415 ) )
 with expansion:
-  2 == 2
+  3.1415926535 != Approx( 3.1415 )
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  REQUIRE( data.str_hello != "goodbye" )
 with expansion:
-  214 == 214
+  "hello" != "goodbye"
 
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello != "hell" )
+with expansion:
+  "hello" != "hell"
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  REQUIRE( data.str_hello != "hello1" )
 with expansion:
-  4 == 4
+  "hello" != "hello1"
 
-GeneratorTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  REQUIRE( data.str_hello.size() != 6 )
 with expansion:
-  214 == 214
+  5 != 6
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Long strings can be wrapped
+  plain string
+  No wrapping
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
-  6 == 6
+  "one two three four"
+  ==
+  "one two three four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
-  214 == 214
+  "one two three four"
+  ==
+  "one two three four"
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Long strings can be wrapped
+  plain string
+  Wrapped once
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
 with expansion:
-  8 == 8
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
 with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
 with expansion:
-  10 == 10
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
 with expansion:
-  214 == 214
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" )
+with expansion:
+  "one two
+  three four"
+  ==
+  "one two
+  three four"
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Long strings can be wrapped
+  plain string
+  Wrapped twice
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
-  30 == 30
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
-  214 == 214
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
+with expansion:
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Long strings can be wrapped
+  plain string
+  Wrapped three times
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
-  40 == 40
+  "one
+  two
+  three
+  four"
+  ==
+  "one
+  two
+  three
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
-  214 == 214
+  "one
+  two
+  three
+  four"
+  ==
+  "one
+  two
+  three
+  four"
 
 -------------------------------------------------------------------------------
-Generators over two ranges
+Long strings can be wrapped
+  plain string
+  Short wrap
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
 with expansion:
-  42 == 42
+  "abc-
+  def"
+  ==
+  "abc-
+  def"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
 with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-Generators over two ranges
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  "abc-
+  defg"
+  ==
+  "abc-
+  defg"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+  CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
 with expansion:
-  72 == 72
+  "abc-
+  def-
+  gh"
+  ==
+  "abc-
+  def-
+  gh"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" )
 with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-Generator over a range of pairs
--------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
-...............................................................................
+  "one
+  two
+  thr-
+  ee
+  four"
+  ==
+  "one
+  two
+  thr-
+  ee
+  four"
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( i->first == i->second-1 )
+  CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
 with expansion:
-  0 == 0
+  "one
+  two
+  th-
+  ree
+  fo-
+  ur"
+  ==
+  "one
+  two
+  th-
+  ree
+  fo-
+  ur"
 
 -------------------------------------------------------------------------------
-Generator over a range of pairs
+Long strings can be wrapped
+  plain string
+  As container
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-GeneratorTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CATCH_REQUIRE( i->first == i->second-1 )
+  REQUIRE( text.size() == 4 )
 with expansion:
-  2 == 2
+  4 == 4
 
--------------------------------------------------------------------------------
-INFO and WARN do not abort tests
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( text[0] == "one" )
+with expansion:
+  "one" == "one"
 
-MessageTests.cpp:<line number>:
-warning:
-  this is a message
-  this is a warning
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( text[1] == "two" )
+with expansion:
+  "two" == "two"
 
--------------------------------------------------------------------------------
-SUCCEED counts as a test pass
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( text[2] == "three" )
+with expansion:
+  "three" == "three"
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-with message:
-  this is a success
+  CHECK( text[3] == "four" )
+with expansion:
+  "four" == "four"
 
 -------------------------------------------------------------------------------
-INFO gets logged on failure
+Long strings can be wrapped
+  plain string
+  Indent first line differently
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( a == 1 )
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( text.toString() == " one two\n    three\n    four" )
 with expansion:
-  2 == 1
-with messages:
-  this message should be logged
-  so should this
+  " one two
+      three
+      four"
+  ==
+  " one two
+      three
+      four"
 
 -------------------------------------------------------------------------------
-INFO gets logged on failure, even if captured before successful assertions
+Long strings can be wrapped
+  With newlines
+  No wrapping
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( a == 2 )
-with expansion:
-  2 == 2
-with message:
-  this message may be logged later
-
-MessageTests.cpp:<line number>: FAILED:
-  CHECK( a == 1 )
+  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
-  2 == 1
-with message:
-  this message should be logged
+  "one two
+  three four"
+  ==
+  "one two
+  three four"
 
-MessageTests.cpp:<line number>: FAILED:
-  CHECK( a == 0 )
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
-  2 == 0
-with message:
-  and this, but later
+  "one two
+  three four"
+  ==
+  "one two
+  three four"
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( a == 2 )
+  CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString )
 with expansion:
-  2 == 2
-with message:
-  but not this
-
--------------------------------------------------------------------------------
-FAIL aborts the test
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  This is a failure
-
--------------------------------------------------------------------------------
-FAIL does not require an argument
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
+  "one two
+  three four"
+  ==
+  "one two
+  three four"
 
 -------------------------------------------------------------------------------
-SUCCESS does not require an argument
+Long strings can be wrapped
+  With newlines
+  Trailing newline
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
+  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
+with expansion:
+  "abcdef
+  "
+  ==
+  "abcdef
+  "
 
--------------------------------------------------------------------------------
-Output from all sections is reported
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Message from section one
-
--------------------------------------------------------------------------------
-Output from all sections is reported
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Message from section two
-
-Message from section one
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'one'
-
-Message from section two
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
+with expansion:
+  "abcdef" == "abcdef"
 
-No assertions in section 'two'
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" )
+with expansion:
+  "abcdef
+  "
+  ==
+  "abcdef
+  "
 
 -------------------------------------------------------------------------------
-SCOPED_INFO is reset for each loop
+Long strings can be wrapped
+  With newlines
+  Wrapped once
 -------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
+  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
-  0 < 10
-with messages:
-  current counter 0
-  i := 0
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
+  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
-  1 < 10
-with messages:
-  current counter 1
-  i := 1
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
+  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
-  2 < 10
-with messages:
-  current counter 2
-  i := 2
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
 
-MessageTests.cpp:<line number>:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  3 < 10
-with messages:
-  current counter 3
-  i := 3
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  With newlines
+  Wrapped twice
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
+  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
-  4 < 10
-with messages:
-  current counter 4
-  i := 4
+  "one
+  two
+  three
+  four"
+  ==
+  "one
+  two
+  three
+  four"
 
-MessageTests.cpp:<line number>:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  5 < 10
-with messages:
-  current counter 5
-  i := 5
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  With tabs
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-MessageTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
+  CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" )
 with expansion:
-  6 < 10
-with messages:
-  current counter 6
-  i := 6
+  "one two three
+          four
+          five
+          six"
+  ==
+  "one two three
+          four
+          five
+          six"
 
-MessageTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+Long text is truncted
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  7 < 10
-with messages:
-  current counter 7
-  i := 7
-
-MessageTests.cpp:<line number>:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  8 < 10
-with messages:
-  current counter 8
-  i := 8
-
-MessageTests.cpp:<line number>:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  9 < 10
-with messages:
-  current counter 9
-  i := 9
-
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( i < 10 )
-with expansion:
-  10 < 10
-with messages:
-  current counter 10
-  i := 10
-
--------------------------------------------------------------------------------
-The NO_FAIL macro reports a failure but does not fail the test
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>:
-FAILED - but was ok:
-  CHECK_NOFAIL( 1 == 2 )
-
--------------------------------------------------------------------------------
-just failure
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-explicitly with message:
-  Previous info should not be seen
-
--------------------------------------------------------------------------------
-sends information to INFO
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>: FAILED:
-  REQUIRE( false )
-with messages:
-  hi
-  i := 7
-
--------------------------------------------------------------------------------
-Pointers can be converted to strings
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-MessageTests.cpp:<line number>:
-warning:
-  actual address of p: 0x<hex digits>
-
-MessageTests.cpp:<line number>:
-warning:
-  toString(p): 0x<hex digits>
-
--------------------------------------------------------------------------------
-random SECTION tests
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( b != a )
-with expansion:
-  2 != 1
-
--------------------------------------------------------------------------------
-random SECTION tests
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-nested SECTION tests
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( b != a )
-with expansion:
-  2 != 1
-
--------------------------------------------------------------------------------
-nested SECTION tests
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-more nested SECTION tests
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( a == b )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-more nested SECTION tests
-  s1
-  s3
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-more nested SECTION tests
-  s1
-  s4
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( a < b )
-with expansion:
-  1 < 2
-
--------------------------------------------------------------------------------
-even more nested SECTION tests
-  c
-  d (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-even more nested SECTION tests
-  c
-  e (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-even more nested SECTION tests
-  f (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-looped SECTION tests
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( b > a )
-with expansion:
-  0 > 1
-
--------------------------------------------------------------------------------
-looped tests
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[0] (1) is even
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[1] (1) is even
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  0 == 0
-with message:
-  Testing if fib[2] (2) is even
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[3] (3) is even
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[4] (5) is even
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  0 == 0
-with message:
-  Testing if fib[5] (8) is even
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[6] (13) is even
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[7] (21) is even
-
-A string sent directly to stdout
-A string sent directly to stderr
--------------------------------------------------------------------------------
-null strings
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( makeString( false ) != static_cast<char*>(nullptr) )
-with expansion:
-  "valid string" != {null string}
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( makeString( true ) == static_cast<char*>(nullptr) )
-with expansion:
-  {null string} == {null string}
-
--------------------------------------------------------------------------------
-checkedIf
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECKED_IF( flag )
-with expansion:
-  true
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( testCheckedIf( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-checkedIf, failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECKED_IF( flag )
-with expansion:
-  false
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( testCheckedIf( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-checkedElse
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECKED_ELSE( flag )
-with expansion:
-  true
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( testCheckedElse( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-checkedElse, failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECKED_ELSE( flag )
-with expansion:
-  false
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( testCheckedElse( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-xmlentitycheck
-  embedded xml
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-xmlentitycheck
-  encoded chars
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-send a single char to INFO
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  REQUIRE( false )
-with message:
-  3
-
--------------------------------------------------------------------------------
-atomic if
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( x == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-String matchers
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THAT( testStringForMatching(), Contains( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "string"
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), Contains( "abc" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "abc"
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), StartsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "this"
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "substring"
-
--------------------------------------------------------------------------------
-Contains string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "not there"
-
--------------------------------------------------------------------------------
-StartsWith string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "string"
-
--------------------------------------------------------------------------------
-EndsWith string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "this"
-
--------------------------------------------------------------------------------
-Equals string matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
-with expansion:
-  "this string contains 'abc' as a substring" equals: "something else"
-
--------------------------------------------------------------------------------
-Equals string matcher, with NULL
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE_THAT( "", Equals(nullptr) )
-with expansion:
-  "" equals: ""
-
--------------------------------------------------------------------------------
-AllOf matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( contains: "string" and
-  contains: "abc" )
-
--------------------------------------------------------------------------------
-AnyOf matcher
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( contains: "string" or contains:
-  "not there" )
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( contains: "not there" or
-  contains: "string" )
-
--------------------------------------------------------------------------------
-Equals
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" equals: "this string contains
-  'abc' as a substring"
-
--------------------------------------------------------------------------------
-Matchers can be (AllOf) composed with the && operator
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( contains: "string" and
-  contains: "abc" and contains: "substring" and contains: "contains" )
-
--------------------------------------------------------------------------------
-Matchers can be (AnyOf) composed with the || operator
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( contains: "string" or contains:
-  "different" or contains: "random" )
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
-with expansion:
-  "some completely different text that contains one common word" ( contains:
-  "string" or contains: "different" or contains: "random" )
-
--------------------------------------------------------------------------------
-Matchers can be composed with both && and ||
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( ( contains: "string" or
-  contains: "different" ) and contains: "substring" )
-
--------------------------------------------------------------------------------
-Matchers can be composed with both && and || - failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ( ( contains: "string" or
-  contains: "different" ) and contains: "random" )
-
--------------------------------------------------------------------------------
-Matchers can be negated (Not) with the ! operator
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
-with expansion:
-  "this string contains 'abc' as a substring" not contains: "different"
-
--------------------------------------------------------------------------------
-Matchers can be negated (Not) with the ! operator - failing
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" not contains: "substring"
-
--------------------------------------------------------------------------------
-Factorials are computed
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Factorial(0) == 1 )
-with expansion:
-  1 == 1
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Factorial(1) == 1 )
-with expansion:
-  1 == 1
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Factorial(2) == 2 )
-with expansion:
-  2 == 2
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Factorial(3) == 6 )
-with expansion:
-  6 == 6
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Factorial(10) == 3628800 )
-with expansion:
-  3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-Nice descriptive name
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-warning:
-  This one ran
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing bigger changes size and capacity
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 10 )
-with expansion:
-  10 == 10
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing smaller changes size but not capacity
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing smaller changes size but not capacity
-  We can use the 'swap trick' to reset the capacity
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  reserving bigger changes capacity but not size
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  reserving smaller does not change size or capacity
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-A couple of nested sections followed by a failure
-  Outer
-  Inner
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-with message:
-  that's not flying - that's failing in style
-
--------------------------------------------------------------------------------
-A couple of nested sections followed by a failure
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-not allowed
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-
--------------------------------------------------------------------------------
-Tabs and newlines show in output
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>: FAILED:
-  CHECK( s1 == s2 )
-with expansion:
-  "if ($b == 10) {
-  		$a= 20;
-  }"
-  ==
-  "if ($b == 10) {
-  $a = 20;
-  }
-  "
-
--------------------------------------------------------------------------------
-toString on const wchar_t const pointer returns the string contents
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( result == "\"wide load\"" )
-with expansion:
-  ""wide load"" == ""wide load""
-
--------------------------------------------------------------------------------
-toString on const wchar_t pointer returns the string contents
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( result == "\"wide load\"" )
-with expansion:
-  ""wide load"" == ""wide load""
-
--------------------------------------------------------------------------------
-toString on wchar_t const pointer returns the string contents
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( result == "\"wide load\"" )
-with expansion:
-  ""wide load"" == ""wide load""
-
--------------------------------------------------------------------------------
-toString on wchar_t returns the string contents
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  CHECK( result == "\"wide load\"" )
-with expansion:
-  ""wide load"" == ""wide load""
-
--------------------------------------------------------------------------------
-XmlEncode
-  normal string
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "normal string" ) == "normal string" )
-with expansion:
-  "normal string" == "normal string"
-
--------------------------------------------------------------------------------
-XmlEncode
-  empty string
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "" ) == "" )
-with expansion:
-  "" == ""
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with ampersand
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "smith & jones" ) == "smith &amp; jones" )
-with expansion:
-  "smith &amp; jones" == "smith &amp; jones"
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with less-than
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "smith < jones" ) == "smith &lt; jones" )
-with expansion:
-  "smith &lt; jones" == "smith &lt; jones"
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with greater-than
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "smith > jones" ) == "smith > jones" )
-with expansion:
-  "smith > jones" == "smith > jones"
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "smith ]]> jones" ) == "smith ]]&gt; jones" )
-with expansion:
-  "smith ]]&gt; jones"
-  ==
-  "smith ]]&gt; jones"
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with quotes
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( stringWithQuotes ) == stringWithQuotes )
-with expansion:
-  "don't "quote" me on that"
-  ==
-  "don't "quote" me on that"
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" )
-with expansion:
-  "don't &quot;quote&quot; me on that"
-  ==
-  "don't &quot;quote&quot; me on that"
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with control char (1)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "[\x01]" ) == "[&#x01;]" )
-with expansion:
-  "[&#x01;]" == "[&#x01;]"
-
--------------------------------------------------------------------------------
-XmlEncode
-  string with control char (x7F)
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" )
-with expansion:
-  "[&#x7F;]" == "[&#x7F;]"
-
--------------------------------------------------------------------------------
-long long
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-  REQUIRE( l == std::numeric_limits<long long>::max() )
-with expansion:
-  9223372036854775807 (0x<hex digits>)
-  ==
-  9223372036854775807 (0x<hex digits>)
-
--------------------------------------------------------------------------------
-This test 'should' fail but doesn't
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-with message:
-  oops!
-
--------------------------------------------------------------------------------
-# A test name that starts with a #
--------------------------------------------------------------------------------
-MiscTests.cpp:<line number>
-...............................................................................
-
-MiscTests.cpp:<line number>:
-PASSED:
-with message:
-  yay
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  default - no arguments
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.shouldDebugBreak == false )
-with expansion:
-  false == false
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.abortAfter == -1 )
-with expansion:
-  -1 == -1
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.noThrow == false )
-with expansion:
-  false == false
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.reporterNames.empty() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  1 test
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  Specify one test case exclusion using exclude:
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  Specify one test case exclusion using ~
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  -r/console
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames[0] == "console" )
-with expansion:
-  "console" == "console"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  -r/xml
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames[0] == "xml" )
-with expansion:
-  "xml" == "xml"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  -r xml and junit
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames.size() == 2 )
-with expansion:
-  2 == 2
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames[0] == "xml" )
-with expansion:
-  "xml" == "xml"
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames[1] == "junit" )
-with expansion:
-  "junit" == "junit"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  --reporter/junit
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.reporterNames[0] == "junit" )
-with expansion:
-  "junit" == "junit"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  debugger
-  -b
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.shouldDebugBreak == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  debugger
-  --break
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.shouldDebugBreak )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -a aborts after first failure
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.abortAfter == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -x 2 aborts after two failures
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.abortAfter == 2 )
-with expansion:
-  2 == 2
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -x must be greater than zero
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) )
-with expansion:
-  "Value after -x or --abortAfter must be greater than zero
-  - while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -x must be numeric
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) )
-with expansion:
-  "Unable to convert oops to destination type
-  - while parsing: (-x, --abortx <no. failures>)" contains: "-x"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  nothrow
-  -e
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  nothrow
-  --nothrow
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  output filename
-  -o filename
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.outputFilename == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  output filename
-  --out
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.outputFilename == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  combinations
-  Single character flags can be combined
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.abortAfter == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.shouldDebugBreak )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  use-colour
-  without option
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.useColour == UseColour::Auto )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  use-colour
-  auto
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.useColour == UseColour::Auto )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  use-colour
-  yes
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.useColour == UseColour::Yes )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  use-colour
-  no
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( config.useColour == UseColour::No )
-with expansion:
-  2 == 2
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  use-colour
-  error
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE_THROWS_WITH( parseIntoConfig( argv, config ), Contains( "colour mode must be one of" ) )
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  No wrapping
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
-with expansion:
-  "one two three four"
-  ==
-  "one two three four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
-with expansion:
-  "one two three four"
-  ==
-  "one two three four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Wrapped once
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Wrapped twice
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Wrapped three times
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
-with expansion:
-  "one
-  two
-  three
-  four"
-  ==
-  "one
-  two
-  three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" )
-with expansion:
-  "one
-  two
-  three
-  four"
-  ==
-  "one
-  two
-  three
-  four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Short wrap
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
-with expansion:
-  "abc-
-  def"
-  ==
-  "abc-
-  def"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
-with expansion:
-  "abc-
-  defg"
-  ==
-  "abc-
-  defg"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
-with expansion:
-  "abc-
-  def-
-  gh"
-  ==
-  "abc-
-  def-
-  gh"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" )
-with expansion:
-  "one
-  two
-  thr-
-  ee
-  four"
-  ==
-  "one
-  two
-  thr-
-  ee
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
-with expansion:
-  "one
-  two
-  th-
-  ree
-  fo-
-  ur"
-  ==
-  "one
-  two
-  th-
-  ree
-  fo-
-  ur"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  As container
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  REQUIRE( text.size() == 4 )
-with expansion:
-  4 == 4
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( text[0] == "one" )
-with expansion:
-  "one" == "one"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( text[1] == "two" )
-with expansion:
-  "two" == "two"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( text[2] == "three" )
-with expansion:
-  "three" == "three"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( text[3] == "four" )
-with expansion:
-  "four" == "four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Indent first line differently
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( text.toString() == " one two\n    three\n    four" )
-with expansion:
-  " one two
-      three
-      four"
-  ==
-  " one two
-      three
-      four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  With newlines
-  No wrapping
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  With newlines
-  Trailing newline
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
-with expansion:
-  "abcdef
-  "
-  ==
-  "abcdef
-  "
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
-with expansion:
-  "abcdef" == "abcdef"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" )
-with expansion:
-  "abcdef
-  "
-  ==
-  "abcdef
-  "
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  With newlines
-  Wrapped once
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  With newlines
-  Wrapped twice
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
-with expansion:
-  "one
-  two
-  three
-  four"
-  ==
-  "one
-  two
-  three
-  four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  With tabs
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" )
-with expansion:
-  "one two three
-          four
-          five
-          six"
-  ==
-  "one two three
-          four
-          five
-          six"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace single char
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( letters, "b", "z" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == "azcdefcg" )
-with expansion:
-  "azcdefcg" == "azcdefcg"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace two chars
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( letters, "c", "z" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == "abzdefzg" )
-with expansion:
-  "abzdefzg" == "abzdefzg"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace first char
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( letters, "a", "z" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == "zbcdefcg" )
-with expansion:
-  "zbcdefcg" == "zbcdefcg"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace last char
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( letters, "g", "z" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == "abcdefcz" )
-with expansion:
-  "abcdefcz" == "abcdefcz"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace all chars
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( letters, letters, "replaced" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == "replaced" )
-with expansion:
-  "replaced" == "replaced"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  replace no chars
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_FALSE( replaceInPlace( letters, "x", "z" ) )
-with expansion:
-  !false
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( letters == letters )
-with expansion:
-  "abcdefcg" == "abcdefcg"
-
--------------------------------------------------------------------------------
-replaceInPlace
-  escape '
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( replaceInPlace( s, "'", "|'" ) )
-with expansion:
-  true
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( s == "didn|'t" )
-with expansion:
-  "didn|'t" == "didn|'t"
-
-hello
-hello
--------------------------------------------------------------------------------
-Text can be formatted using the Text class
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "hi there" ).toString() == "hi there" )
-with expansion:
-  "hi there" == "hi there"
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
-with expansion:
-  "hi
-  there"
-  ==
-  "hi
-  there"
-
--------------------------------------------------------------------------------
-Long text is truncted
--------------------------------------------------------------------------------
-TestMain.cpp:<line number>
-...............................................................................
-
-TestMain.cpp:<line number>:
-PASSED:
-  CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) )
+  CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) )
 with expansion:
   "***************************************************************************-
   ***-
@@ -6075,513 +3996,2547 @@ with expansion:
 ... message truncated due to excessive size
 
 -------------------------------------------------------------------------------
-ManuallyRegistered
+ManuallyRegistered
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+with message:
+  was called
+
+-------------------------------------------------------------------------------
+Matchers can be (AllOf) composed with the && operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string" and
+  contains: "abc" and contains: "substring" and contains: "contains" )
+
+-------------------------------------------------------------------------------
+Matchers can be (AnyOf) composed with the || operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string" or contains:
+  "different" or contains: "random" )
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+with expansion:
+  "some completely different text that contains one common word" ( contains:
+  "string" or contains: "different" or contains: "random" )
+
+-------------------------------------------------------------------------------
+Matchers can be composed with both && and ||
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "substring" )
+
+-------------------------------------------------------------------------------
+Matchers can be composed with both && and || - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "random" )
+
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
+with expansion:
+  "this string contains 'abc' as a substring" not contains: "different"
+
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
+with expansion:
+  "this string contains 'abc' as a substring" not contains: "substring"
+
+-------------------------------------------------------------------------------
+Mismatching exception messages failing the test
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS_WITH( thisThrows(), "expected exception" )
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
+with expansion:
+  expected exception
+
+-------------------------------------------------------------------------------
+Nice descriptive name
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+warning:
+  This one ran
+
+-------------------------------------------------------------------------------
+Non-std exceptions can be translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
+-------------------------------------------------------------------------------
+NotImplemented exception
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
+
+-------------------------------------------------------------------------------
+Objects that evaluated in boolean contexts can be checked
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  CHECK( True )
+with expansion:
+  true
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  CHECK( !False )
+with expansion:
+  true
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( False )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Operators at different namespace levels not hijacked by Koenig lookup
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0x<hex digits> == o )
+with expansion:
+  3221225472 (0x<hex digits>) == {?}
+
+-------------------------------------------------------------------------------
+Ordering comparison checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven > 7 )
+with expansion:
+  7 > 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 7 )
+with expansion:
+  7 < 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven > 8 )
+with expansion:
+  7 > 8
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 6 )
+with expansion:
+  7 < 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 0 )
+with expansion:
+  7 < 0
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < -1 )
+with expansion:
+  7 < -1
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven >= 8 )
+with expansion:
+  7 >= 8
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven <= 6 )
+with expansion:
+  7 <= 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one < 9 )
+with expansion:
+  9.1f < 9
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 10 )
+with expansion:
+  9.1f > 10
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 9.2 )
+with expansion:
+  9.1f > 9.2
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello > "hello" )
+with expansion:
+  "hello" > "hello"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello < "hello" )
+with expansion:
+  "hello" < "hello"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello > "hellp" )
+with expansion:
+  "hello" > "hellp"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello > "z" )
+with expansion:
+  "hello" > "z"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello < "hellm" )
+with expansion:
+  "hello" < "hellm"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello < "a" )
+with expansion:
+  "hello" < "a"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello >= "z" )
+with expansion:
+  "hello" >= "z"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello <= "a" )
+with expansion:
+  "hello" <= "a"
+
+-------------------------------------------------------------------------------
+Ordering comparison checks that should succeed
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven < 8 )
+with expansion:
+  7 < 8
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > 6 )
+with expansion:
+  7 > 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > 0 )
+with expansion:
+  7 > 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > -1 )
+with expansion:
+  7 > -1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven >= 7 )
+with expansion:
+  7 >= 7
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven >= 6 )
+with expansion:
+  7 >= 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven <= 7 )
+with expansion:
+  7 <= 7
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven <= 8 )
+with expansion:
+  7 <= 8
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one > 9 )
+with expansion:
+  9.1f > 9
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 10 )
+with expansion:
+  9.1f < 10
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 9.2 )
+with expansion:
+  9.1f < 9.2
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello <= "hello" )
+with expansion:
+  "hello" <= "hello"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello >= "hello" )
+with expansion:
+  "hello" >= "hello"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello < "hellp" )
+with expansion:
+  "hello" < "hellp"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello < "zebra" )
+with expansion:
+  "hello" < "zebra"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello > "hellm" )
+with expansion:
+  "hello" > "hellm"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello > "a" )
+with expansion:
+  "hello" > "a"
+
+-------------------------------------------------------------------------------
+Output from all sections is reported
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section one
+
+-------------------------------------------------------------------------------
+Output from all sections is reported
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section two
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Empty test spec should have no filters
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Test spec from empty string should have no filters
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches(tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Test spec from just a comma should have no filters
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Test spec from name should have one filter
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Test spec from quoted name should have one filter
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Test spec from name should have one filter
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcard at the start
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( parseTestSpec( "*a" ).matches( tcA ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcard at the end
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( parseTestSpec( "a*" ).matches( tcA ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcard at both ends
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at the start
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at the end
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at both ends
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcard at both ends, redundant at start
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Just wildcard
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Single tag
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Single tag, two matches
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Two tags
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Two tags, spare separated
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcarded name and tag
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Single tag exclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  One tag exclusion and one tag inclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  One tag exclusion and one wldcarded name inclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  One tag exclusion, using exclude:, and one wldcarded name inclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  name exclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  wildcarded name exclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  wildcarded name exclusion with tag inclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  wildcarded name exclusion, using exclude:, with tag inclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  two wildcarded names
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  empty tag
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  empty quoted name
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  quoted string followed by tag exclusion
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Parsing a std::pair
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
+with expansion:
+  std::pair( 1, 2 ) == std::pair( 1, 2 )
+
+-------------------------------------------------------------------------------
+Pointers can be compared to null
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p == nullptr )
+with expansion:
+  NULL == nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p == pNULL )
+with expansion:
+  NULL == NULL
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p != nullptr )
+with expansion:
+  0x<hex digits> != nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( cp != nullptr )
+with expansion:
+  0x<hex digits> != nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( cpc != nullptr )
+with expansion:
+  0x<hex digits> != nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( returnsNull() == nullptr )
+with expansion:
+  {null string} == nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( returnsConstNull() == nullptr )
+with expansion:
+  {null string} == nullptr
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( nullptr != p )
+with expansion:
+  nullptr != 0x<hex digits>
+
+-------------------------------------------------------------------------------
+Pointers can be converted to strings
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+warning:
+  actual address of p: 0x<hex digits>
+
+MessageTests.cpp:<line number>:
+warning:
+  toString(p): 0x<hex digits>
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  default - no arguments
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.shouldDebugBreak == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.abortAfter == -1 )
+with expansion:
+  -1 == -1
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.noThrow == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.reporterNames.empty() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  test lists
+  1 test
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  test lists
+  Specify one test case exclusion using exclude:
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  test lists
+  Specify one test case exclusion using ~
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  reporter
+  -r/console
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames[0] == "console" )
+with expansion:
+  "console" == "console"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  reporter
+  -r/xml
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames[0] == "xml" )
+with expansion:
+  "xml" == "xml"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  reporter
+  -r xml and junit
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames.size() == 2 )
+with expansion:
+  2 == 2
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames[0] == "xml" )
+with expansion:
+  "xml" == "xml"
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames[1] == "junit" )
+with expansion:
+  "junit" == "junit"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  reporter
+  --reporter/junit
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.reporterNames[0] == "junit" )
+with expansion:
+  "junit" == "junit"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  debugger
+  -b
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.shouldDebugBreak == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  debugger
+  --break
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.shouldDebugBreak )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  abort
+  -a aborts after first failure
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.abortAfter == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  abort
+  -x 2 aborts after two failures
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.abortAfter == 2 )
+with expansion:
+  2 == 2
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  abort
+  -x must be greater than zero
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) )
+with expansion:
+  "Value after -x or --abortAfter must be greater than zero
+  - while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  abort
+  -x must be numeric
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) )
+with expansion:
+  "Unable to convert oops to destination type
+  - while parsing: (-x, --abortx <no. failures>)" contains: "-x"
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  nothrow
+  -e
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.noThrow == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  nothrow
+  --nothrow
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.noThrow == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  output filename
+  -o filename
 -------------------------------------------------------------------------------
 TestMain.cpp:<line number>
 ...............................................................................
 
 TestMain.cpp:<line number>:
 PASSED:
-with message:
-  was called
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.outputFilename == "filename.ext" )
+with expansion:
+  "filename.ext" == "filename.ext"
 
 -------------------------------------------------------------------------------
-Parsing a std::pair
+Process can be configured on command line
+  output filename
+  --out
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
-  std::pair( 1, 2 ) == std::pair( 1, 2 )
+  "filename.ext" == "filename.ext"
 
 -------------------------------------------------------------------------------
-Where there is more to the expression after the RHS
+Process can be configured on command line
+  combinations
+  Single character flags can be combined
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.abortAfter == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.shouldDebugBreak )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( config.noThrow == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  without option
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::Auto )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  auto
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::Auto )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  yes
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::Yes )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  no
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::No )
+with expansion:
+  2 == 2
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
   error
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS_WITH( parseIntoConfig( argv, config ), Contains( "colour mode must be one of" ) )
+
+-------------------------------------------------------------------------------
+SCOPED_INFO is reset for each loop
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  0 < 10
+with messages:
+  current counter 0
+  i := 0
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  1 < 10
+with messages:
+  current counter 1
+  i := 1
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  2 < 10
+with messages:
+  current counter 2
+  i := 2
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  3 < 10
+with messages:
+  current counter 3
+  i := 3
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  4 < 10
+with messages:
+  current counter 4
+  i := 4
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  5 < 10
+with messages:
+  current counter 5
+  i := 5
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  6 < 10
+with messages:
+  current counter 6
+  i := 6
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  7 < 10
+with messages:
+  current counter 7
+  i := 7
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  8 < 10
+with messages:
+  current counter 8
+  i := 8
+
+MessageTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i < 10 )
+with expansion:
+  9 < 10
+with messages:
+  current counter 9
+  i := 9
+
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( i < 10 )
+with expansion:
+  10 < 10
+with messages:
+  current counter 10
+  i := 10
 
 -------------------------------------------------------------------------------
-Where the LHS is not a simple value
+SUCCEED counts as a test pass
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
-  error
+MessageTests.cpp:<line number>:
+PASSED:
+with message:
+  this is a success
 
 -------------------------------------------------------------------------------
-A failing expression with a non streamable type is still captured
+SUCCESS does not require an argument
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
-  CHECK( &o1 == &o2 )
-with expansion:
-  0x<hex digits> == 0x<hex digits>
-
-TrickyTests.cpp:<line number>: FAILED:
-  CHECK( o1 == o2 )
-with expansion:
-  {?} == {?}
+MessageTests.cpp:<line number>:
+PASSED:
 
 -------------------------------------------------------------------------------
-string literals of different sizes can be compared
+Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
+          methods
+     Given: No operations precede me
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>: FAILED:
-  REQUIRE( std::string( "first" ) == "second" )
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( before == 0 )
 with expansion:
-  "first" == "second"
+  0 == 0
 
 -------------------------------------------------------------------------------
-An expression with side-effects should only be evaluated once
+Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
+          methods
+     Given: No operations precede me
+      When: We get the count
+      Then: Subsequently values are higher
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  REQUIRE( i++ == 7 )
-with expansion:
-  7 == 7
-
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( i++ == 8 )
+  REQUIRE( after > before )
 with expansion:
-  8 == 8
+  1 > 0
 
 -------------------------------------------------------------------------------
-Operators at different namespace levels not hijacked by Koenig lookup
+Scenario: Do that thing with the thing
+     Given: This stuff exists
+      When: I do this
+      Then: it should do this
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 0x<hex digits> == o )
+  REQUIRE( itDoesThis() )
 with expansion:
-  3221225472 (0x<hex digits>) == {?}
+  true
 
 -------------------------------------------------------------------------------
-Demonstrate that a non-const == is not used
+Scenario: Do that thing with the thing
+     Given: This stuff exists
+      When: I do this
+      Then: it should do this
+       And: do that
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( t == 1u )
+  REQUIRE( itDoesThat() )
 with expansion:
-  {?} == 1
+  true
 
 -------------------------------------------------------------------------------
-Test enum bit values
+Scenario: This is a really long scenario name to see how the list command deals
+          with wrapping
+     Given: A section name that is so long that it cannot fit in a single
+            console width
+      When: The test headers are printed as part of the normal running of the
+            scenario
+      Then: The, deliberately very long and overly verbose (you see what I did
+            there?) section names must wrap, along with an indent
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( 0x<hex digits> == bit30and31 )
-with expansion:
-  3221225472 (0x<hex digits>) == 3221225472
+with message:
+  boo!
 
 -------------------------------------------------------------------------------
-boolean member
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( obj.prop != nullptr )
+  REQUIRE( v.size() == 0 )
 with expansion:
-  0x<hex digits> != nullptr
+  0 == 0
 
 -------------------------------------------------------------------------------
-(unimplemented) static bools can be evaluated
-  compare to true
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+      When: it is made larger
+      Then: the size and capacity go up
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( is_true<true>::value == true )
+  REQUIRE( v.size() == 10 )
 with expansion:
-  true == true
+  10 == 10
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( true == is_true<true>::value )
+  REQUIRE( v.capacity() >= 10 )
 with expansion:
-  true == true
+  10 >= 10
 
 -------------------------------------------------------------------------------
-(unimplemented) static bools can be evaluated
-  compare to false
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+      When: it is made larger
+      Then: the size and capacity go up
+  And when: it is made smaller again
+      Then: the size goes down but the capacity stays the same
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  REQUIRE( is_true<false>::value == false )
-with expansion:
-  false == false
-
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( false == is_true<false>::value )
+  REQUIRE( v.size() == 5 )
 with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-(unimplemented) static bools can be evaluated
-  negation
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+  5 == 5
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( !is_true<false>::value )
+  REQUIRE( v.capacity() >= 10 )
 with expansion:
-  true
+  10 >= 10
 
 -------------------------------------------------------------------------------
-(unimplemented) static bools can be evaluated
-  double negation
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( !!is_true<true>::value )
+  REQUIRE( v.size() == 0 )
 with expansion:
-  true
+  0 == 0
 
 -------------------------------------------------------------------------------
-(unimplemented) static bools can be evaluated
-  direct
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+      When: we reserve more space
+      Then: The capacity is increased but the size remains the same
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+BDDTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE( is_true<true>::value )
+  REQUIRE( v.capacity() >= 10 )
 with expansion:
-  true
+  10 >= 10
 
-TrickyTests.cpp:<line number>:
+BDDTests.cpp:<line number>:
 PASSED:
-  REQUIRE_FALSE( is_true<false>::value )
+  REQUIRE( v.size() == 0 )
 with expansion:
-  !false
+  0 == 0
 
+A string sent directly to stdout
+A string sent directly to stderr
 -------------------------------------------------------------------------------
-Objects that evaluated in boolean contexts can be checked
+Some simple comparisons between doubles
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  CHECK( True )
+  REQUIRE( d == Approx( 1.23 ) )
 with expansion:
-  true
+  1.23 == Approx( 1.23 )
 
-TrickyTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  CHECK( !False )
+  REQUIRE( d != Approx( 1.22 ) )
 with expansion:
-  true
+  1.23 != Approx( 1.22 )
 
-TrickyTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  CHECK_FALSE( False )
+  REQUIRE( d != Approx( 1.24 ) )
 with expansion:
-  !false
-
--------------------------------------------------------------------------------
-Assertions then sections
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+  1.23 != Approx( 1.24 )
 
-TrickyTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::alwaysTrue() )
+  REQUIRE( Approx( d ) == 1.23 )
 with expansion:
-  true
+  Approx( 1.23 ) == 1.23
 
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Approx( d ) != 1.22 )
+with expansion:
+  Approx( 1.23 ) != 1.22
 
-TrickyTests.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::alwaysTrue() )
+  REQUIRE( Approx( d ) != 1.24 )
 with expansion:
-  true
+  Approx( 1.23 ) != 1.24
 
+Message from section one
 -------------------------------------------------------------------------------
-Assertions then sections
-  A section
-  Another section
+Standard output from all sections is reported
+  one
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::alwaysTrue() )
-with expansion:
-  true
 
+No assertions in section 'one'
+
+Message from section two
 -------------------------------------------------------------------------------
-Assertions then sections
+Standard output from all sections is reported
+  two
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::alwaysTrue() )
-with expansion:
-  true
+
+No assertions in section 'two'
 
 -------------------------------------------------------------------------------
-Assertions then sections
-  A section
+StartsWith string matcher
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::alwaysTrue() )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
 with expansion:
-  true
+  "this string contains 'abc' as a substring" starts with: "string"
 
 -------------------------------------------------------------------------------
-Assertions then sections
-  A section
-  Another other section
+String matchers
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::alwaysTrue() )
+  REQUIRE_THAT( testStringForMatching(), Contains( "string" ) )
 with expansion:
-  true
-
--------------------------------------------------------------------------------
-non streamable - with conv. op
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+  "this string contains 'abc' as a substring" contains: "string"
 
-TrickyTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( s == "7" )
+  CHECK_THAT( testStringForMatching(), Contains( "abc" ) )
 with expansion:
-  "7" == "7"
-
--------------------------------------------------------------------------------
-Comparing function pointers
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+  "this string contains 'abc' as a substring" contains: "abc"
 
-TrickyTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( a )
+  CHECK_THAT( testStringForMatching(), StartsWith( "this" ) )
 with expansion:
-  true
+  "this string contains 'abc' as a substring" starts with: "this"
 
-TrickyTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( a == &foo )
+  CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
 with expansion:
-  0x<hex digits> == 0x<hex digits>
+  "this string contains 'abc' as a substring" ends with: "substring"
 
+hello
+hello
 -------------------------------------------------------------------------------
-Comparing member function pointers
+Tabs and newlines show in output
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
-PASSED:
-  CHECK( m == &S::f )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( s1 == s2 )
 with expansion:
-  0x<hex digits>
+  "if ($b == 10) {
+  		$a= 20;
+  }"
   ==
-  0x<hex digits>
+  "if ($b == 10) {
+  $a = 20;
+  }
+  "
 
 -------------------------------------------------------------------------------
-pointer to class
+Tag alias can be registered against tag patterns
+  The same tag alias can only be registered once
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+TagAliasTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
-  REQUIRE( p == 0 )
+  CHECK_THAT( what, Contains( "[@zzz]" ) )
 with expansion:
-  NULL == 0
-
--------------------------------------------------------------------------------
-null_ptr
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+  "error: tag alias, "[@zzz]" already registered.
+  First seen at file:2
+  Redefined at file:10" contains: "
+  [@zzz]"
 
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
-  REQUIRE( ptr.get() == nullptr )
+  CHECK_THAT( what, Contains( "file" ) )
 with expansion:
-  NULL == nullptr
+  "error: tag alias, "[@zzz]" already registered.
+  First seen at file:2
+  Redefined at file:10" contains:
+  "file"
 
--------------------------------------------------------------------------------
-X/level/0/a
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+TagAliasTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( what, Contains( "2" ) )
+with expansion:
+  "error: tag alias, "[@zzz]" already registered.
+  First seen at file:2
+  Redefined at file:10" contains:
+  "2"
 
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
+  CHECK_THAT( what, Contains( "10" ) )
+with expansion:
+  "error: tag alias, "[@zzz]" already registered.
+  First seen at file:2
+  Redefined at file:10" contains:
+  "10"
 
 -------------------------------------------------------------------------------
-X/level/0/b
+Tag alias can be registered against tag patterns
+  Tag aliases must be of the form [@name]
 -------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
+TagAliasTests.cpp:<line number>
 ...............................................................................
 
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
+  CHECK_THROWS( registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
--------------------------------------------------------------------------------
-X/level/1/a
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
-
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
+  CHECK_THROWS( registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
--------------------------------------------------------------------------------
-X/level/1/b
--------------------------------------------------------------------------------
-TrickyTests.cpp:<line number>
-...............................................................................
+TagAliasTests.cpp:<line number>:
+PASSED:
+  CHECK_THROWS( registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
-TrickyTests.cpp:<line number>:
+TagAliasTests.cpp:<line number>:
 PASSED:
+  CHECK_THROWS( registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) )
 
 -------------------------------------------------------------------------------
-toString( has_toString )
+Test case with one argument
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+VariadicMacrosTests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+VariadicMacrosTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( item ) == "toString( has_toString )" )
-with expansion:
-  "toString( has_toString )"
-  ==
-  "toString( has_toString )"
+with message:
+  no assertions
 
 -------------------------------------------------------------------------------
-toString( has_maker )
+Test enum bit values
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( item ) == "StringMaker<has_maker>" )
+  REQUIRE( 0x<hex digits> == bit30and31 )
 with expansion:
-  "StringMaker<has_maker>"
-  ==
-  "StringMaker<has_maker>"
+  3221225472 (0x<hex digits>) == 3221225472
 
 -------------------------------------------------------------------------------
-toString( has_maker_and_toString )
+Text can be formatted using the Text class
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( item ) == "toString( has_maker_and_toString )" )
+  CHECK( Text( "hi there" ).toString() == "hi there" )
 with expansion:
-  "toString( has_maker_and_toString )"
-  ==
-  "toString( has_maker_and_toString )"
-
--------------------------------------------------------------------------------
-toString( vectors<has_toString )
--------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
-...............................................................................
+  "hi there" == "hi there"
 
-ToStringWhich.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( v ) == "{ {?} }" )
+  CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
 with expansion:
-  "{ {?} }" == "{ {?} }"
+  "hi
+  there"
+  ==
+  "hi
+  there"
 
 -------------------------------------------------------------------------------
-toString( vectors<has_maker )
+The NO_FAIL macro reports a failure but does not fail the test
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString( v ) == "{ StringMaker<has_maker> }" )
-with expansion:
-  "{ StringMaker<has_maker> }"
-  ==
-  "{ StringMaker<has_maker> }"
+MessageTests.cpp:<line number>:
+FAILED - but was ok:
+  CHECK_NOFAIL( 1 == 2 )
 
 -------------------------------------------------------------------------------
-toString( vectors<has_maker_and_toString )
+This test 'should' fail but doesn't
 -------------------------------------------------------------------------------
-ToStringWhich.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-ToStringWhich.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( v ) == "{ StringMaker<has_maker_and_toString> }" )
-with expansion:
-  "{ StringMaker<has_maker_and_toString> }"
-  ==
-  "{ StringMaker<has_maker_and_toString> }"
+with message:
+  oops!
 
 -------------------------------------------------------------------------------
 Tracker
@@ -7582,1195 +7537,1252 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-std::pair<int,std::string> -> toString
+Unexpected exceptions can be translated
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString( value ) == "{ 34, \"xyzzy\" }" )
-with expansion:
-  "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }"
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  3.14
 
 -------------------------------------------------------------------------------
-std::pair<int,const std::string> -> toString
+Use a custom approx
 -------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-ToStringPair.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(value) == "{ 34, \"xyzzy\" }" )
+  REQUIRE( d == approx( 1.23 ) )
 with expansion:
-  "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }"
-
--------------------------------------------------------------------------------
-std::vector<std::pair<std::string,int> > -> toString
--------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
-...............................................................................
+  1.23 == Approx( 1.23 )
 
-ToStringPair.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( pr ) == "{ { \"green\", 55 } }" )
+  REQUIRE( d == approx( 1.22 ) )
 with expansion:
-  "{ { "green", 55 } }"
-  ==
-  "{ { "green", 55 } }"
+  1.23 == Approx( 1.22 )
 
--------------------------------------------------------------------------------
-pair<pair<int,const char *,pair<std::string,int> > -> toString
--------------------------------------------------------------------------------
-ToStringPair.cpp:<line number>
-...............................................................................
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( d == approx( 1.24 ) )
+with expansion:
+  1.23 == Approx( 1.24 )
 
-ToStringPair.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" )
+  REQUIRE( d != approx( 1.25 ) )
 with expansion:
-  "{ { 42, "Arthur" }, { "Ford", 24 } }"
-  ==
-  "{ { 42, "Arthur" }, { "Ford", 24 } }"
+  1.23 != Approx( 1.25 )
 
--------------------------------------------------------------------------------
-vector<int> -> toString
--------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
-...............................................................................
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( approx( d ) == 1.23 )
+with expansion:
+  Approx( 1.23 ) == 1.23
 
-ToStringVector.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{  }" )
+  REQUIRE( approx( d ) == 1.22 )
 with expansion:
-  "{  }" == "{  }"
+  Approx( 1.23 ) == 1.22
 
-ToStringVector.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{ 42 }" )
+  REQUIRE( approx( d ) == 1.24 )
 with expansion:
-  "{ 42 }" == "{ 42 }"
+  Approx( 1.23 ) == 1.24
 
-ToStringVector.cpp:<line number>:
+ApproxTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
+  REQUIRE( approx( d ) != 1.25 )
 with expansion:
-  "{ 42, 250 }" == "{ 42, 250 }"
+  Approx( 1.23 ) != 1.25
 
 -------------------------------------------------------------------------------
-vector<string> -> toString
+Variadic macros
+  Section with one argument
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+VariadicMacrosTests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
+VariadicMacrosTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{  }" )
-with expansion:
-  "{  }" == "{  }"
+with message:
+  no assertions
 
-ToStringVector.cpp:<line number>:
+-------------------------------------------------------------------------------
+When checked exceptions are thrown they can be expected or unexpected
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{ \"hello\" }" )
-with expansion:
-  "{ "hello" }" == "{ "hello" }"
+  REQUIRE_THROWS_AS( thisThrows() )
 
-ToStringVector.cpp:<line number>:
+ExceptionTests.cpp:<line number>:
 PASSED:
-  REQUIRE( Catch::toString(vv) == "{ \"hello\", \"world\" }" )
-with expansion:
-  "{ "hello", "world" }"
-  ==
-  "{ "hello", "world" }"
+  REQUIRE_NOTHROW( thisDoesntThrow() )
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
-vector<int,allocator> -> toString
+When unchecked exceptions are thrown directly they are always failures
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString(vv) == "{  }" )
-with expansion:
-  "{  }" == "{  }"
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
 
-ToStringVector.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString(vv) == "{ 42 }" )
-with expansion:
-  "{ 42 }" == "{ 42 }"
+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown during a CHECK the test should abort and
+fail
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
 
-ToStringVector.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
-with expansion:
-  "{ 42, 250 }" == "{ 42, 250 }"
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK( thisThrows() == 0 )
+due to unexpected exception with message:
+  expected exception
 
 -------------------------------------------------------------------------------
-vec<vec<string,alloc>> -> toString
+When unchecked exceptions are thrown during a REQUIRE the test should abort
+fail
 -------------------------------------------------------------------------------
-ToStringVector.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-ToStringVector.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString(v) == "{  }" )
-with expansion:
-  "{  }" == "{  }"
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE( thisThrows() == 0 )
+due to unexpected exception with message:
+  expected exception
 
-ToStringVector.cpp:<line number>:
-PASSED:
-  REQUIRE( Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }" )
-with expansion:
-  "{ { "hello" }, { "world" } }"
-  ==
-  "{ { "hello" }, { "world" } }"
+-------------------------------------------------------------------------------
+When unchecked exceptions are thrown from functions they are always failures
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK( thisThrows() == 0 )
+due to unexpected exception with message:
+  expected exception
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Empty test spec should have no filters
+When unchecked exceptions are thrown from sections they are always failures
+  section name
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == false )
-with expansion:
-  false == false
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+Where the LHS is not a simple value
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Test spec from empty string should have no filters
+Where there is more to the expression after the RHS
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == false )
-with expansion:
-  false == false
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+X/level/0/a
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches(tcA ) == false )
-with expansion:
-  false == false
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+X/level/0/b
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Test spec from just a comma should have no filters
+X/level/1/a
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == false )
-with expansion:
-  false == false
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+X/level/1/b
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Test spec from name should have one filter
+XmlEncode
+  normal string
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( encode( "normal string" ) == "normal string" )
 with expansion:
-  true == true
+  "normal string" == "normal string"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+XmlEncode
+  empty string
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  REQUIRE( encode( "" ) == "" )
 with expansion:
-  true == true
+  "" == ""
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Test spec from quoted name should have one filter
+XmlEncode
+  string with ampersand
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( encode( "smith & jones" ) == "smith &amp; jones" )
 with expansion:
-  true == true
+  "smith &amp; jones" == "smith &amp; jones"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+XmlEncode
+  string with less-than
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  REQUIRE( encode( "smith < jones" ) == "smith &lt; jones" )
 with expansion:
-  true == true
+  "smith &lt; jones" == "smith &lt; jones"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Test spec from name should have one filter
+XmlEncode
+  string with greater-than
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( encode( "smith > jones" ) == "smith > jones" )
 with expansion:
-  true == true
+  "smith > jones" == "smith > jones"
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( encode( "smith ]]> jones" ) == "smith ]]&gt; jones" )
 with expansion:
-  false == false
+  "smith ]]&gt; jones"
+  ==
+  "smith ]]&gt; jones"
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+XmlEncode
+  string with quotes
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  REQUIRE( encode( stringWithQuotes ) == stringWithQuotes )
 with expansion:
-  true == true
+  "don't "quote" me on that"
+  ==
+  "don't "quote" me on that"
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" )
 with expansion:
-  false == false
+  "don't &quot;quote&quot; me on that"
+  ==
+  "don't &quot;quote&quot; me on that"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Wildcard at the start
+XmlEncode
+  string with control char (1)
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( encode( "[\x01]" ) == "[&#x01;]" )
 with expansion:
-  true == true
+  "[&#x01;]" == "[&#x01;]"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+XmlEncode
+  string with control char (x7F)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" )
 with expansion:
-  false == false
+  "[&#x7F;]" == "[&#x7F;]"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+atomic if
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  REQUIRE( x == 0 )
 with expansion:
-  false == false
+  0 == 0
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+boolean member
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( parseTestSpec( "*a" ).matches( tcA ) == true )
+  REQUIRE( obj.prop != nullptr )
 with expansion:
-  true == true
+  0x<hex digits> != nullptr
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Wildcard at the end
+checkedElse
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECKED_ELSE( flag )
 with expansion:
-  true == true
+  true
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( testCheckedElse( true ) )
 with expansion:
-  false == false
+  true
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
+-------------------------------------------------------------------------------
+checkedElse, failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECKED_ELSE( flag )
 with expansion:
-  false == false
+  false
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( testCheckedElse( false ) )
 with expansion:
-  true == true
+  false
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+checkedIf
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  CHECKED_IF( flag )
 with expansion:
-  false == false
+  true
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( parseTestSpec( "a*" ).matches( tcA ) == true )
+  REQUIRE( testCheckedIf( true ) )
 with expansion:
-  true == true
+  true
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Wildcard at both ends
+checkedIf, failing
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECKED_IF( flag )
+with expansion:
+  false
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( testCheckedIf( false ) )
 with expansion:
-  true == true
+  false
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+comparisons between const int variables
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( unsigned_char_var == 1 )
 with expansion:
-  false == false
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( unsigned_short_var == 1 )
 with expansion:
-  true == true
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == true )
+  REQUIRE( unsigned_int_var == 1 )
 with expansion:
-  true == true
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true )
+  REQUIRE( unsigned_long_var == 1 )
 with expansion:
-  true == true
+  1 == 1
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Redundant wildcard at the start
+comparisons between int variables
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( long_var == unsigned_char_var )
 with expansion:
-  true == true
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == true )
+  REQUIRE( long_var == unsigned_short_var )
 with expansion:
-  true == true
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( long_var == unsigned_int_var )
 with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-Parse test names and tags
-  Redundant wildcard at the end
--------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
-...............................................................................
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
+ConditionTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( long_var == unsigned_long_var )
 with expansion:
-  true == true
+  1 == 1
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+even more nested SECTION tests
+  c
+  d (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Redundant wildcard at both ends
+even more nested SECTION tests
+  c
+  e (leaf)
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
-with expansion:
-  true == true
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+even more nested SECTION tests
+  f (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Wildcard at both ends, redundant at start
+just failure
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MessageTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
-with expansion:
-  true == true
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Previous info should not be seen
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+long long
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( l == std::numeric_limits<long long>::max() )
 with expansion:
-  false == false
+  9223372036854775807 (0x<hex digits>)
+  ==
+  9223372036854775807 (0x<hex digits>)
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+looped SECTION tests
+  s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcD ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( b > a )
 with expansion:
-  true == true
+  0 > 1
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Just wildcard
+looped tests
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  1 == 0
+with message:
+  Testing if fib[0] (1) is even
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  1 == 0
+with message:
+  Testing if fib[1] (1) is even
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  0 == 0
+with message:
+  Testing if fib[2] (2) is even
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  1 == 0
+with message:
+  Testing if fib[3] (3) is even
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcD ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Parse test names and tags
-  Single tag
--------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
-...............................................................................
+  1 == 0
+with message:
+  Testing if fib[4] (5) is even
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  0 == 0
+with message:
+  Testing if fib[5] (8) is even
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  false == false
+  1 == 0
+with message:
+  Testing if fib[6] (13) is even
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == true )
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
-  true == true
+  1 == 0
+with message:
+  Testing if fib[7] (21) is even
+
+-------------------------------------------------------------------------------
+more nested SECTION tests
+  s1
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == false )
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( a == b )
 with expansion:
-  false == false
+  1 == 2
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Single tag, two matches
+more nested SECTION tests
+  s1
+  s3
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
-with expansion:
-  true == true
-
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( a != b )
 with expansion:
-  false == false
+  1 != 2
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+more nested SECTION tests
+  s1
+  s4
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( a < b )
 with expansion:
-  true == true
+  1 < 2
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Two tags
+nested SECTION tests
+  s1
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( a != b )
 with expansion:
-  true == true
+  1 != 2
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( b != a )
 with expansion:
-  false == false
+  2 != 1
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+nested SECTION tests
+  s1
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( a != b )
 with expansion:
-  true == true
+  1 != 2
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Two tags, spare separated
+non streamable - with conv. op
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
-with expansion:
-  true == true
-
-CmdLineTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( s == "7" )
 with expansion:
-  false == false
+  "7" == "7"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+not allowed
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
-with expansion:
-  true == true
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Wildcarded name and tag
+null strings
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( makeString( false ) != static_cast<char*>(nullptr) )
 with expansion:
-  true == true
+  "valid string" != {null string}
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  REQUIRE( makeString( true ) == static_cast<char*>(nullptr) )
 with expansion:
-  false == false
+  {null string} == {null string}
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+null_ptr
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( ptr.get() == nullptr )
 with expansion:
-  true == true
+  NULL == nullptr
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+pair<pair<int,const char *,pair<std::string,int> > -> toString
+-------------------------------------------------------------------------------
+ToStringPair.cpp:<line number>
+...............................................................................
+
+ToStringPair.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  REQUIRE( Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" )
 with expansion:
-  false == false
+  "{ { 42, "Arthur" }, { "Ford", 24 } }"
+  ==
+  "{ { 42, "Arthur" }, { "Ford", 24 } }"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  Single tag exclusion
+pointer to class
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TrickyTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( p == 0 )
 with expansion:
-  true == true
+  NULL == 0
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+random SECTION tests
+  s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( a != b )
 with expansion:
-  false == false
+  1 != 2
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( b != a )
 with expansion:
-  true == true
+  2 != 1
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  One tag exclusion and one tag inclusion
+random SECTION tests
+  s2
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( a != b )
 with expansion:
-  true == true
+  1 != 2
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+replaceInPlace
+  replace single char
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  CHECK( replaceInPlace( letters, "b", "z" ) )
 with expansion:
-  true == true
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( letters == "azcdefcg" )
 with expansion:
-  false == false
+  "azcdefcg" == "azcdefcg"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  One tag exclusion and one wldcarded name inclusion
+replaceInPlace
+  replace two chars
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK( replaceInPlace( letters, "c", "z" ) )
 with expansion:
-  true == true
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  CHECK( letters == "abzdefzg" )
 with expansion:
-  false == false
+  "abzdefzg" == "abzdefzg"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+replaceInPlace
+  replace first char
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( replaceInPlace( letters, "a", "z" ) )
 with expansion:
-  false == false
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == true )
+  CHECK( letters == "zbcdefcg" )
 with expansion:
-  true == true
+  "zbcdefcg" == "zbcdefcg"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  One tag exclusion, using exclude:, and one wldcarded name inclusion
+replaceInPlace
+  replace last char
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK( replaceInPlace( letters, "g", "z" ) )
 with expansion:
-  true == true
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  CHECK( letters == "abcdefcz" )
 with expansion:
-  false == false
+  "abcdefcz" == "abcdefcz"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+replaceInPlace
+  replace all chars
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( replaceInPlace( letters, letters, "replaced" ) )
 with expansion:
-  false == false
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == true )
+  CHECK( letters == "replaced" )
 with expansion:
-  true == true
+  "replaced" == "replaced"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  name exclusion
+replaceInPlace
+  replace no chars
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+TestMain.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK_FALSE( replaceInPlace( letters, "x", "z" ) )
 with expansion:
-  true == true
+  !false
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == true )
+  CHECK( letters == letters )
 with expansion:
-  true == true
+  "abcdefcg" == "abcdefcg"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+replaceInPlace
+  escape '
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  CHECK( replaceInPlace( s, "'", "|'" ) )
 with expansion:
-  true == true
+  true
 
-CmdLineTests.cpp:<line number>:
+TestMain.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == true )
+  CHECK( s == "didn|'t" )
 with expansion:
-  true == true
+  "didn|'t" == "didn|'t"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  wildcarded name exclusion
+send a single char to INFO
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.hasFilters() == true )
-with expansion:
-  true == true
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with message:
+  3
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+sends information to INFO
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == true )
-with expansion:
-  true == true
+MessageTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with messages:
+  hi
+  i := 7
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+std::pair<int,const std::string> -> toString
+-------------------------------------------------------------------------------
+ToStringPair.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringPair.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  REQUIRE( Catch::toString(value) == "{ 34, \"xyzzy\" }" )
 with expansion:
-  false == false
+  "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  wildcarded name exclusion with tag inclusion
+std::pair<int,std::string> -> toString
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+ToStringPair.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringPair.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( Catch::toString( value ) == "{ 34, \"xyzzy\" }" )
 with expansion:
-  true == true
+  "{ 34, "xyzzy" }" == "{ 34, "xyzzy" }"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+std::vector<std::pair<std::string,int> > -> toString
+-------------------------------------------------------------------------------
+ToStringPair.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringPair.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  REQUIRE( Catch::toString( pr ) == "{ { \"green\", 55 } }" )
 with expansion:
-  true == true
+  "{ { "green", 55 } }"
+  ==
+  "{ { "green", 55 } }"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
+-------------------------------------------------------------------------------
+string literals of different sizes can be compared
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>: FAILED:
+  REQUIRE( std::string( "first" ) == "second" )
 with expansion:
-  true == true
+  "first" == "second"
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+toString on const wchar_t const pointer returns the string contents
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  CHECK( result == "\"wide load\"" )
 with expansion:
-  false == false
+  ""wide load"" == ""wide load""
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  wildcarded name exclusion, using exclude:, with tag inclusion
+toString on const wchar_t pointer returns the string contents
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK( result == "\"wide load\"" )
 with expansion:
-  true == true
+  ""wide load"" == ""wide load""
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+toString on wchar_t const pointer returns the string contents
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == true )
+  CHECK( result == "\"wide load\"" )
 with expansion:
-  true == true
+  ""wide load"" == ""wide load""
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+toString on wchar_t returns the string contents
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == true )
+  CHECK( result == "\"wide load\"" )
 with expansion:
-  true == true
+  ""wide load"" == ""wide load""
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+toString( has_maker )
+-------------------------------------------------------------------------------
+ToStringWhich.cpp:<line number>
+...............................................................................
+
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == true )
+  REQUIRE( Catch::toString( item ) == "StringMaker<has_maker>" )
 with expansion:
-  true == true
+  "StringMaker<has_maker>"
+  ==
+  "StringMaker<has_maker>"
 
-CmdLineTests.cpp:<line number>:
+-------------------------------------------------------------------------------
+toString( has_maker_and_toString )
+-------------------------------------------------------------------------------
+ToStringWhich.cpp:<line number>
+...............................................................................
+
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  REQUIRE( Catch::toString( item ) == "toString( has_maker_and_toString )" )
 with expansion:
-  false == false
+  "toString( has_maker_and_toString )"
+  ==
+  "toString( has_maker_and_toString )"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  two wildcarded names
+toString( has_toString )
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+ToStringWhich.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  REQUIRE( Catch::toString( item ) == "toString( has_toString )" )
 with expansion:
-  true == true
+  "toString( has_toString )"
+  ==
+  "toString( has_toString )"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+toString( vectors<has_maker )
+-------------------------------------------------------------------------------
+ToStringWhich.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  REQUIRE( Catch::toString( v ) == "{ StringMaker<has_maker> }" )
 with expansion:
-  false == false
+  "{ StringMaker<has_maker> }"
+  ==
+  "{ StringMaker<has_maker> }"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcC ) == true )
-with expansion:
-  true == true
+-------------------------------------------------------------------------------
+toString( vectors<has_maker_and_toString )
+-------------------------------------------------------------------------------
+ToStringWhich.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  REQUIRE( Catch::toString( v ) == "{ StringMaker<has_maker_and_toString> }" )
 with expansion:
-  false == false
+  "{ StringMaker<has_maker_and_toString> }"
+  ==
+  "{ StringMaker<has_maker_and_toString> }"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  empty tag
+toString( vectors<has_toString )
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+ToStringWhich.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringWhich.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == false )
+  REQUIRE( Catch::toString( v ) == "{ {?} }" )
 with expansion:
-  false == false
+  "{ {?} }" == "{ {?} }"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcA ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+toString(enum class w/operator<<)
+-------------------------------------------------------------------------------
+EnumToString.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcB ) == false )
+  CHECK( Catch::toString(e0) == "E2/V0" )
 with expansion:
-  false == false
+  "E2/V0" == "E2/V0"
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( Catch::toString(e1) == "E2/V1" )
 with expansion:
-  false == false
+  "E2/V1" == "E2/V1"
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  CHECK( Catch::toString(e3) == "Unknown enum value 10" )
 with expansion:
-  false == false
+  "Unknown enum value 10"
+  ==
+  "Unknown enum value 10"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  empty quoted name
+toString(enum class)
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+EnumToString.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == false )
+  CHECK( Catch::toString(e0) == "0" )
 with expansion:
-  false == false
+  "0" == "0"
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  CHECK( Catch::toString(e1) == "1" )
 with expansion:
-  false == false
+  "1" == "1"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+toString(enum w/operator<<)
+-------------------------------------------------------------------------------
+EnumToString.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( Catch::toString(e0) == "E2{0}" )
 with expansion:
-  false == false
+  "E2{0}" == "E2{0}"
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == false )
+  CHECK( Catch::toString(e1) == "E2{1}" )
 with expansion:
-  false == false
+  "E2{1}" == "E2{1}"
 
 -------------------------------------------------------------------------------
-Parse test names and tags
-  quoted string followed by tag exclusion
+toString(enum)
 -------------------------------------------------------------------------------
-CmdLineTests.cpp:<line number>
+EnumToString.cpp:<line number>
 ...............................................................................
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.hasFilters() == true )
+  CHECK( Catch::toString(e0) == "0" )
 with expansion:
-  true == true
+  "0" == "0"
 
-CmdLineTests.cpp:<line number>:
+EnumToString.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcA ) == false )
+  CHECK( Catch::toString(e1) == "1" )
 with expansion:
-  false == false
+  "1" == "1"
 
-CmdLineTests.cpp:<line number>:
-PASSED:
-  CHECK( spec.matches( tcB ) == false )
-with expansion:
-  false == false
+-------------------------------------------------------------------------------
+tuple<>
+-------------------------------------------------------------------------------
+ToStringTuple.cpp:<line number>
+...............................................................................
 
-CmdLineTests.cpp:<line number>:
+ToStringTuple.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcC ) == false )
+  CHECK( "{ }" == Catch::toString(type{}) )
 with expansion:
-  false == false
+  "{ }" == "{ }"
 
-CmdLineTests.cpp:<line number>:
+ToStringTuple.cpp:<line number>:
 PASSED:
-  CHECK( spec.matches( tcD ) == true )
+  CHECK( "{ }" == Catch::toString(value) )
 with expansion:
-  true == true
+  "{ }" == "{ }"
 
 -------------------------------------------------------------------------------
-tuple<>
+tuple<float,int>
 -------------------------------------------------------------------------------
 ToStringTuple.cpp:<line number>
 ...............................................................................
 
 ToStringTuple.cpp:<line number>:
 PASSED:
-  CHECK( "{ }" == Catch::toString(type{}) )
+  CHECK( "1.2f" == Catch::toString(float(1.2)) )
 with expansion:
-  "{ }" == "{ }"
+  "1.2f" == "1.2f"
 
 ToStringTuple.cpp:<line number>:
 PASSED:
-  CHECK( "{ }" == Catch::toString(value) )
+  CHECK( "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) )
 with expansion:
-  "{ }" == "{ }"
+  "{ 1.2f, 0 }" == "{ 1.2f, 0 }"
 
 -------------------------------------------------------------------------------
 tuple<int>
@@ -8785,22 +8797,18 @@ with expansion:
   "{ 0 }" == "{ 0 }"
 
 -------------------------------------------------------------------------------
-tuple<float,int>
+tuple<nullptr,int,const char *>
 -------------------------------------------------------------------------------
 ToStringTuple.cpp:<line number>
 ...............................................................................
 
 ToStringTuple.cpp:<line number>:
 PASSED:
-  CHECK( "1.2f" == Catch::toString(float(1.2)) )
-with expansion:
-  "1.2f" == "1.2f"
-
-ToStringTuple.cpp:<line number>:
-PASSED:
-  CHECK( "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) )
+  CHECK( "{ nullptr, 42, \"Catch me\" }" == Catch::toString(value) )
 with expansion:
-  "{ 1.2f, 0 }" == "{ 1.2f, 0 }"
+  "{ nullptr, 42, "Catch me" }"
+  ==
+  "{ nullptr, 42, "Catch me" }"
 
 -------------------------------------------------------------------------------
 tuple<string,string>
@@ -8831,288 +8839,280 @@ with expansion:
   "{ { 42 }, { }, 1.2f }"
 
 -------------------------------------------------------------------------------
-tuple<nullptr,int,const char *>
+vec<vec<string,alloc>> -> toString
 -------------------------------------------------------------------------------
-ToStringTuple.cpp:<line number>
+ToStringVector.cpp:<line number>
 ...............................................................................
 
-ToStringTuple.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK( "{ nullptr, 42, \"Catch me\" }" == Catch::toString(value) )
+  REQUIRE( Catch::toString(v) == "{  }" )
 with expansion:
-  "{ nullptr, 42, "Catch me" }"
+  "{  }" == "{  }"
+
+ToStringVector.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }" )
+with expansion:
+  "{ { "hello" }, { "world" } }"
   ==
-  "{ nullptr, 42, "Catch me" }"
+  "{ { "hello" }, { "world" } }"
 
 -------------------------------------------------------------------------------
-Tag alias can be registered against tag patterns
-  The same tag alias can only be registered once
+vector<int,allocator> -> toString
 -------------------------------------------------------------------------------
-TagAliasTests.cpp:<line number>
+ToStringVector.cpp:<line number>
 ...............................................................................
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what, Contains( "[@zzz]" ) )
+  REQUIRE( Catch::toString(vv) == "{  }" )
 with expansion:
-  "error: tag alias, "[@zzz]" already registered.
-  First seen at file:2
-  Redefined at file:10" contains: "
-  [@zzz]"
+  "{  }" == "{  }"
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what, Contains( "file" ) )
+  REQUIRE( Catch::toString(vv) == "{ 42 }" )
 with expansion:
-  "error: tag alias, "[@zzz]" already registered.
-  First seen at file:2
-  Redefined at file:10" contains:
-  "file"
+  "{ 42 }" == "{ 42 }"
+
+ToStringVector.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
+with expansion:
+  "{ 42, 250 }" == "{ 42, 250 }"
+
+-------------------------------------------------------------------------------
+vector<int> -> toString
+-------------------------------------------------------------------------------
+ToStringVector.cpp:<line number>
+...............................................................................
+
+ToStringVector.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::toString(vv) == "{  }" )
+with expansion:
+  "{  }" == "{  }"
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what, Contains( "2" ) )
+  REQUIRE( Catch::toString(vv) == "{ 42 }" )
 with expansion:
-  "error: tag alias, "[@zzz]" already registered.
-  First seen at file:2
-  Redefined at file:10" contains:
-  "2"
+  "{ 42 }" == "{ 42 }"
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what, Contains( "10" ) )
+  REQUIRE( Catch::toString(vv) == "{ 42, 250 }" )
 with expansion:
-  "error: tag alias, "[@zzz]" already registered.
-  First seen at file:2
-  Redefined at file:10" contains:
-  "10"
+  "{ 42, 250 }" == "{ 42, 250 }"
 
 -------------------------------------------------------------------------------
-Tag alias can be registered against tag patterns
-  Tag aliases must be of the form [@name]
+vector<string> -> toString
 -------------------------------------------------------------------------------
-TagAliasTests.cpp:<line number>
+ToStringVector.cpp:<line number>
 ...............................................................................
 
-TagAliasTests.cpp:<line number>:
-PASSED:
-  CHECK_THROWS( registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) )
-
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THROWS( registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
+  REQUIRE( Catch::toString(vv) == "{  }" )
+with expansion:
+  "{  }" == "{  }"
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THROWS( registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) )
+  REQUIRE( Catch::toString(vv) == "{ \"hello\" }" )
+with expansion:
+  "{ "hello" }" == "{ "hello" }"
 
-TagAliasTests.cpp:<line number>:
+ToStringVector.cpp:<line number>:
 PASSED:
-  CHECK_THROWS( registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) )
+  REQUIRE( Catch::toString(vv) == "{ \"hello\", \"world\" }" )
+with expansion:
+  "{ "hello", "world" }"
+  ==
+  "{ "hello", "world" }"
 
 -------------------------------------------------------------------------------
-Anonymous test case 1
+vectors can be sized and resized
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-VariadicMacrosTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-with message:
-  anonymous test case
-
--------------------------------------------------------------------------------
-Test case with one argument
--------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
-...............................................................................
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
 
-VariadicMacrosTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-with message:
-  no assertions
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Variadic macros
-  Section with one argument
+vectors can be sized and resized
+  resizing bigger changes size and capacity
 -------------------------------------------------------------------------------
-VariadicMacrosTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-VariadicMacrosTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-with message:
-  no assertions
+  REQUIRE( v.size() == 10 )
+with expansion:
+  10 == 10
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
 
 -------------------------------------------------------------------------------
-Scenario: Do that thing with the thing
-     Given: This stuff exists
-      When: I do this
-      Then: it should do this
+vectors can be sized and resized
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( itDoesThis() )
+  REQUIRE( v.size() == 5 )
 with expansion:
-  true
+  5 == 5
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Scenario: Do that thing with the thing
-     Given: This stuff exists
-      When: I do this
-      Then: it should do this
-       And: do that
+vectors can be sized and resized
+  resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( itDoesThat() )
+  REQUIRE( v.size() == 0 )
 with expansion:
-  true
+  0 == 0
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
+vectors can be sized and resized
+  resizing smaller changes size but not capacity
+  We can use the 'swap trick' to reset the capacity
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.size() == 0 )
+  REQUIRE( v.capacity() == 0 )
 with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
-      When: it is made larger
-      Then: the size and capacity go up
+vectors can be sized and resized
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.size() == 10 )
+  REQUIRE( v.size() == 5 )
 with expansion:
-  10 == 10
+  5 == 5
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.capacity() >= 10 )
+  REQUIRE( v.capacity() >= 5 )
 with expansion:
-  10 >= 10
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
-      When: it is made larger
-      Then: the size and capacity go up
-  And when: it is made smaller again
-      Then: the size goes down but the capacity stays the same
+vectors can be sized and resized
+  reserving bigger changes capacity but not size
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
   10 >= 10
 
 -------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
+vectors can be sized and resized
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.size() == 0 )
+  REQUIRE( v.size() == 5 )
 with expansion:
-  0 == 0
+  5 == 5
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
-      When: we reserve more space
-      Then: The capacity is increased but the size remains the same
+vectors can be sized and resized
+  reserving smaller does not change size or capacity
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.capacity() >= 10 )
+  REQUIRE( v.size() == 5 )
 with expansion:
-  10 >= 10
+  5 == 5
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( v.size() == 0 )
+  REQUIRE( v.capacity() >= 5 )
 with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Scenario: This is a really long scenario name to see how the list command deals
-          with wrapping
-     Given: A section name that is so long that it cannot fit in a single
-            console width
-      When: The test headers are printed as part of the normal running of the
-            scenario
-      Then: The, deliberately very long and overly verbose (you see what I did
-            there?) section names must wrap, along with an indent
--------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
-...............................................................................
-
-BDDTests.cpp:<line number>:
-PASSED:
-with message:
-  boo!
+  5 >= 5
 
 -------------------------------------------------------------------------------
-Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
-          methods
-     Given: No operations precede me
+xmlentitycheck
+  embedded xml
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( before == 0 )
-with expansion:
-  0 == 0
 
 -------------------------------------------------------------------------------
-Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or
-          methods
-     Given: No operations precede me
-      When: We get the count
-      Then: Subsequently values are higher
+xmlentitycheck
+  encoded chars
 -------------------------------------------------------------------------------
-BDDTests.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-BDDTests.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE( after > before )
-with expansion:
-  1 > 0
 
 ===============================================================================
 test cases: 169 | 124 passed | 43 failed |  2 failed as expected
diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt
index 76af9f55..5334abc8 100644
--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -4,612 +4,37 @@ CatchSelfTest is a <version> host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
-toString(enum)
+# A test name that starts with a #
 -------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
+MiscTests.cpp:<line number>
 ...............................................................................
 
-EnumToString.cpp:<line number>:
+MiscTests.cpp:<line number>:
 PASSED:
-  CHECK( Catch::toString(e0) == "0" )
-with expansion:
-  "0" == "0"
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "1" )
-with expansion:
-  "1" == "1"
-
--------------------------------------------------------------------------------
-toString(enum w/operator<<)
--------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
-...............................................................................
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "E2{0}" )
-with expansion:
-  "E2{0}" == "E2{0}"
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "E2{1}" )
-with expansion:
-  "E2{1}" == "E2{1}"
-
--------------------------------------------------------------------------------
-toString(enum class)
--------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
-...............................................................................
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "0" )
-with expansion:
-  "0" == "0"
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "1" )
-with expansion:
-  "1" == "1"
-
--------------------------------------------------------------------------------
-toString(enum class w/operator<<)
--------------------------------------------------------------------------------
-EnumToString.cpp:<line number>
-...............................................................................
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e0) == "E2/V0" )
-with expansion:
-  "E2/V0" == "E2/V0"
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e1) == "E2/V1" )
-with expansion:
-  "E2/V1" == "E2/V1"
-
-EnumToString.cpp:<line number>:
-PASSED:
-  CHECK( Catch::toString(e3) == "Unknown enum value 10" )
-with expansion:
-  "Unknown enum value 10"
-  ==
-  "Unknown enum value 10"
-
--------------------------------------------------------------------------------
-Some simple comparisons between doubles
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == Approx( 1.23 ) )
-with expansion:
-  1.23 == Approx( 1.23 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d != Approx( 1.22 ) )
-with expansion:
-  1.23 != Approx( 1.22 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d != Approx( 1.24 ) )
-with expansion:
-  1.23 != Approx( 1.24 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Approx( d ) == 1.23 )
-with expansion:
-  Approx( 1.23 ) == 1.23
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Approx( d ) != 1.22 )
-with expansion:
-  Approx( 1.23 ) != 1.22
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( Approx( d ) != 1.24 )
-with expansion:
-  Approx( 1.23 ) != 1.24
-
--------------------------------------------------------------------------------
-Approximate comparisons with different epsilons
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d != Approx( 1.231 ) )
-with expansion:
-  1.23 != Approx( 1.231 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
-with expansion:
-  1.23 == Approx( 1.231 )
-
--------------------------------------------------------------------------------
-Approximate comparisons with floats
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1.23f == Approx( 1.23f ) )
-with expansion:
-  1.23f == Approx( 1.2300000191 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 0.0f == Approx( 0.0f ) )
-with expansion:
-  0.0f == Approx( 0.0 )
-
--------------------------------------------------------------------------------
-Approximate comparisons with ints
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1 == Approx( 1 ) )
-with expansion:
-  1 == Approx( 1.0 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 0 == Approx( 0 ) )
-with expansion:
-  0 == Approx( 0.0 )
-
--------------------------------------------------------------------------------
-Approximate comparisons with mixed numeric types
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1.0f == Approx( 1 ) )
-with expansion:
-  1.0f == Approx( 1.0 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 0 == Approx( dZero) )
-with expansion:
-  0 == Approx( 0.0 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
-with expansion:
-  0 == Approx( 0.00001 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( 1.234f == Approx( dMedium ) )
-with expansion:
-  1.234f == Approx( 1.234 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( dMedium == Approx( 1.234f ) )
-with expansion:
-  1.234 == Approx( 1.2339999676 )
-
--------------------------------------------------------------------------------
-Use a custom approx
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == approx( 1.23 ) )
-with expansion:
-  1.23 == Approx( 1.23 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == approx( 1.22 ) )
-with expansion:
-  1.23 == Approx( 1.22 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d == approx( 1.24 ) )
-with expansion:
-  1.23 == Approx( 1.24 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( d != approx( 1.25 ) )
-with expansion:
-  1.23 != Approx( 1.25 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( approx( d ) == 1.23 )
-with expansion:
-  Approx( 1.23 ) == 1.23
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( approx( d ) == 1.22 )
-with expansion:
-  Approx( 1.23 ) == 1.22
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( approx( d ) == 1.24 )
-with expansion:
-  Approx( 1.23 ) == 1.24
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( approx( d ) != 1.25 )
-with expansion:
-  Approx( 1.23 ) != 1.25
+with message:
+  yay
 
 -------------------------------------------------------------------------------
-Approximate PI
--------------------------------------------------------------------------------
-ApproxTests.cpp:<line number>
-...............................................................................
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
-with expansion:
-  3.1428571429 == Approx( 3.141 )
-
-ApproxTests.cpp:<line number>:
-PASSED:
-  REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
-with expansion:
-  3.1428571429 != Approx( 3.141 )
-
--------------------------------------------------------------------------------
-A METHOD_AS_TEST_CASE based test run that succeeds
--------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
-...............................................................................
-
-ClassTests.cpp:<line number>:
-PASSED:
-  REQUIRE( s == "hello" )
-with expansion:
-  "hello" == "hello"
-
--------------------------------------------------------------------------------
-A METHOD_AS_TEST_CASE based test run that fails
--------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
-...............................................................................
-
-ClassTests.cpp:<line number>: FAILED:
-  REQUIRE( s == "world" )
-with expansion:
-  "hello" == "world"
-
--------------------------------------------------------------------------------
-A TEST_CASE_METHOD based test run that succeeds
--------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
-...............................................................................
-
-ClassTests.cpp:<line number>:
-PASSED:
-  REQUIRE( m_a == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-A TEST_CASE_METHOD based test run that fails
--------------------------------------------------------------------------------
-ClassTests.cpp:<line number>
-...............................................................................
-
-ClassTests.cpp:<line number>: FAILED:
-  REQUIRE( m_a == 2 )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-Equality checks that should succeed
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven == 7 )
-with expansion:
-  7 == 7
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
-with expansion:
-  9.1f == Approx( 9.1000003815 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
-with expansion:
-  3.1415926535 == Approx( 3.1415926535 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello == "hello" )
-with expansion:
-  "hello" == "hello"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( "hello" == data.str_hello )
-with expansion:
-  "hello" == "hello"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello.size() == 5 )
-with expansion:
-  5 == 5
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( x == Approx( 1.3 ) )
-with expansion:
-  1.3 == Approx( 1.3 )
-
--------------------------------------------------------------------------------
-Equality checks that should fail
+'Not' checks that should fail
 -------------------------------------------------------------------------------
 ConditionTests.cpp:<line number>
 ...............................................................................
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven == 6 )
-with expansion:
-  7 == 6
+  CHECK( false != false )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven == 8 )
-with expansion:
-  7 == 8
-
--------------------------------------------------------------------------------
-Inequality checks that should succeed
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven != 6 )
-with expansion:
-  7 != 6
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven != 8 )
-with expansion:
-  7 != 8
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
-with expansion:
-  9.1f != Approx( 9.1099996567 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
-with expansion:
-  9.1f != Approx( 9.0 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
-with expansion:
-  9.1f != Approx( 1.0 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
-with expansion:
-  9.1f != Approx( 0.0 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.double_pi != Approx( 3.1415 ) )
-with expansion:
-  3.1415926535 != Approx( 3.1415 )
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello != "goodbye" )
-with expansion:
-  "hello" != "goodbye"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello != "hell" )
-with expansion:
-  "hello" != "hell"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello != "hello1" )
-with expansion:
-  "hello" != "hello1"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello.size() != 6 )
-with expansion:
-  5 != 6
-
--------------------------------------------------------------------------------
-Inequality checks that should fail
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
+  CHECK( true != true )
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven != 7 )
+  CHECK( !true )
 with expansion:
-  7 != 7
+  false
 
 ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
-with expansion:
-  9.1f != Approx( 9.1000003815 )
-
--------------------------------------------------------------------------------
-Ordering comparison checks that should succeed
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven < 8 )
-with expansion:
-  7 < 8
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven > 6 )
-with expansion:
-  7 > 6
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven > 0 )
-with expansion:
-  7 > 0
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven > -1 )
-with expansion:
-  7 > -1
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven >= 7 )
-with expansion:
-  7 >= 7
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven >= 6 )
-with expansion:
-  7 >= 6
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven <= 7 )
-with expansion:
-  7 <= 7
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.int_seven <= 8 )
-with expansion:
-  7 <= 8
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one > 9 )
-with expansion:
-  9.1f > 9
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one < 10 )
-with expansion:
-  9.1f < 10
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.float_nine_point_one < 9.2 )
-with expansion:
-  9.1f < 9.2
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello <= "hello" )
-with expansion:
-  "hello" <= "hello"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello >= "hello" )
-with expansion:
-  "hello" >= "hello"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello < "hellp" )
-with expansion:
-  "hello" < "hellp"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello < "zebra" )
-with expansion:
-  "hello" < "zebra"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello > "hellm" )
-with expansion:
-  "hello" > "hellm"
-
-ConditionTests.cpp:<line number>:
-PASSED:
-  REQUIRE( data.str_hello > "a" )
-with expansion:
-  "hello" > "a"
-
--------------------------------------------------------------------------------
-Ordering comparison checks that should fail
--------------------------------------------------------------------------------
-ConditionTests.cpp:<line number>
-...............................................................................
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven > 7 )
-with expansion:
-  7 > 7
-
-ConditionTests.cpp:<line number>: FAILED:
-  CHECK( data.int_seven < 7 )
-with expansion:
-  7 < 7
+  CHECK_FALSE( true )
 
 ===============================================================================
-test cases: 21 | 16 passed | 3 failed | 2 failed as expected
-assertions: 81 | 73 passed | 4 failed | 4 failed as expected
+test cases: 2 | 1 passed | 1 failed
+assertions: 5 | 1 passed | 4 failed
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 3fd998f0..02ca9f68 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,30 +1,119 @@
 <?xml version="1.1" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="CatchSelfTest" errors="13" failures="68" tests="924" hostname="tbd" time="{duration}" timestamp="tbd">
-    <testcase classname="global" name="toString(enum)" time="{duration}"/>
-    <testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
-    <testcase classname="global" name="toString(enum class)" time="{duration}"/>
-    <testcase classname="global" name="toString(enum class w/operator&lt;&lt;)" time="{duration}"/>
-    <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
-    <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
-    <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
-    <testcase classname="global" name="Approximate comparisons with ints" time="{duration}"/>
-    <testcase classname="global" name="Approximate comparisons with mixed numeric types" time="{duration}"/>
-    <testcase classname="global" name="Use a custom approx" time="{duration}"/>
-    <testcase classname="global" name="Approximate PI" time="{duration}"/>
-    <testcase classname="TestClass" name="A METHOD_AS_TEST_CASE based test run that succeeds" time="{duration}"/>
+    <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
+    <testcase classname="global" name="'Not' checks that should fail" time="{duration}">
+      <failure message="false != false" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="true != true" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="false" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="!true" type="CHECK_FALSE">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="false" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="!true" type="CHECK_FALSE">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="false" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="!(1 == 1)" type="CHECK_FALSE">
+ConditionTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="'Not' checks that should succeed" time="{duration}"/>
+    <testcase classname="(unimplemented) static bools can be evaluated" name="compare to true" time="{duration}"/>
+    <testcase classname="(unimplemented) static bools can be evaluated" name="compare to false" time="{duration}"/>
+    <testcase classname="(unimplemented) static bools can be evaluated" name="negation" time="{duration}"/>
+    <testcase classname="(unimplemented) static bools can be evaluated" name="double negation" time="{duration}"/>
+    <testcase classname="(unimplemented) static bools can be evaluated" name="direct" time="{duration}"/>
     <testcase classname="TestClass" name="A METHOD_AS_TEST_CASE based test run that fails" time="{duration}">
       <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
 ClassTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="Fixture" name="A TEST_CASE_METHOD based test run that succeeds" time="{duration}"/>
+    <testcase classname="TestClass" name="A METHOD_AS_TEST_CASE based test run that succeeds" time="{duration}"/>
     <testcase classname="Fixture" name="A TEST_CASE_METHOD based test run that fails" time="{duration}">
       <failure message="1 == 2" type="REQUIRE">
 ClassTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="Equality checks that should succeed" time="{duration}"/>
+    <testcase classname="Fixture" name="A TEST_CASE_METHOD based test run that succeeds" time="{duration}"/>
+    <testcase classname="A couple of nested sections followed by a failure" name="root" time="{duration}">
+      <failure type="FAIL">
+to infinity and beyond
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="A couple of nested sections followed by a failure" name="Outer/Inner" time="{duration}"/>
+    <testcase classname="global" name="A failing expression with a non streamable type is still captured" time="{duration}">
+      <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
+TrickyTests.cpp:<line number>
+      </failure>
+      <failure message="{?} == {?}" type="CHECK">
+TrickyTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="AllOf matcher" time="{duration}"/>
+    <testcase classname="global" name="An expression with side-effects should only be evaluated once" time="{duration}"/>
+    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}">
+      <error message="{Unknown expression after the reported line}">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Anonymous test case 1" time="{duration}"/>
+    <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
+    <testcase classname="global" name="Approximate PI" time="{duration}"/>
+    <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
+    <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
+    <testcase classname="global" name="Approximate comparisons with ints" time="{duration}"/>
+    <testcase classname="global" name="Approximate comparisons with mixed numeric types" time="{duration}"/>
+    <testcase classname="Assertions then sections" name="root" time="{duration}"/>
+    <testcase classname="Assertions then sections" name="A section" time="{duration}"/>
+    <testcase classname="Assertions then sections" name="A section/Another section" time="{duration}"/>
+    <testcase classname="Assertions then sections" name="A section/Another other section" time="{duration}"/>
+    <testcase classname="global" name="Comparing function pointers" time="{duration}"/>
+    <testcase classname="global" name="Comparing member function pointers" time="{duration}"/>
+    <testcase classname="global" name="Comparisons between ints where one side is computed" time="{duration}"/>
+    <testcase classname="global" name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour" time="{duration}"/>
+    <testcase classname="global" name="Comparisons with int literals don't warn when mixing signed/ unsigned" time="{duration}"/>
+    <testcase classname="global" name="Contains string matcher" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Custom exceptions can be translated when testing for nothrow" time="{duration}">
+      <error message="throwCustom()" type="REQUIRE_NOTHROW">
+custom exception - not std
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}">
+      <error message="throwCustom()" type="REQUIRE_THROWS_AS">
+custom exception - not std
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Custom std-exceptions can be custom translated" time="{duration}">
+      <error type="TEST_CASE">
+custom std exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Demonstrate that a non-const == is not used" time="{duration}"/>
+    <testcase classname="global" name="EndsWith string matcher" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
     <testcase classname="global" name="Equality checks that should fail" time="{duration}">
       <failure message="7 == 6" type="CHECK">
 ConditionTests.cpp:<line number>
@@ -66,7 +155,62 @@ ConditionTests.cpp:<line number>
 ConditionTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="Inequality checks that should succeed" time="{duration}"/>
+    <testcase classname="global" name="Equality checks that should succeed" time="{duration}"/>
+    <testcase classname="global" name="Equals" time="{duration}"/>
+    <testcase classname="global" name="Equals string matcher" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Equals string matcher, with NULL" time="{duration}"/>
+    <testcase classname="Exception messages can be tested for" name="exact match" time="{duration}"/>
+    <testcase classname="Exception messages can be tested for" name="different case" time="{duration}"/>
+    <testcase classname="Exception messages can be tested for" name="wildcarded" time="{duration}"/>
+    <testcase classname="global" name="Expected exceptions that don't throw or unexpected exceptions fail the test" time="{duration}">
+      <error message="thisThrows()" type="CHECK_THROWS_AS">
+expected exception
+ExceptionTests.cpp:<line number>
+      </error>
+      <failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
+ExceptionTests.cpp:<line number>
+      </failure>
+      <error message="thisThrows()" type="CHECK_NOTHROW">
+expected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="FAIL aborts the test" time="{duration}">
+      <failure type="FAIL">
+This is a failure
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="FAIL does not require an argument" time="{duration}">
+      <failure type="FAIL">
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Factorials are computed" time="{duration}"/>
+    <testcase classname="global" name="Generator over a range of pairs" time="{duration}"/>
+    <testcase classname="global" name="Generators over two ranges" time="{duration}"/>
+    <testcase classname="global" name="INFO and WARN do not abort tests" time="{duration}"/>
+    <testcase classname="global" name="INFO gets logged on failure" time="{duration}">
+      <failure message="2 == 1" type="REQUIRE">
+this message should be logged
+so should this
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}">
+      <failure message="2 == 1" type="CHECK">
+this message should be logged
+MessageTests.cpp:<line number>
+      </failure>
+      <failure message="2 == 0" type="CHECK">
+and this, but later
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
     <testcase classname="global" name="Inequality checks that should fail" time="{duration}">
       <failure message="7 != 7" type="CHECK">
 ConditionTests.cpp:<line number>
@@ -84,7 +228,50 @@ ConditionTests.cpp:<line number>
 ConditionTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="Ordering comparison checks that should succeed" time="{duration}"/>
+    <testcase classname="global" name="Inequality checks that should succeed" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/No wrapping" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped once" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped twice" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped three times" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/Short wrap" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/As container" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="plain string/Indent first line differently" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="With newlines/No wrapping" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="With newlines/Trailing newline" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="With newlines/Wrapped once" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="With newlines/Wrapped twice" time="{duration}"/>
+    <testcase classname="Long strings can be wrapped" name="With tabs" time="{duration}"/>
+    <testcase classname="global" name="Long text is truncted" time="{duration}"/>
+    <testcase classname="global" name="ManuallyRegistered" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be (AllOf) composed with the &amp;&amp; operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be (AnyOf) composed with the || operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and ||" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and || - failing" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; ( ( contains: &quot;string&quot; or contains: &quot;different&quot; ) and contains: &quot;random&quot; )" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator - failing" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; not contains: &quot;substring&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Mismatching exception messages failing the test" time="{duration}">
+      <failure message="expected exception" type="REQUIRE_THROWS_WITH">
+ExceptionTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Nice descriptive name" time="{duration}"/>
+    <testcase classname="global" name="Non-std exceptions can be translated" time="{duration}">
+      <error type="TEST_CASE">
+custom exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="NotImplemented exception" time="{duration}"/>
+    <testcase classname="global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}"/>
+    <testcase classname="global" name="Operators at different namespace levels not hijacked by Koenig lookup" time="{duration}"/>
     <testcase classname="global" name="Ordering comparison checks that should fail" time="{duration}">
       <failure message="7 > 7" type="CHECK">
 ConditionTests.cpp:<line number>
@@ -144,72 +331,174 @@ ConditionTests.cpp:<line number>
 ConditionTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="Comparisons with int literals don't warn when mixing signed/ unsigned" time="{duration}"/>
-    <testcase classname="global" name="comparisons between int variables" time="{duration}"/>
-    <testcase classname="global" name="comparisons between const int variables" time="{duration}"/>
-    <testcase classname="global" name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour" time="{duration}"/>
-    <testcase classname="global" name="Comparisons between ints where one side is computed" time="{duration}"/>
-    <testcase classname="global" name="Pointers can be compared to null" time="{duration}"/>
-    <testcase classname="global" name="'Not' checks that should succeed" time="{duration}"/>
-    <testcase classname="global" name="'Not' checks that should fail" time="{duration}">
-      <failure message="false != false" type="CHECK">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="true != true" type="CHECK">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp:<line number>
-      </failure>
-      <failure message="!(1 == 1)" type="CHECK_FALSE">
-ConditionTests.cpp:<line number>
+    <testcase classname="global" name="Ordering comparison checks that should succeed" time="{duration}"/>
+    <testcase classname="Output from all sections is reported" name="one" time="{duration}">
+      <failure type="FAIL">
+Message from section one
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}"/>
-    <testcase classname="global" name="Expected exceptions that don't throw or unexpected exceptions fail the test" time="{duration}">
-      <error message="thisThrows()" type="CHECK_THROWS_AS">
-expected exception
-ExceptionTests.cpp:<line number>
-      </error>
-      <failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp:<line number>
+    <testcase classname="Output from all sections is reported" name="two" time="{duration}">
+      <failure type="FAIL">
+Message from section two
+MessageTests.cpp:<line number>
       </failure>
-      <error message="thisThrows()" type="CHECK_NOTHROW">
-expected exception
-ExceptionTests.cpp:<line number>
-      </error>
     </testcase>
-    <testcase classname="global" name="When unchecked exceptions are thrown directly they are always failures" time="{duration}">
-      <error type="TEST_CASE">
-unexpected exception
-ExceptionTests.cpp:<line number>
-      </error>
+    <testcase classname="Parse test names and tags" name="Empty test spec should have no filters" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Test spec from empty string should have no filters" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Test spec from just a comma should have no filters" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Test spec from quoted name should have one filter" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcard at the start" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcard at the end" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcard at both ends" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at the start" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at the end" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at both ends" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcard at both ends, redundant at start" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Just wildcard" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Single tag" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Single tag, two matches" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Two tags" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Two tags, spare separated" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcarded name and tag" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Single tag exclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="One tag exclusion and one tag inclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="One tag exclusion and one wldcarded name inclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="One tag exclusion, using exclude:, and one wldcarded name inclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="name exclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="wildcarded name exclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="wildcarded name exclusion with tag inclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="wildcarded name exclusion, using exclude:, with tag inclusion" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="two wildcarded names" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="empty tag" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="empty quoted name" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="quoted string followed by tag exclusion" time="{duration}"/>
+    <testcase classname="global" name="Parsing a std::pair" time="{duration}"/>
+    <testcase classname="global" name="Pointers can be compared to null" time="{duration}"/>
+    <testcase classname="global" name="Pointers can be converted to strings" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="default - no arguments" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using ~" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="reporter/-r/console" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="reporter/-r/xml" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="reporter/-r xml and junit" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="reporter/--reporter/junit" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="debugger/-b" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="debugger/--break" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="abort/-a aborts after first failure" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="abort/-x 2 aborts after two failures" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="abort/-x must be greater than zero" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="abort/-x must be numeric" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="nothrow/-e" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="nothrow/--nothrow" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="output filename/-o filename" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="output filename/--out" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="combinations/Single character flags can be combined" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/without option" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/auto" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/yes" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/no" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/error" time="{duration}"/>
+    <testcase classname="global" name="SCOPED_INFO is reset for each loop" time="{duration}">
+      <failure message="10 &lt; 10" type="REQUIRE">
+current counter 10
+i := 10
+MessageTests.cpp:<line number>
+      </failure>
     </testcase>
-    <testcase classname="global" name="An unchecked exception reports the line of the last assertion" time="{duration}">
-      <error message="{Unknown expression after the reported line}">
-unexpected exception
+    <testcase classname="global" name="SUCCEED counts as a test pass" time="{duration}"/>
+    <testcase classname="global" name="SUCCESS does not require an argument" time="{duration}"/>
+    <testcase classname="Fixture" name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me" time="{duration}"/>
+    <testcase classname="Fixture" name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me/When: We get the count/Then: Subsequently values are higher" time="{duration}"/>
+    <testcase classname="Scenario: Do that thing with the thing" name="Given: This stuff exists/When: I do this/Then: it should do this" time="{duration}"/>
+    <testcase classname="Scenario: Do that thing with the thing" name="Given: This stuff exists/When: I do this/Then: it should do this/And: do that" time="{duration}"/>
+    <testcase classname="Scenario: This is a really long scenario name to see how the list command deals with wrapping" name="Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario/Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" time="{duration}"/>
+    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector" time="{duration}"/>
+    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: it is made larger/Then: the size and capacity go up" time="{duration}"/>
+    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: it is made larger/Then: the size and capacity go up/And when: it is made smaller again/Then: the size goes down but the capacity stays the same" time="{duration}"/>
+    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: we reserve more space/Then: The capacity is increased but the size remains the same" time="{duration}"/>
+    <testcase classname="global" name="Sends stuff to stdout and stderr" time="{duration}">
+      <system-out>
+A string sent directly to stdout
+      </system-out>
+      <system-err>
+A string sent directly to stderr
+      </system-err>
+    </testcase>
+    <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
+    <testcase classname="Standard output from all sections is reported" name="two" time="{duration}">
+      <system-out>
+Message from section one
+Message from section two
+      </system-out>
+    </testcase>
+    <testcase classname="global" name="StartsWith string matcher" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="String matchers" time="{duration}"/>
+    <testcase classname="global" name="Strings can be rendered with colour" time="{duration}">
+      <system-out>
+hello
+hello
+      </system-out>
+    </testcase>
+    <testcase classname="global" name="Tabs and newlines show in output" time="{duration}">
+      <failure message="&quot;if ($b == 10) {
+		$a	= 20;
+}&quot;
+==
+&quot;if ($b == 10) {
+	$a = 20;
+}
+&quot;" type="CHECK">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="Tag alias can be registered against tag patterns" name="The same tag alias can only be registered once" time="{duration}"/>
+    <testcase classname="Tag alias can be registered against tag patterns" name="Tag aliases must be of the form [@name]" time="{duration}"/>
+    <testcase classname="global" name="Test case with one argument" time="{duration}"/>
+    <testcase classname="global" name="Test enum bit values" time="{duration}"/>
+    <testcase classname="global" name="Text can be formatted using the Text class" time="{duration}"/>
+    <testcase classname="global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}"/>
+    <testcase classname="global" name="This test 'should' fail but doesn't" time="{duration}"/>
+    <testcase classname="Tracker" name="root" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section/re-enter after failed section" time="{duration}"/>
+    <testcase classname="Tracker" name="fail one section/re-enter after failed section and find next section" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/Successfully close S2" time="{duration}"/>
+    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/fail S2" time="{duration}"/>
+    <testcase classname="Tracker" name="open a nested section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/close outer section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/close outer section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Start a new inner section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Start a new inner section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Fail an inner section" time="{duration}"/>
+    <testcase classname="Tracker" name="start a generator/Fail an inner section/Re-enter for second generation" time="{duration}"/>
+    <testcase classname="global" name="Unexpected exceptions can be translated" time="{duration}">
+      <error type="TEST_CASE">
+3.14
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="When unchecked exceptions are thrown from sections they are always failures" name="section name" time="{duration}">
+    <testcase classname="global" name="Use a custom approx" time="{duration}"/>
+    <testcase classname="Variadic macros" name="Section with one argument" time="{duration}"/>
+    <testcase classname="global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}"/>
+    <testcase classname="global" name="When unchecked exceptions are thrown directly they are always failures" time="{duration}">
       <error type="TEST_CASE">
 unexpected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}">
+    <testcase classname="global" name="When unchecked exceptions are thrown during a CHECK the test should abort and fail" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
 ExceptionTests.cpp:<line number>
@@ -221,138 +510,64 @@ expected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="global" name="When unchecked exceptions are thrown during a CHECK the test should abort and fail" time="{duration}">
+    <testcase classname="global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="global" name="Non-std exceptions can be translated" time="{duration}">
-      <error type="TEST_CASE">
-custom exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="global" name="Custom std-exceptions can be custom translated" time="{duration}">
-      <error type="TEST_CASE">
-custom std exception
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="global" name="Custom exceptions can be translated when testing for nothrow" time="{duration}">
-      <error message="throwCustom()" type="REQUIRE_NOTHROW">
-custom exception - not std
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}">
-      <error message="throwCustom()" type="REQUIRE_THROWS_AS">
-custom exception - not std
-ExceptionTests.cpp:<line number>
-      </error>
-    </testcase>
-    <testcase classname="global" name="Unexpected exceptions can be translated" time="{duration}">
+    <testcase classname="When unchecked exceptions are thrown from sections they are always failures" name="section name" time="{duration}">
       <error type="TEST_CASE">
-3.14
+unexpected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="global" name="NotImplemented exception" time="{duration}"/>
-    <testcase classname="Exception messages can be tested for" name="exact match" time="{duration}"/>
-    <testcase classname="Exception messages can be tested for" name="different case" time="{duration}"/>
-    <testcase classname="Exception messages can be tested for" name="wildcarded" time="{duration}"/>
-    <testcase classname="global" name="Mismatching exception messages failing the test" time="{duration}">
-      <failure message="expected exception" type="REQUIRE_THROWS_WITH">
-ExceptionTests.cpp:<line number>
+    <testcase classname="global" name="Where the LHS is not a simple value" time="{duration}"/>
+    <testcase classname="global" name="Where there is more to the expression after the RHS" time="{duration}"/>
+    <testcase classname="global" name="X/level/0/a" time="{duration}"/>
+    <testcase classname="global" name="X/level/0/b" time="{duration}"/>
+    <testcase classname="global" name="X/level/1/a" time="{duration}"/>
+    <testcase classname="global" name="X/level/1/b" time="{duration}"/>
+    <testcase classname="XmlEncode" name="normal string" time="{duration}"/>
+    <testcase classname="XmlEncode" name="empty string" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with ampersand" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with less-than" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with greater-than" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with quotes" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with control char (1)" time="{duration}"/>
+    <testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/>
+    <testcase classname="global" name="atomic if" time="{duration}"/>
+    <testcase classname="global" name="boolean member" time="{duration}"/>
+    <testcase classname="global" name="checkedElse" time="{duration}"/>
+    <testcase classname="global" name="checkedElse, failing" time="{duration}">
+      <failure message="false" type="CHECKED_ELSE">
+MiscTests.cpp:<line number>
       </failure>
-    </testcase>
-    <testcase classname="global" name="Generators over two ranges" time="{duration}"/>
-    <testcase classname="global" name="Generator over a range of pairs" time="{duration}"/>
-    <testcase classname="global" name="INFO and WARN do not abort tests" time="{duration}"/>
-    <testcase classname="global" name="SUCCEED counts as a test pass" time="{duration}"/>
-    <testcase classname="global" name="INFO gets logged on failure" time="{duration}">
-      <failure message="2 == 1" type="REQUIRE">
-this message should be logged
-so should this
-MessageTests.cpp:<line number>
+      <failure message="false" type="REQUIRE">
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}">
-      <failure message="2 == 1" type="CHECK">
-this message should be logged
-MessageTests.cpp:<line number>
+    <testcase classname="global" name="checkedIf" time="{duration}"/>
+    <testcase classname="global" name="checkedIf, failing" time="{duration}">
+      <failure message="false" type="CHECKED_IF">
+MiscTests.cpp:<line number>
       </failure>
-      <failure message="2 == 0" type="CHECK">
-and this, but later
-MessageTests.cpp:<line number>
+      <failure message="false" type="REQUIRE">
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="FAIL aborts the test" time="{duration}">
-      <failure type="FAIL">
-This is a failure
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="FAIL does not require an argument" time="{duration}">
-      <failure type="FAIL">
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="SUCCESS does not require an argument" time="{duration}"/>
-    <testcase classname="Output from all sections is reported" name="one" time="{duration}">
-      <failure type="FAIL">
-Message from section one
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="Output from all sections is reported" name="two" time="{duration}">
-      <failure type="FAIL">
-Message from section two
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="Standard output from all sections is reported" name="two" time="{duration}">
-      <system-out>
-Message from section one
-Message from section two
-      </system-out>
-    </testcase>
-    <testcase classname="global" name="SCOPED_INFO is reset for each loop" time="{duration}">
-      <failure message="10 &lt; 10" type="REQUIRE">
-current counter 10
-i := 10
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}"/>
+    <testcase classname="global" name="comparisons between const int variables" time="{duration}"/>
+    <testcase classname="global" name="comparisons between int variables" time="{duration}"/>
+    <testcase classname="even more nested SECTION tests" name="c/d (leaf)" time="{duration}"/>
+    <testcase classname="even more nested SECTION tests" name="c/e (leaf)" time="{duration}"/>
+    <testcase classname="even more nested SECTION tests" name="f (leaf)" time="{duration}"/>
     <testcase classname="global" name="just failure" time="{duration}">
       <failure type="FAIL">
 Previous info should not be seen
 MessageTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="sends information to INFO" time="{duration}">
-      <failure message="false" type="REQUIRE">
-hi
-i := 7
-MessageTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="Pointers can be converted to strings" time="{duration}"/>
-    <testcase classname="random SECTION tests" name="s1" time="{duration}"/>
-    <testcase classname="random SECTION tests" name="s2" time="{duration}"/>
-    <testcase classname="nested SECTION tests" name="s1" time="{duration}"/>
-    <testcase classname="nested SECTION tests" name="s1/s2" time="{duration}"/>
-    <testcase classname="more nested SECTION tests" name="s2/s1" time="{duration}">
-      <failure message="1 == 2" type="REQUIRE">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="more nested SECTION tests" name="s1/s3" time="{duration}"/>
-    <testcase classname="more nested SECTION tests" name="s1/s4" time="{duration}"/>
-    <testcase classname="even more nested SECTION tests" name="c/d (leaf)" time="{duration}"/>
-    <testcase classname="even more nested SECTION tests" name="c/e (leaf)" time="{duration}"/>
-    <testcase classname="even more nested SECTION tests" name="f (leaf)" time="{duration}"/>
+    <testcase classname="global" name="long long" time="{duration}"/>
     <testcase classname="looped SECTION tests" name="s1" time="{duration}">
       <failure message="0 > 1" type="CHECK">
 MiscTests.cpp:<line number>
@@ -384,160 +599,23 @@ Testing if fib[7] (21) is even
 MiscTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="Sends stuff to stdout and stderr" time="{duration}">
-      <system-out>
-A string sent directly to stdout
-      </system-out>
-      <system-err>
-A string sent directly to stderr
-      </system-err>
-    </testcase>
-    <testcase classname="global" name="null strings" time="{duration}"/>
-    <testcase classname="global" name="checkedIf" time="{duration}"/>
-    <testcase classname="global" name="checkedIf, failing" time="{duration}">
-      <failure message="false" type="CHECKED_IF">
-MiscTests.cpp:<line number>
-      </failure>
-      <failure message="false" type="REQUIRE">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="checkedElse" time="{duration}"/>
-    <testcase classname="global" name="checkedElse, failing" time="{duration}">
-      <failure message="false" type="CHECKED_ELSE">
-MiscTests.cpp:<line number>
-      </failure>
-      <failure message="false" type="REQUIRE">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="xmlentitycheck" name="embedded xml" time="{duration}"/>
-    <testcase classname="xmlentitycheck" name="encoded chars" time="{duration}"/>
-    <testcase classname="global" name="send a single char to INFO" time="{duration}">
-      <failure message="false" type="REQUIRE">
-3
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="atomic if" time="{duration}"/>
-    <testcase classname="global" name="String matchers" time="{duration}"/>
-    <testcase classname="global" name="Contains string matcher" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="StartsWith string matcher" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="EndsWith string matcher" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="Equals string matcher" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="Equals string matcher, with NULL" time="{duration}"/>
-    <testcase classname="global" name="AllOf matcher" time="{duration}"/>
-    <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
-    <testcase classname="global" name="Equals" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be (AllOf) composed with the &amp;&amp; operator" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be (AnyOf) composed with the || operator" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and ||" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and || - failing" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; ( ( contains: &quot;string&quot; or contains: &quot;different&quot; ) and contains: &quot;random&quot; )" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator - failing" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; not contains: &quot;substring&quot;" type="CHECK_THAT">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="Factorials are computed" time="{duration}"/>
-    <testcase classname="global" name="Nice descriptive name" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="root" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="resizing bigger changes size and capacity" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="resizing smaller changes size but not capacity" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="resizing smaller changes size but not capacity/We can use the 'swap trick' to reset the capacity" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="reserving bigger changes capacity but not size" time="{duration}"/>
-    <testcase classname="vectors can be sized and resized" name="reserving smaller does not change size or capacity" time="{duration}"/>
-    <testcase classname="A couple of nested sections followed by a failure" name="root" time="{duration}">
-      <failure type="FAIL">
-to infinity and beyond
+    <testcase classname="more nested SECTION tests" name="s2/s1" time="{duration}">
+      <failure message="1 == 2" type="REQUIRE">
 MiscTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="A couple of nested sections followed by a failure" name="Outer/Inner" time="{duration}"/>
+    <testcase classname="more nested SECTION tests" name="s1/s3" time="{duration}"/>
+    <testcase classname="more nested SECTION tests" name="s1/s4" time="{duration}"/>
+    <testcase classname="nested SECTION tests" name="s1" time="{duration}"/>
+    <testcase classname="nested SECTION tests" name="s1/s2" time="{duration}"/>
+    <testcase classname="global" name="non streamable - with conv. op" time="{duration}"/>
     <testcase classname="global" name="not allowed" time="{duration}"/>
-    <testcase classname="global" name="Tabs and newlines show in output" time="{duration}">
-      <failure message="&quot;if ($b == 10) {
-		$a	= 20;
-}&quot;
-==
-&quot;if ($b == 10) {
-	$a = 20;
-}
-&quot;" type="CHECK">
-MiscTests.cpp:<line number>
-      </failure>
-    </testcase>
-    <testcase classname="global" name="toString on const wchar_t const pointer returns the string contents" time="{duration}"/>
-    <testcase classname="global" name="toString on const wchar_t pointer returns the string contents" time="{duration}"/>
-    <testcase classname="global" name="toString on wchar_t const pointer returns the string contents" time="{duration}"/>
-    <testcase classname="global" name="toString on wchar_t returns the string contents" time="{duration}"/>
-    <testcase classname="XmlEncode" name="normal string" time="{duration}"/>
-    <testcase classname="XmlEncode" name="empty string" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with ampersand" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with less-than" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with greater-than" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with quotes" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with control char (1)" time="{duration}"/>
-    <testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/>
-    <testcase classname="global" name="long long" time="{duration}"/>
-    <testcase classname="global" name="This test 'should' fail but doesn't" time="{duration}"/>
-    <testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="default - no arguments" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using ~" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="reporter/-r/console" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="reporter/-r/xml" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="reporter/-r xml and junit" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="reporter/--reporter/junit" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="debugger/-b" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="debugger/--break" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="abort/-a aborts after first failure" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="abort/-x 2 aborts after two failures" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="abort/-x must be greater than zero" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="abort/-x must be numeric" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="nothrow/-e" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="nothrow/--nothrow" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="output filename/-o filename" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="output filename/--out" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="combinations/Single character flags can be combined" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="use-colour/without option" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="use-colour/auto" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="use-colour/yes" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="use-colour/no" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="use-colour/error" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/No wrapping" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped once" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped twice" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/Wrapped three times" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/Short wrap" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/As container" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="plain string/Indent first line differently" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="With newlines/No wrapping" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="With newlines/Trailing newline" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="With newlines/Wrapped once" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="With newlines/Wrapped twice" time="{duration}"/>
-    <testcase classname="Long strings can be wrapped" name="With tabs" time="{duration}"/>
+    <testcase classname="global" name="null strings" time="{duration}"/>
+    <testcase classname="global" name="null_ptr" time="{duration}"/>
+    <testcase classname="global" name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString" time="{duration}"/>
+    <testcase classname="global" name="pointer to class" time="{duration}"/>
+    <testcase classname="random SECTION tests" name="s1" time="{duration}"/>
+    <testcase classname="random SECTION tests" name="s2" time="{duration}"/>
     <testcase classname="replaceInPlace" name="replace single char" time="{duration}"/>
     <testcase classname="replaceInPlace" name="replace two chars" time="{duration}"/>
     <testcase classname="replaceInPlace" name="replace first char" time="{duration}"/>
@@ -545,141 +623,63 @@ MiscTests.cpp:<line number>
     <testcase classname="replaceInPlace" name="replace all chars" time="{duration}"/>
     <testcase classname="replaceInPlace" name="replace no chars" time="{duration}"/>
     <testcase classname="replaceInPlace" name="escape '" time="{duration}"/>
-    <testcase classname="global" name="Strings can be rendered with colour" time="{duration}">
-      <system-out>
-hello
-hello
-      </system-out>
-    </testcase>
-    <testcase classname="global" name="Text can be formatted using the Text class" time="{duration}"/>
-    <testcase classname="global" name="Long text is truncted" time="{duration}"/>
-    <testcase classname="global" name="ManuallyRegistered" time="{duration}"/>
-    <testcase classname="global" name="Parsing a std::pair" time="{duration}"/>
-    <testcase classname="global" name="Where there is more to the expression after the RHS" time="{duration}"/>
-    <testcase classname="global" name="Where the LHS is not a simple value" time="{duration}"/>
-    <testcase classname="global" name="A failing expression with a non streamable type is still captured" time="{duration}">
-      <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-TrickyTests.cpp:<line number>
+    <testcase classname="global" name="send a single char to INFO" time="{duration}">
+      <failure message="false" type="REQUIRE">
+3
+MiscTests.cpp:<line number>
       </failure>
-      <failure message="{?} == {?}" type="CHECK">
-TrickyTests.cpp:<line number>
+    </testcase>
+    <testcase classname="global" name="sends information to INFO" time="{duration}">
+      <failure message="false" type="REQUIRE">
+hi
+i := 7
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="global" name="std::pair&lt;int,const std::string> -> toString" time="{duration}"/>
+    <testcase classname="global" name="std::pair&lt;int,std::string> -> toString" time="{duration}"/>
+    <testcase classname="global" name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" time="{duration}"/>
     <testcase classname="global" name="string literals of different sizes can be compared" time="{duration}">
       <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
 TrickyTests.cpp:<line number>
       </failure>
     </testcase>
-    <testcase classname="global" name="An expression with side-effects should only be evaluated once" time="{duration}"/>
-    <testcase classname="global" name="Operators at different namespace levels not hijacked by Koenig lookup" time="{duration}"/>
-    <testcase classname="global" name="Demonstrate that a non-const == is not used" time="{duration}"/>
-    <testcase classname="global" name="Test enum bit values" time="{duration}"/>
-    <testcase classname="global" name="boolean member" time="{duration}"/>
-    <testcase classname="(unimplemented) static bools can be evaluated" name="compare to true" time="{duration}"/>
-    <testcase classname="(unimplemented) static bools can be evaluated" name="compare to false" time="{duration}"/>
-    <testcase classname="(unimplemented) static bools can be evaluated" name="negation" time="{duration}"/>
-    <testcase classname="(unimplemented) static bools can be evaluated" name="double negation" time="{duration}"/>
-    <testcase classname="(unimplemented) static bools can be evaluated" name="direct" time="{duration}"/>
-    <testcase classname="global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}"/>
-    <testcase classname="Assertions then sections" name="root" time="{duration}"/>
-    <testcase classname="Assertions then sections" name="A section" time="{duration}"/>
-    <testcase classname="Assertions then sections" name="A section/Another section" time="{duration}"/>
-    <testcase classname="Assertions then sections" name="A section/Another other section" time="{duration}"/>
-    <testcase classname="global" name="non streamable - with conv. op" time="{duration}"/>
-    <testcase classname="global" name="Comparing function pointers" time="{duration}"/>
-    <testcase classname="global" name="Comparing member function pointers" time="{duration}"/>
-    <testcase classname="global" name="pointer to class" time="{duration}"/>
-    <testcase classname="global" name="null_ptr" time="{duration}"/>
-    <testcase classname="global" name="X/level/0/a" time="{duration}"/>
-    <testcase classname="global" name="X/level/0/b" time="{duration}"/>
-    <testcase classname="global" name="X/level/1/a" time="{duration}"/>
-    <testcase classname="global" name="X/level/1/b" time="{duration}"/>
-    <testcase classname="global" name="toString( has_toString )" time="{duration}"/>
+    <testcase classname="global" name="toString on const wchar_t const pointer returns the string contents" time="{duration}"/>
+    <testcase classname="global" name="toString on const wchar_t pointer returns the string contents" time="{duration}"/>
+    <testcase classname="global" name="toString on wchar_t const pointer returns the string contents" time="{duration}"/>
+    <testcase classname="global" name="toString on wchar_t returns the string contents" time="{duration}"/>
     <testcase classname="global" name="toString( has_maker )" time="{duration}"/>
     <testcase classname="global" name="toString( has_maker_and_toString )" time="{duration}"/>
-    <testcase classname="global" name="toString( vectors&lt;has_toString )" time="{duration}"/>
+    <testcase classname="global" name="toString( has_toString )" time="{duration}"/>
     <testcase classname="global" name="toString( vectors&lt;has_maker )" time="{duration}"/>
     <testcase classname="global" name="toString( vectors&lt;has_maker_and_toString )" time="{duration}"/>
-    <testcase classname="Tracker" name="root" time="{duration}"/>
-    <testcase classname="Tracker" name="successfully close one section" time="{duration}"/>
-    <testcase classname="Tracker" name="fail one section" time="{duration}"/>
-    <testcase classname="Tracker" name="fail one section/re-enter after failed section" time="{duration}"/>
-    <testcase classname="Tracker" name="fail one section/re-enter after failed section and find next section" time="{duration}"/>
-    <testcase classname="Tracker" name="successfully close one section, then find another" time="{duration}"/>
-    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2" time="{duration}"/>
-    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/Successfully close S2" time="{duration}"/>
-    <testcase classname="Tracker" name="successfully close one section, then find another/Re-enter - skips S1 and enters S2/fail S2" time="{duration}"/>
-    <testcase classname="Tracker" name="open a nested section" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/close outer section" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/close outer section/Re-enter for second generation" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/Start a new inner section" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/Start a new inner section/Re-enter for second generation" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/Fail an inner section" time="{duration}"/>
-    <testcase classname="Tracker" name="start a generator/Fail an inner section/Re-enter for second generation" time="{duration}"/>
-    <testcase classname="global" name="std::pair&lt;int,std::string> -> toString" time="{duration}"/>
-    <testcase classname="global" name="std::pair&lt;int,const std::string> -> toString" time="{duration}"/>
-    <testcase classname="global" name="std::vector&lt;std::pair&lt;std::string,int> > -> toString" time="{duration}"/>
-    <testcase classname="global" name="pair&lt;pair&lt;int,const char *,pair&lt;std::string,int> > -> toString" time="{duration}"/>
-    <testcase classname="global" name="vector&lt;int> -> toString" time="{duration}"/>
-    <testcase classname="global" name="vector&lt;string> -> toString" time="{duration}"/>
-    <testcase classname="global" name="vector&lt;int,allocator> -> toString" time="{duration}"/>
-    <testcase classname="global" name="vec&lt;vec&lt;string,alloc>> -> toString" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Empty test spec should have no filters" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Test spec from empty string should have no filters" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Test spec from just a comma should have no filters" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Test spec from quoted name should have one filter" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Wildcard at the start" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Wildcard at the end" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Wildcard at both ends" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Redundant wildcard at the start" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Redundant wildcard at the end" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Redundant wildcard at both ends" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Wildcard at both ends, redundant at start" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Just wildcard" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Single tag" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Single tag, two matches" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Two tags" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Two tags, spare separated" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Wildcarded name and tag" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="Single tag exclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="One tag exclusion and one tag inclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="One tag exclusion and one wldcarded name inclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="One tag exclusion, using exclude:, and one wldcarded name inclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="name exclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="wildcarded name exclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="wildcarded name exclusion with tag inclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="wildcarded name exclusion, using exclude:, with tag inclusion" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="two wildcarded names" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="empty tag" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="empty quoted name" time="{duration}"/>
-    <testcase classname="Parse test names and tags" name="quoted string followed by tag exclusion" time="{duration}"/>
+    <testcase classname="global" name="toString( vectors&lt;has_toString )" time="{duration}"/>
+    <testcase classname="global" name="toString(enum class w/operator&lt;&lt;)" time="{duration}"/>
+    <testcase classname="global" name="toString(enum class)" time="{duration}"/>
+    <testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
+    <testcase classname="global" name="toString(enum)" time="{duration}"/>
     <testcase classname="global" name="tuple&lt;>" time="{duration}"/>
-    <testcase classname="global" name="tuple&lt;int>" time="{duration}"/>
     <testcase classname="global" name="tuple&lt;float,int>" time="{duration}"/>
+    <testcase classname="global" name="tuple&lt;int>" time="{duration}"/>
+    <testcase classname="global" name="tuple&lt;nullptr,int,const char *>" time="{duration}"/>
     <testcase classname="global" name="tuple&lt;string,string>" time="{duration}"/>
     <testcase classname="global" name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" time="{duration}"/>
-    <testcase classname="global" name="tuple&lt;nullptr,int,const char *>" time="{duration}"/>
-    <testcase classname="Tag alias can be registered against tag patterns" name="The same tag alias can only be registered once" time="{duration}"/>
-    <testcase classname="Tag alias can be registered against tag patterns" name="Tag aliases must be of the form [@name]" time="{duration}"/>
-    <testcase classname="global" name="Anonymous test case 1" time="{duration}"/>
-    <testcase classname="global" name="Test case with one argument" time="{duration}"/>
-    <testcase classname="Variadic macros" name="Section with one argument" time="{duration}"/>
-    <testcase classname="Scenario: Do that thing with the thing" name="Given: This stuff exists/When: I do this/Then: it should do this" time="{duration}"/>
-    <testcase classname="Scenario: Do that thing with the thing" name="Given: This stuff exists/When: I do this/Then: it should do this/And: do that" time="{duration}"/>
-    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector" time="{duration}"/>
-    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: it is made larger/Then: the size and capacity go up" time="{duration}"/>
-    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: it is made larger/Then: the size and capacity go up/And when: it is made smaller again/Then: the size goes down but the capacity stays the same" time="{duration}"/>
-    <testcase classname="Scenario: Vector resizing affects size and capacity" name="Given: an empty vector/When: we reserve more space/Then: The capacity is increased but the size remains the same" time="{duration}"/>
-    <testcase classname="Scenario: This is a really long scenario name to see how the list command deals with wrapping" name="Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario/Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" time="{duration}"/>
-    <testcase classname="Fixture" name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me" time="{duration}"/>
-    <testcase classname="Fixture" name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me/When: We get the count/Then: Subsequently values are higher" time="{duration}"/>
+    <testcase classname="global" name="vec&lt;vec&lt;string,alloc>> -> toString" time="{duration}"/>
+    <testcase classname="global" name="vector&lt;int,allocator> -> toString" time="{duration}"/>
+    <testcase classname="global" name="vector&lt;int> -> toString" time="{duration}"/>
+    <testcase classname="global" name="vector&lt;string> -> toString" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="root" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="resizing bigger changes size and capacity" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="resizing smaller changes size but not capacity" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="resizing smaller changes size but not capacity/We can use the 'swap trick' to reset the capacity" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="reserving bigger changes capacity but not size" time="{duration}"/>
+    <testcase classname="vectors can be sized and resized" name="reserving smaller does not change size or capacity" time="{duration}"/>
+    <testcase classname="xmlentitycheck" name="embedded xml" time="{duration}"/>
+    <testcase classname="xmlentitycheck" name="encoded chars" time="{duration}"/>
     <system-out>
+A string sent directly to stdout
 Message from section one
 Message from section two
-A string sent directly to stdout
 hello
 hello
     </system-out>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index ed730bbd..3dd64def 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,1688 +1,1770 @@
 <?xml version="1.1" encoding="UTF-8"?>
 <Catch name="CatchSelfTest">
   <Group name="CatchSelfTest">
-    <TestCase name="toString(enum)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
-        <Original>
-          Catch::toString(e0) == "0"
-        </Original>
-        <Expanded>
-          "0" == "0"
-        </Expanded>
-      </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+    <TestCase name="# A test name that starts with a #">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="'Not' checks that should fail">
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e1) == "1"
+          false != false
         </Original>
         <Expanded>
-          "1" == "1"
+          false != false
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="toString(enum w/operator&lt;&lt;)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e0) == "E2{0}"
+          true != true
         </Original>
         <Expanded>
-          "E2{0}" == "E2{0}"
+          true != true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e1) == "E2{1}"
+          !true
         </Original>
         <Expanded>
-          "E2{1}" == "E2{1}"
+          false
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="toString(enum class)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e0) == "0"
+          !true
         </Original>
         <Expanded>
-          "0" == "0"
+          !true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e1) == "1"
+          !trueValue
         </Original>
         <Expanded>
-          "1" == "1"
+          false
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="toString(enum class w/operator&lt;&lt;)">
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e0) == "E2/V0"
+          !trueValue
         </Original>
         <Expanded>
-          "E2/V0" == "E2/V0"
+          !true
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e1) == "E2/V1"
+          !(1 == 1)
         </Original>
         <Expanded>
-          "E2/V1" == "E2/V1"
+          false
         </Expanded>
       </Expression>
-      <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" >
+      <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Catch::toString(e3) == "Unknown enum value 10"
+          !1 == 1
         </Original>
         <Expanded>
-          "Unknown enum value 10"
-==
-"Unknown enum value 10"
+          !(1 == 1)
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
+      <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Some simple comparisons between doubles">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+    <TestCase name="'Not' checks that should succeed">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          d == Approx( 1.23 )
+          false == false
         </Original>
         <Expanded>
-          1.23 == Approx( 1.23 )
+          false == false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          d != Approx( 1.22 )
+          true == true
         </Original>
         <Expanded>
-          1.23 != Approx( 1.22 )
+          true == true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          d != Approx( 1.24 )
+          !false
         </Original>
         <Expanded>
-          1.23 != Approx( 1.24 )
+          true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Approx( d ) == 1.23
+          !false
         </Original>
         <Expanded>
-          Approx( 1.23 ) == 1.23
+          !false
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Approx( d ) != 1.22
+          !falseValue
         </Original>
         <Expanded>
-          Approx( 1.23 ) != 1.22
+          true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          Approx( d ) != 1.24
+          !falseValue
         </Original>
         <Expanded>
-          Approx( 1.23 ) != 1.24
+          !false
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Approximate comparisons with different epsilons">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          d != Approx( 1.231 )
+          !(1 == 2)
         </Original>
         <Expanded>
-          1.23 != Approx( 1.231 )
+          true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          d == Approx( 1.231 ).epsilon( 0.1 )
+          !1 == 2
         </Original>
         <Expanded>
-          1.23 == Approx( 1.231 )
+          !(1 == 2)
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with floats">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+    <TestCase name="(unimplemented) static bools can be evaluated">
+      <Section name="compare to true">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;true>::value == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            true == is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="compare to false">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;false>::value == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            false == is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="negation">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="double negation">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !!is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="direct">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
+      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
         <Original>
-          1.23f == Approx( 1.23f )
+          s == "world"
         </Original>
         <Expanded>
-          1.23f == Approx( 1.2300000191 )
+          "hello" == "world"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
         <Original>
-          0.0f == Approx( 0.0f )
+          s == "hello"
         </Original>
         <Expanded>
-          0.0f == Approx( 0.0 )
+          "hello" == "hello"
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with ints">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+    <TestCase name="A TEST_CASE_METHOD based test run that fails">
+      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
         <Original>
-          1 == Approx( 1 )
+          m_a == 2
         </Original>
         <Expanded>
-          1 == Approx( 1.0 )
+          1 == 2
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
         <Original>
-          0 == Approx( 0 )
+          m_a == 1
         </Original>
         <Expanded>
-          0 == Approx( 0.0 )
+          1 == 1
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate comparisons with mixed numeric types">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
-        <Original>
-          1.0f == Approx( 1 )
-        </Original>
-        <Expanded>
-          1.0f == Approx( 1.0 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
-        <Original>
-          0 == Approx( dZero)
-        </Original>
-        <Expanded>
-          0 == Approx( 0.0 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+    <TestCase name="A couple of nested sections followed by a failure">
+      <Section name="Outer">
+        <Section name="Inner">
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Failure>
+        to infinity and beyond
+      </Failure>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="A failing expression with a non streamable type is still captured">
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          0 == Approx( dSmall ).epsilon( 0.001 )
+          &amp;o1 == &amp;o2
         </Original>
         <Expanded>
-          0 == Approx( 0.00001 )
+          0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          1.234f == Approx( dMedium )
+          o1 == o2
         </Original>
         <Expanded>
-          1.234f == Approx( 1.234 )
+          {?} == {?}
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="AllOf matcher">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          dMedium == Approx( 1.234f )
+          testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
         </Original>
         <Expanded>
-          1.234 == Approx( 1.2339999676 )
+          "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Use a custom approx">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+    <TestCase name="An empty test with no assertions">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="An expression with side-effects should only be evaluated once">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          d == approx( 1.23 )
+          i++ == 7
         </Original>
         <Expanded>
-          1.23 == Approx( 1.23 )
+          7 == 7
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          d == approx( 1.22 )
+          i++ == 8
         </Original>
         <Expanded>
-          1.23 == Approx( 1.22 )
+          8 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="An unchecked exception reports the line of the last assertion">
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          d == approx( 1.24 )
+          1 == 1
         </Original>
         <Expanded>
-          1.23 == Approx( 1.24 )
+          1 == 1
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          d != approx( 1.25 )
+          {Unknown expression after the reported line}
         </Original>
         <Expanded>
-          1.23 != Approx( 1.25 )
+          {Unknown expression after the reported line}
         </Expanded>
+        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+          unexpected exception
+        </Exception>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Anonymous test case 1">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="AnyOf matcher">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          approx( d ) == 1.23
+          testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
         </Original>
         <Expanded>
-          Approx( 1.23 ) == 1.23
+          "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          approx( d ) == 1.22
+          testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
         </Original>
         <Expanded>
-          Approx( 1.23 ) == 1.22
+          "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
         </Expanded>
       </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Approximate PI">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          approx( d ) == 1.24
+          divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
         </Original>
         <Expanded>
-          Approx( 1.23 ) == 1.24
+          3.1428571429 == Approx( 3.141 )
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          approx( d ) != 1.25
+          divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
         </Original>
         <Expanded>
-          Approx( 1.23 ) != 1.25
+          3.1428571429 != Approx( 3.141 )
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Approximate PI">
+    <TestCase name="Approximate comparisons with different epsilons">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
+          d != Approx( 1.231 )
         </Original>
         <Expanded>
-          3.1428571429 == Approx( 3.141 )
+          1.23 != Approx( 1.231 )
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
+          d == Approx( 1.231 ).epsilon( 0.1 )
         </Original>
         <Expanded>
-          3.1428571429 != Approx( 3.141 )
+          1.23 == Approx( 1.231 )
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+    <TestCase name="Approximate comparisons with floats">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          s == "hello"
+          1.23f == Approx( 1.23f )
         </Original>
         <Expanded>
-          "hello" == "hello"
+          1.23f == Approx( 1.2300000191 )
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="A METHOD_AS_TEST_CASE based test run that fails">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          s == "world"
+          0.0f == Approx( 0.0f )
         </Original>
         <Expanded>
-          "hello" == "world"
+          0.0f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that succeeds">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+    <TestCase name="Approximate comparisons with ints">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          m_a == 1
+          1 == Approx( 1 )
         </Original>
         <Expanded>
-          1 == 1
+          1 == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="A TEST_CASE_METHOD based test run that fails">
-      <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          m_a == 2
+          0 == Approx( 0 )
         </Original>
         <Expanded>
-          1 == 2
+          0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equality checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+    <TestCase name="Approximate comparisons with mixed numeric types">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          data.int_seven == 7
+          1.0f == Approx( 1 )
         </Original>
         <Expanded>
-          7 == 7
+          1.0f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          data.float_nine_point_one == Approx( 9.1f )
+          0 == Approx( dZero)
         </Original>
         <Expanded>
-          9.1f == Approx( 9.1000003815 )
+          0 == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          data.double_pi == Approx( 3.1415926535 )
+          0 == Approx( dSmall ).epsilon( 0.001 )
         </Original>
         <Expanded>
-          3.1415926535 == Approx( 3.1415926535 )
+          0 == Approx( 0.00001 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          data.str_hello == "hello"
+          1.234f == Approx( dMedium )
         </Original>
         <Expanded>
-          "hello" == "hello"
+          1.234f == Approx( 1.234 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" >
         <Original>
-          "hello" == data.str_hello
+          dMedium == Approx( 1.234f )
         </Original>
         <Expanded>
-          "hello" == "hello"
+          1.234 == Approx( 1.2339999676 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Assertions then sections">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          data.str_hello.size() == 5
+          Catch::alwaysTrue()
         </Original>
         <Expanded>
-          5 == 5
+          true
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Section name="A section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            Catch::alwaysTrue()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+            <Original>
+              Catch::alwaysTrue()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          x == Approx( 1.3 )
+          Catch::alwaysTrue()
         </Original>
         <Expanded>
-          1.3 == Approx( 1.3 )
+          true
         </Expanded>
       </Expression>
+      <Section name="A section">
+        <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            Catch::alwaysTrue()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another other section">
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
+            <Original>
+              Catch::alwaysTrue()
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Equality checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+    <TestCase name="Comparing function pointers">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          data.int_seven == 6
+          a
         </Original>
         <Expanded>
-          7 == 6
+          true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          data.int_seven == 8
+          a == &amp;foo
         </Original>
         <Expanded>
-          7 == 8
+          0x<hex digits> == 0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Comparing member function pointers">
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          data.int_seven == 0
+          m == &amp;S::f
         </Original>
         <Expanded>
-          7 == 0
+          0x<hex digits>
+==
+0x<hex digits>
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Comparisons between ints where one side is computed">
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one == Approx( 9.11f )
+          54 == 6*9
         </Original>
         <Expanded>
-          9.1f == Approx( 9.1099996567 )
+          54 == 54
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour">
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one == Approx( 9.0f )
+          ( -1 > 2u )
         </Original>
         <Expanded>
-          9.1f == Approx( 9.0 )
+          true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one == Approx( 1 )
+          -1 > 2u
         </Original>
         <Expanded>
-          9.1f == Approx( 1.0 )
+          -1 > 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one == Approx( 0 )
+          ( 2u &lt; -1 )
         </Original>
         <Expanded>
-          9.1f == Approx( 0.0 )
+          true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.double_pi == Approx( 3.1415 )
+          2u &lt; -1
         </Original>
         <Expanded>
-          3.1415926535 == Approx( 3.1415 )
+          2 &lt; -1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello == "goodbye"
+          ( minInt > 2u )
         </Original>
         <Expanded>
-          "hello" == "goodbye"
+          true
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello == "hell"
+          minInt > 2u
         </Original>
         <Expanded>
-          "hello" == "hell"
+          -2147483648 > 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello == "hello1"
+          i == 1
         </Original>
         <Expanded>
-          "hello" == "hello1"
+          1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello.size() == 6
+          ui == 2
         </Original>
         <Expanded>
-          5 == 6
+          2 == 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          x == Approx( 1.301 )
+          l == 3
         </Original>
         <Expanded>
-          1.3 == Approx( 1.301 )
+          3 == 3
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Inequality checks that should succeed">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven != 6
+          ul == 4
         </Original>
         <Expanded>
-          7 != 6
+          4 == 4
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven != 8
+          c == 5
         </Original>
         <Expanded>
-          7 != 8
+          5 == 5
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one != Approx( 9.11f )
+          uc == 6
         </Original>
         <Expanded>
-          9.1f != Approx( 9.1099996567 )
+          6 == 6
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one != Approx( 9.0f )
+          1 == i
         </Original>
         <Expanded>
-          9.1f != Approx( 9.0 )
+          1 == 1
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one != Approx( 1 )
+          2 == ui
         </Original>
         <Expanded>
-          9.1f != Approx( 1.0 )
+          2 == 2
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one != Approx( 0 )
+          3 == l
         </Original>
         <Expanded>
-          9.1f != Approx( 0.0 )
+          3 == 3
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.double_pi != Approx( 3.1415 )
+          4 == ul
         </Original>
         <Expanded>
-          3.1415926535 != Approx( 3.1415 )
+          4 == 4
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello != "goodbye"
+          5 == c
         </Original>
         <Expanded>
-          "hello" != "goodbye"
+          5 == 5
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello != "hell"
+          6 == uc
         </Original>
         <Expanded>
-          "hello" != "hell"
+          6 == 6
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello != "hello1"
+          (std::numeric_limits&lt;unsigned long>::max)() > ul
         </Original>
         <Expanded>
-          "hello" != "hello1"
+          18446744073709551615 (0x<hex digits>)
+>
+4
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Contains string matcher">
+      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.str_hello.size() != 6
+          testStringForMatching(), Contains( "not there" )
         </Original>
         <Expanded>
-          5 != 6
+          "this string contains 'abc' as a substring" contains: "not there"
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
+      <OverallResult success="false"/>
     </TestCase>
-    <TestCase name="Inequality checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+    <TestCase name="Custom exceptions can be translated when testing for nothrow">
+      <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          data.int_seven != 7
+          throwCustom()
         </Original>
         <Expanded>
-          7 != 7
+          throwCustom()
         </Expanded>
+        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+          custom exception - not std
+        </Exception>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Custom exceptions can be translated when testing for throwing as something else">
+      <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          data.float_nine_point_one != Approx( 9.1f )
+          throwCustom()
         </Original>
         <Expanded>
-          9.1f != Approx( 9.1000003815 )
+          throwCustom()
         </Expanded>
+        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+          custom exception - not std
+        </Exception>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Custom std-exceptions can be custom translated">
+      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        custom std exception
+      </Exception>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Demonstrate that a non-const == is not used">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
-          data.double_pi != Approx( 3.1415926535 )
+          t == 1u
         </Original>
         <Expanded>
-          3.1415926535 != Approx( 3.1415926535 )
+          {?} == 1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="EndsWith string matcher">
+      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.str_hello != "hello"
+          testStringForMatching(), EndsWith( "this" )
         </Original>
         <Expanded>
-          "hello" != "hello"
+          "this string contains 'abc' as a substring" ends with: "this"
         </Expanded>
       </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Equality checks that should fail">
       <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello.size() != 5
+          data.int_seven == 6
         </Original>
         <Expanded>
-          5 != 5
+          7 == 6
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Ordering comparison checks that should succeed">
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven &lt; 8
+          data.int_seven == 8
         </Original>
         <Expanded>
-          7 &lt; 8
+          7 == 8
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven > 6
+          data.int_seven == 0
         </Original>
         <Expanded>
-          7 > 6
+          7 == 0
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven > 0
+          data.float_nine_point_one == Approx( 9.11f )
         </Original>
         <Expanded>
-          7 > 0
+          9.1f == Approx( 9.1099996567 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven > -1
+          data.float_nine_point_one == Approx( 9.0f )
         </Original>
         <Expanded>
-          7 > -1
+          9.1f == Approx( 9.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven >= 7
+          data.float_nine_point_one == Approx( 1 )
         </Original>
         <Expanded>
-          7 >= 7
+          9.1f == Approx( 1.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven >= 6
+          data.float_nine_point_one == Approx( 0 )
         </Original>
         <Expanded>
-          7 >= 6
+          9.1f == Approx( 0.0 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven &lt;= 7
+          data.double_pi == Approx( 3.1415 )
         </Original>
         <Expanded>
-          7 &lt;= 7
+          3.1415926535 == Approx( 3.1415 )
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven &lt;= 8
+          data.str_hello == "goodbye"
         </Original>
         <Expanded>
-          7 &lt;= 8
+          "hello" == "goodbye"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one > 9
+          data.str_hello == "hell"
         </Original>
         <Expanded>
-          9.1f > 9
+          "hello" == "hell"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one &lt; 10
+          data.str_hello == "hello1"
         </Original>
         <Expanded>
-          9.1f &lt; 10
+          "hello" == "hello1"
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.float_nine_point_one &lt; 9.2
+          data.str_hello.size() == 6
         </Original>
         <Expanded>
-          9.1f &lt; 9.2
+          5 == 6
         </Expanded>
       </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello &lt;= "hello"
+          x == Approx( 1.301 )
         </Original>
         <Expanded>
-          "hello" &lt;= "hello"
+          1.3 == Approx( 1.301 )
         </Expanded>
       </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Equality checks that should succeed">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello >= "hello"
+          data.int_seven == 7
         </Original>
         <Expanded>
-          "hello" >= "hello"
+          7 == 7
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello &lt; "hellp"
+          data.float_nine_point_one == Approx( 9.1f )
         </Original>
         <Expanded>
-          "hello" &lt; "hellp"
+          9.1f == Approx( 9.1000003815 )
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello &lt; "zebra"
+          data.double_pi == Approx( 3.1415926535 )
         </Original>
         <Expanded>
-          "hello" &lt; "zebra"
+          3.1415926535 == Approx( 3.1415926535 )
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello > "hellm"
+          data.str_hello == "hello"
         </Original>
         <Expanded>
-          "hello" > "hellm"
+          "hello" == "hello"
         </Expanded>
       </Expression>
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.str_hello > "a"
+          "hello" == data.str_hello
         </Original>
         <Expanded>
-          "hello" > "a"
+          "hello" == "hello"
         </Expanded>
       </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Ordering comparison checks that should fail">
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven > 7
+          data.str_hello.size() == 5
         </Original>
         <Expanded>
-          7 > 7
+          5 == 5
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
         <Original>
-          data.int_seven &lt; 7
+          x == Approx( 1.3 )
         </Original>
         <Expanded>
-          7 &lt; 7
+          1.3 == Approx( 1.3 )
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Equals">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.int_seven > 8
+          testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
         </Original>
         <Expanded>
-          7 > 8
+          "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Equals string matcher">
+      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.int_seven &lt; 6
+          testStringForMatching(), Equals( "something else" )
         </Original>
         <Expanded>
-          7 &lt; 6
+          "this string contains 'abc' as a substring" equals: "something else"
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Equals string matcher, with NULL">
+      <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.int_seven &lt; 0
+          "", Equals(nullptr)
         </Original>
         <Expanded>
-          7 &lt; 0
+          "" equals: ""
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Exception messages can be tested for">
+      <Section name="exact match">
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), "expected exception"
+          </Original>
+          <Expanded>
+            thisThrows(), "expected exception"
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="different case">
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No )
+          </Original>
+          <Expanded>
+            thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No )
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="wildcarded">
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), StartsWith( "expected" )
+          </Original>
+          <Expanded>
+            thisThrows(), StartsWith( "expected" )
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), EndsWith( "exception" )
+          </Original>
+          <Expanded>
+            thisThrows(), EndsWith( "exception" )
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), Contains( "except" )
+          </Original>
+          <Expanded>
+            thisThrows(), Contains( "except" )
+          </Expanded>
+        </Expression>
+        <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/ExceptionTests.cpp" >
+          <Original>
+            thisThrows(), Contains( "exCept", Catch::CaseSensitive::No )
+          </Original>
+          <Expanded>
+            thisThrows(), Contains( "exCept", Catch::CaseSensitive::No )
+          </Expanded>
+        </Expression>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test">
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          data.int_seven &lt; -1
+          thisThrows()
         </Original>
         <Expanded>
-          7 &lt; -1
+          thisThrows()
         </Expanded>
+        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          data.int_seven >= 8
+          thisDoesntThrow()
         </Original>
         <Expanded>
-          7 >= 8
+          thisDoesntThrow()
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="false" type="CHECK_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
-          data.int_seven &lt;= 6
+          thisThrows()
         </Original>
         <Expanded>
-          7 &lt;= 6
+          thisThrows()
         </Expanded>
+        <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="FAIL aborts the test">
+      <Failure>
+        This is a failure
+      </Failure>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="FAIL does not require an argument">
+      <Failure/>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Factorials are computed">
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.float_nine_point_one &lt; 9
+          Factorial(0) == 1
         </Original>
         <Expanded>
-          9.1f &lt; 9
+          1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.float_nine_point_one > 10
+          Factorial(1) == 1
         </Original>
         <Expanded>
-          9.1f > 10
+          1 == 1
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.float_nine_point_one > 9.2
+          Factorial(2) == 2
         </Original>
         <Expanded>
-          9.1f > 9.2
+          2 == 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.str_hello > "hello"
+          Factorial(3) == 6
         </Original>
         <Expanded>
-          "hello" > "hello"
+          6 == 6
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          data.str_hello &lt; "hello"
+          Factorial(10) == 3628800
         </Original>
         <Expanded>
-          "hello" &lt; "hello"
+          3628800 (0x<hex digits>) == 3628800 (0x<hex digits>)
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Generator over a range of pairs">
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Original>
-          data.str_hello > "hellp"
+          i->first == i->second-1
         </Original>
         <Expanded>
-          "hello" > "hellp"
+          0 == 0
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Original>
-          data.str_hello > "z"
+          i->first == i->second-1
         </Original>
         <Expanded>
-          "hello" > "z"
+          2 == 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Generators over two ranges">
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Original>
-          data.str_hello &lt; "hellm"
+          multiply( i, 2 ) == i*2
         </Original>
         <Expanded>
-          "hello" &lt; "hellm"
+          2 == 2
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Original>
-          data.str_hello &lt; "a"
+          multiply( j, 2 ) == j*2
         </Original>
         <Expanded>
-          "hello" &lt; "a"
+          200 == 200
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Original>
-          data.str_hello >= "z"
+          multiply( i, 2 ) == i*2
         </Original>
         <Expanded>
-          "hello" >= "z"
+          4 == 4
         </Expanded>
       </Expression>
-      <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" >
+      <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" >
         <Origin

The changes are longer than what is shown.