diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..a2d66d32
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+# This sets the default behaviour, overriding core.autocrlf
+* text=auto
+
+# All source files should have unix line-endings in the repository,
+# but convert to native line-endings on checkout
+*.cpp text
+*.h text
+*.hpp text
+
+# Windows specific files should retain windows line-endings
+*.sln text eol=crlf
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..cda2ad27
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+language: cpp
+
+compiler:
+  - clang
+  - gcc
+
+env:
+  - BUILD_TYPE=Debug
+  - BUILD_TYPE=Release
+
+install:
+  - cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+  - cd Build
+  - make
+  - cd ..
+
+script:
+  - cd Build
+  - ctest -V
diff --git a/README.md b/README.md
index 402c21c8..5efeaddd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 10 (master branch)*
+*v1.0 build 11 (master branch)*
+
+Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 
 # New release with significant changes
 
diff --git a/docs/assertions.md b/docs/assertions.md
index 114c841b..e72ee03f 100644
--- a/docs/assertions.md
+++ b/docs/assertions.md
@@ -1,6 +1,6 @@
 # Assertion Macros
 
-Most test frameworks have a large collection of assertion macros to capture all possible conditional forms (_EQUALS, _NOTEQUALS, _GREATER_THAN etc).
+Most test frameworks have a large collection of assertion macros to capture all possible conditional forms (```_EQUALS```, ```_NOTEQUALS```, ```_GREATER_THAN``` etc).
 
 Catch is different. Because it decomposes natural C-style conditional expressions most of these forms are reduced to one or two that you will use all the time. That said there are a rich set of auxilliary macros as well. We'll describe all of these here.
 
@@ -8,11 +8,12 @@ Most of these macros come in two forms:
 
 ## Natural Expressions
 
-The REQUIRE family of macros tests an expression and aborts the test case if it fails.
-The CHECK family are equivalent but execution continues in the same test case even if the assertion fails. This is useful if you have a series of essentially orthoginal assertions and it is useful to see all the results rather than stopping at the first failure.
+The ```REQUIRE``` family of macros tests an expression and aborts the test case if it fails.
+The ```CHECK``` family are equivalent but execution continues in the same test case even if the assertion fails. This is useful if you have a series of essentially orthoginal assertions and it is useful to see all the results rather than stopping at the first failure.
+
+* **REQUIRE(** _expression_ **)** and  
+* **CHECK(** _expression_ **)**
 
-**REQUIRE(** _expression_ **)** and  
-**CHECK(** _expression_ **)**  
 Evaluates the expression and records the result. If an exception is thrown it is caught, reported, and counted as a failure. These are the macros you will use most of  the time
 
 Examples:
@@ -22,8 +23,9 @@ CHECK( str == "string value" );
 CHECK( thisReturnsTrue() );
 REQUIRE( i == 42 );
 ```
-**REQUIRE_FALSE(** _expression_ **)** and  
-**CHECK_FALSE(** _expression_ **)**  
+* **REQUIRE_FALSE(** _expression_ **)** and  
+* **CHECK_FALSE(** _expression_ **)**
+
 Evaluates the expression and records the _logical NOT_ of the result. If an exception is thrown it is caught, reported, and counted as a failure.
 (these forms exist as a workaround for the fact that ! prefixed expressions cannot be decomposed).
 
@@ -34,24 +36,27 @@ REQUIRE_FALSE( thisReturnsFalse() );
 
 ## Exceptions
 
-**REQUIRE_THROWS(** _expression_ **)** and  
-**CHECK_THROWS(** _expression_ **)**  
+* **REQUIRE_THROWS(** _expression_ **)** and  
+* **CHECK_THROWS(** _expression_ **)**
+
 Expects that an exception (of any type) is be thrown during evaluation of the expression.
 
-**REQUIRE_THROWS_AS(** _expression_ and _exception type_ **)** and  
-**CHECK_THROWS_AS(** _expression_, _exception type_ **)**  
+* **REQUIRE_THROWS_AS(** _expression_ and _exception type_ **)** and  
+* **CHECK_THROWS_AS(** _expression_, _exception type_ **)**
+
 Expects that an exception of the _specified type_ is thrown during evaluation of the expression.
 
-**REQUIRE_NOTHROW(** _expression_ **)** and  
-**CHECK_NOTHROW(** _expression_ **)**  
+* **REQUIRE_NOTHROW(** _expression_ **)** and  
+* **CHECK_NOTHROW(** _expression_ **)**
+
 Expects that no exception is thrown during evaluation of the expression.
 
 ## Matcher expressions
 
 To support Matchers a slightly different form is used. Matchers will be more fully documented elsewhere. *Note that Matchers are still at early stage development and are subject to change.*
 
-**REQUIRE_THAT(** _lhs_, __matcher call__ **)** and  
-**CHECK_THAT(** _lhs_, __matcher call__ **)**  
+* **REQUIRE_THAT(** _lhs_, _matcher call_ **)** and  
+* **CHECK_THAT(** _lhs_, _matcher call_ **)**  
 
 
 ---
diff --git a/docs/command-line.md b/docs/command-line.md
index ce489070..d0e6152f 100644
--- a/docs/command-line.md
+++ b/docs/command-line.md
@@ -1,4 +1,4 @@
-CATCH works quite nicely without any command line options at all - but for those times when you want greater control the following options are available.
+Catch works quite nicely without any command line options at all - but for those times when you want greater control the following options are available.
 Note that options are described according to the following pattern:
 
 <a href="#test">     `    <test-spec> ...`</a><br />
@@ -12,7 +12,7 @@ Note that options are described according to the following pattern:
 <a href="#nothrow">  `    -e, --nothrow`</a><br />
 <a href="#usage">    `    -h, -?, --help`</a><br />
 
-<a name="test" />
+<a id="test"></a>
 ## Specifying which tests to run
 
 <pre>&lt;test-spec> ...</pre>
@@ -43,13 +43,13 @@ a* ~ab* abc             Matches all tests that start with 'a', except those that
 </pre>
 
 Names within square brackets are interpreted as tags.
-A series of tags form an AND expression wheras a comma seperated sequence forms an OR expression. e.g.:
+A series of tags form an AND expression wheras a comma-separated sequence forms an OR expression. e.g.:
 
 <pre>[one][two],[three]</pre>
 This matches all tests tagged `[one]` and `[two]`, as well as all tests tagged `[three]`
 
 
-<a name="reporter" />
+<a id="reporter"></a>
 ## Choosing a reporter to use
 
 <pre>-r, --reporter &lt;reporter></pre>
@@ -64,21 +64,21 @@ The bundled reporters are:
 
 The JUnit reporter is an xml format that follows the structure of the JUnit XML Report ANT task, as consumed by a number of third-party tools, including Continuous Integration servers such as Hudson. If not otherwise needed, the standard XML reporter is preferred as this is a streaming reporter, whereas the Junit reporter needs to hold all its results until the end so it can write the overall results into attributes of the root node.
 
-<a name="break" />
+<a id="break"></a>
 ## Breaking into the debugger
 <pre>-b, --break</pre>
 
 In some IDEs (currently XCode and Visual Studio) it is possible for Catch to break into the debugger on a test failure. This can be very helpful during debug sessions - especially when there is more than one path through a particular test.
 In addition to the command line option, ensure you have built your code with the DEBUG preprocessor symbol
 
-<a name="success" />
+<a id="success"></a>
 ## Showing results for successful tests
 <pre>-s, --success</pre>
 
 Usually you only want to see reporting for failed tests. Sometimes it's useful to see *all* the output (especially when you don't trust that that test you just added worked first time!).
 To see successul, as well as failing, test results just pass this option. Note that each reporter may treat this option differently. The Junit reporter, for example, logs all results regardless.
 
-<a name="abort" />
+<a id="abort"></a>
 ## Aborting after a certain number of failures
 <pre>-a, --abort
 -x, --abortx [&lt;failure threshold>]
@@ -89,7 +89,7 @@ If a ```CHECK``` assertion fails even the current test case is not aborted.
 
 Sometimes this results in a flood of failure messages and you'd rather just see the first few. Specifying ```-a``` or ```--abort``` on its own will abort the whole test run on the first failed assertion of any kind. Use ```-x``` or ```--abortx``` followed by a number to abort after that number of assertion failures.
 
-<a name="list" />
+<a id="list"></a>
 ## Listing available tests, tags or reporters
 <pre>-l, --list-tests
 -t, --list-tags
@@ -103,20 +103,20 @@ If one or more test-specs have been supplied too then only the matching tests wi
 
 ```--list-reporters``` lists the available reporters.
 
-<a name="output" />
+<a id="output"></a>
 ## Sending output to a file
 <pre>-o, --out &lt;filename>
 </pre>
 
 Use this option to send all output to a file. By default output is sent to stdout (note that uses of stdout and stderr *from within test cases* are redirected and included in the report - so even stderr will effectively end up on stdout).
 
-<a name="name" />
+<a id="name"></a>
 ## Naming a test run
 <pre>-n, --name &lt;name for test run></pre>
 
 If a name is supplied it will be used by the reporter to provide an overall name for the test run. This can be useful if you are sending to a file, for example, and need to distinguish different test runs - either from different Catch executables or runs of the same executable with different options. If not supplied the name is defaulted to the name of the executable.
 
-<a name="nothrow" />
+<a id="nothrow"></a>
 ## Eliding assertions expected to throw
 <pre>-e, --nothrow</pre>
 
@@ -126,7 +126,7 @@ These can be a nuisance in certain debugging environments that may break when ex
 
 When running with this option any throw checking assertions are skipped so as not to contribute additional noise. Be careful if this affects the behaviour of subsequent tests.
 
-<a name="usage" />
+<a id="usage"></a>
 ## Usage
 <pre>-h, -?, --help</pre>
 
diff --git a/docs/contributing.md b/docs/contributing.md
new file mode 100644
index 00000000..e73ee202
--- /dev/null
+++ b/docs/contributing.md
@@ -0,0 +1,19 @@
+# Contributing to Catch
+
+So you want to contribute something to Catch? That's great! Whether it's a bug fix, a new feature, support for additional compilers - or just a fix to the documentation - all contributions are very welcome and very much appreciated. Of course so are bug reports and other comments and questions.
+
+If you are contributing to the code base there are a few simple guidelines to keep in mind. This also includes notes to help you find your way around. As this is liable to drift out of date please raise an issue or, better still, a pull request for this file, if you notice that.
+
+## Directory structure
+
+Users of Catch primarily use the single header version. Maintainers should work with the full source (which is still, primarily, in headers). This can be found in the ```include``` folder, but you may prefer to use one of the IDE project files (for MSVC or XCode). These can be found under ```projects/```*IDE Name*```/```*project name*. A number of contributors have proposed make files, and submitted their own versions. At some point these should be made available too.
+
+In addition to the include files and IDE projects there are a number of tests in cpp files. These can all be found in ```projects/SelfTest```. You'll also see a ```SurrogateCpps``` directory in there. This contains a set of cpp files that each ```#include``` a single header. While these files are not essential to compilation they help to keep the implementation headers self-contained. At time of writing this set is not complete but has reasonable coverage. If you add additional headers please try to remember to add a surrogate cpp for it.
+
+The other directories are ```scripts``` which contains a set of python scripts to help in testing Catch as well as generating the single include, and docs, which contains the documentation as a set of markdown files.
+
+ *this document is in-progress...*
+
+---
+
+[Home](../README.md)
\ No newline at end of file
diff --git a/docs/reference-index.md b/docs/reference-index.md
index 01d2799a..0d662579 100644
--- a/docs/reference-index.md
+++ b/docs/reference-index.md
@@ -4,6 +4,7 @@ Before looking at this material be sure to read the [tutorial](tutorial.md)
 
 * [Command Line](command-line.md)
 * [Assertion Macros](assertions.md)
+* [Test cases and sections](test-cases-and-sections.md)
 * [Logging Macros](logging.md)
 * [Supplying your own main()](own-main.md)
 * [Test fixtures](test-fixtures.md)
diff --git a/docs/test-cases-and-sections.md b/docs/test-cases-and-sections.md
new file mode 100644
index 00000000..4fc3f6f8
--- /dev/null
+++ b/docs/test-cases-and-sections.md
@@ -0,0 +1,45 @@
+# Test cases and sections
+
+While Catch fully supports the traditional, xUnit, style of class-based fixtures containing test case methods this is not the preferred style.
+
+Instead Catch provides a powerful mechanism for nesting test case sections within a test case. For a more detailed discussion see the [tutorial](tutorial.md#testCasesAndSections).
+
+Test cases and sections are very easy to use in practice:
+
+* **TEST_CASE(** _test name_ \[, _tags_ \] **)**
+* **SECTION(** _section name_ **)**
+
+_test name_ and _section name_ are free form, quoted, strings. The optional _tags_ argument is a quoted string containing one or more tags enclosed in square brackets. Tags are discussed below. Test names must be unique within the Catch executable.
+
+For examples see the [Tutorial](tutorial.md)
+
+## Tags
+
+-{placeholder for documentation of tags}-
+
+## BDD-style test cases
+
+In addition to Catch's take on the classic style of test cases, Catch supports an alternative syntax that allow tests to be written as "executable specifications" (one of the early goals of [Behaviour Driven Development](http://dannorth.net/introducing-bdd/)). This set of macros map on to ```TEST_CASE```s and ```SECTION```s, with a little internal support to make them smoother to work with.
+
+* **SCENARIO(** _scenario name_ \[, _tags_ \] **)**
+
+This macro maps onto ```TEST_CASE``` and works in the same way, except that the test case name will be prefixed by "Scenario: "
+
+* **GIVEN(** _something_ **)**
+* **WHEN(** _something_ **)**
+* **THEN(** _something_ **)**
+
+These macros map onto ```SECTION```s except that the section names are the _something_s prefixed by "given: ", "when: " or "then: " respectively.
+
+* **AND_WHEN(** _something_ **)**
+* **AND_THEN(** _something_ **)**
+
+Similar to ```WHEN``` and ```THEN``` except that the prefixes start with "and ". These are used to chain ```WHEN```s and ```THEN```s together.
+
+When any of these macros are used the console reporter recognises them and formats the test case header such that the Givens, Whens and Thens are aligned to aid readability.
+
+Other than the additional prefixes and the formatting in the console reporter these macros behave exactly as ```TEST_CASE```s and ```SECTION```s. As such there is nothing enforcing the correct sequencing of these macros - that's up to the programmer!
+
+---
+
+[Home](../README.md)
\ No newline at end of file
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 24857081..12f838d9 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -87,10 +87,61 @@ Of course there are still more issues to do deal with. For example we'll hit pro
 Although this was a simple test it's been enough to demonstrate a few things about how Catch is used. Let's take moment to consider those before we move on.
 
 1. All we did was ```#define``` one identifier and ```#include``` one header and we got everything - even an implementation of ```main()``` that will [respond to command line arguments](command-line.md). You can only use that ```#define``` in one implementation file, for (hopefully) obvious reasons. Once you have more than one file with unit tests in you'll just ```#include "catch.hpp"``` and go. Usually it's a good idea to have a dedicated implementation file that just has ```#define CATCH_CONFIG_MAIN``` and ```#include "catch.hpp"```. You can also provide your own implementation of main and drive Catch yourself (see [Supplying-your-own-main()](own-main.md).
-2. We introduce test cases with the TEST_CASE macro. This macro takes two arguments - a hierarchical test name (forward slash separated, by convention) and a free-form description. The test name should be unique - and ideally will logically group related tests together like folders in a file system. You can run sets of tests by specifying a wildcarded test name.
-3. The name and description arguments are just strings. We haven't had to declare a function or method - or explicitly register the test case anywhere. Behind the scenes a function with a generated name is defined for you, and automatically registered using static registry classes. By abstracting the function name away we can name our tests without the constraints of identifier names.
+2. We introduce test cases with the TEST_CASE macro. This macro takes one or two arguments - a free form test name and, optionally, one or more tags (for more see <a href="#testCasesAndSections">Test cases and Sections</a>, below. The test name must be unique. You can run sets of tests by specifying a wildcarded test name or a tag expression. See the [command line docs](command-line.md) for more information on running tests.
+3. The name and tags arguments are just strings. We haven't had to declare a function or method - or explicitly register the test case anywhere. Behind the scenes a function with a generated name is defined for you, and automatically registered using static registry classes. By abstracting the function name away we can name our tests without the constraints of identifier names.
 4. We write our individual test assertions using the REQUIRE macro. Rather than a separate macro for each type of condition we express the condition naturally using C/C++ syntax. Behind the scenes a simple set of expression templates captures the left-hand-side and right-hand-side of the expression so we can display the values in our test report. As we'll see later there _are_ other assertion macros - but because of this technique the number of them is drastically reduced.
 
+<a id="testCasesAndSections"></a>
+## Test cases and sections
+
+Most test frameworks have a class-based fixture mechanism. That is, test cases map to methods on a class and common setup and teardown can be performed in ```setup()``` and ```teardown()``` methods (or constructor/ destructor in languages, like C++, that support deterministic destruction).
+
+While Catch fully supports this way of working there are a few problems with the approach. In particular the way your code must be split up, and the blunt granularity (you can only have one setup/ teardown pair across a set of methods - sometimes you want slightly different setup in each method - or you may want several levels of setup. We'll revisit that concept shortly and, hopefully, make it clearer). It was <a href="http://jamesnewkirk.typepad.com/posts/2007/09/why-you-should-.html">problems like these</a> that led James Newkirk, who led the team that built NUnit, to start again from scratch and <a href="http://jamesnewkirk.typepad.com/posts/2007/09/announcing-xuni.html">build xUnit</a>).
+
+Catch takes a different approach (to both NUnut and xUnit) that is a more natural fit for C++ and the C family of languages. This is best explaned through an example:
+
+```c++
+TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
+
+    std::vector<int> v( 5 );
+    
+    REQUIRE( v.size() == 5 );
+    REQUIRE( v.capacity() >= 5 );
+    
+    SECTION( "resizing bigger changes size and capacity" ) {
+        v.resize( 10 );
+        
+        REQUIRE( v.size() == 10 );
+        REQUIRE( v.capacity() >= 10 );
+    }
+    SECTION( "resizing smaller changes size but not capacity" ) {
+        v.resize( 0 );
+        
+        REQUIRE( v.size() == 0 );
+        REQUIRE( v.capacity() >= 5 );
+    }
+    SECTION( "reserving bigger changes capacity but not size" ) {
+        v.reserve( 10 );
+        
+        REQUIRE( v.size() == 5 );
+        REQUIRE( v.capacity() >= 10 );
+    }
+    SECTION( "reserving smaller does not change size or capacity" ) {
+        v.reserve( 0 );
+        
+        REQUIRE( v.size() == 5 );
+        REQUIRE( v.capacity() >= 5 );
+    }
+}
+```
+
+For each ```SECTION``` the ```TEST_CASE``` is executed from the start - so as we enter each section we know that size is 5 and capacity is at least 5. We enforced those requirements with the ```REQUIRE```s at the top level so we can be confident in them.
+This works because the ```SECTION``` macro contains an if statement that calls back into Catch to see if the section should be executed. One leaf section is executed on each run through a ```TEST_CASE```. The other sections are skipped. Next time through the next section is executed, and so on until no new sections are encountered.
+
+So far so good - this is already an improvement on the setup/ teardown approach because now we see our setup code inline and we can use the stack.
+
+-{placeholder for documentation on nested sections}-
+
 ## Next steps
 For more specific information see the [Reference pages](reference-index.md)
 
diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp
index 050e1793..550107f8 100644
--- a/include/internal/catch_list.hpp
+++ b/include/internal/catch_list.hpp
@@ -58,7 +58,7 @@ namespace Catch {
                 matchedTests++;
                 Text nameWrapper(   it->getTestCaseInfo().name,
                                     TextAttributes()
-                                        .setWidth( maxNameLen )
+                                        .setWidth( maxNameLen+2 )
                                         .setInitialIndent(2)
                                         .setIndent(4) );
 
diff --git a/include/internal/catch_reporter_registrars.hpp b/include/internal/catch_reporter_registrars.hpp
index fecbfa91..51465556 100644
--- a/include/internal/catch_reporter_registrars.hpp
+++ b/include/internal/catch_reporter_registrars.hpp
@@ -67,8 +67,8 @@ namespace Catch {
 }
 
 #define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
-    Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
+    namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
 #define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
-    Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
 
 #endif // TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
diff --git a/include/internal/catch_tags.hpp b/include/internal/catch_tags.hpp
index 4e7bd5a3..36ecd1d6 100644
--- a/include/internal/catch_tags.hpp
+++ b/include/internal/catch_tags.hpp
@@ -121,9 +121,10 @@ namespace Catch {
         }
 
         bool matches( std::set<std::string> const& tags ) const {
-            TagMap::const_iterator it = m_tags.begin();
-            TagMap::const_iterator itEnd = m_tags.end();
-            for(; it != itEnd; ++it ) {
+            for(    TagMap::const_iterator
+                        it = m_tags.begin(), itEnd = m_tags.end();
+                    it != itEnd;
+                    ++it ) {
                 bool found = tags.find( it->first ) != tags.end();
                 if( found == it->second.isNegated() )
                     return false;
@@ -138,9 +139,10 @@ namespace Catch {
     class TagExpression {
     public:
         bool matches( std::set<std::string> const& tags ) const {
-            std::vector<TagSet>::const_iterator it = m_tagSets.begin();
-            std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
-            for(; it != itEnd; ++it )
+            for(    std::vector<TagSet>::const_iterator
+                        it = m_tagSets.begin(), itEnd = m_tagSets.end();
+                    it != itEnd;
+                    ++it )
                 if( it->matches( tags ) )
                     return true;
             return false;
@@ -173,6 +175,7 @@ namespace Catch {
                     break;
                 case ',':
                     m_exp.m_tagSets.push_back( m_currentTagSet );
+                    m_currentTagSet = TagSet();
                     break;
             }
         }
diff --git a/include/internal/catch_text.hpp b/include/internal/catch_text.hpp
index 58eae6fd..f1f884dd 100644
--- a/include/internal/catch_text.hpp
+++ b/include/internal/catch_text.hpp
@@ -23,7 +23,10 @@ namespace Catch {
         std::string remainder = _str;
 
         while( !remainder.empty() ) {
-            assert( lines.size() < 1000 );
+            if( lines.size() >= 1000 ) {
+                lines.push_back( "... message truncated due to excessive size" );
+                return;
+            }
             std::size_t tabPos = std::string::npos;
             std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
             std::size_t pos = remainder.find_first_of( '\n' );
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 622709d7..4b021717 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 10, "master" );
+    Version libraryVersion( 1, 0, 11, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
new file mode 100644
index 00000000..cff62616
--- /dev/null
+++ b/projects/CMake/CMakeLists.txt
@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(Catch C CXX)
+message("configure: Catch/SelfTest")
+
+# define some folders
+set(CATCH_DIR     "${CMAKE_CURRENT_SOURCE_DIR}/../..")
+set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
+set(SCRIPTS_DIR   ${CATCH_DIR}/scripts)
+
+# define the sources of the self test
+set(
+    SOURCES
+	${SELF_TEST_DIR}/ApproxTests.cpp
+	${SELF_TEST_DIR}/BDDTests.cpp
+	${SELF_TEST_DIR}/catch_self_test.cpp
+	${SELF_TEST_DIR}/ClassTests.cpp
+	${SELF_TEST_DIR}/CmdLineTests.cpp
+	${SELF_TEST_DIR}/ConditionTests.cpp
+	${SELF_TEST_DIR}/ExceptionTests.cpp
+	${SELF_TEST_DIR}/GeneratorTests.cpp
+	${SELF_TEST_DIR}/MessageTests.cpp
+	${SELF_TEST_DIR}/MiscTests.cpp
+	${SELF_TEST_DIR}/SectionTrackerTests.cpp
+	${SELF_TEST_DIR}/TestMain.cpp
+	${SELF_TEST_DIR}/TrickyTests.cpp
+	${SELF_TEST_DIR}/VariadicMacrosTests.cpp
+)
+
+# configure the executable
+include_directories(${CATCH_DIR}/include)
+add_executable(SelfTest ${SOURCES})
+
+# configure unit tests via ctest
+enable_testing()
+add_test(NAME SelfTest_run COMMAND SelfTest)
+#add_test(NAME SelfTest_run COMMAND python ${SCRIPTS_DIR}/approvalTests.py "${CMAKE_CURRENT_BINARY_DIR}/SelfTest")
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
deleted file mode 100644
index cc70365c..00000000
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ /dev/null
@@ -1,14106 +0,0 @@
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b10 host application.
-Run with -? for options
-
--------------------------------------------------------------------------------
-./failing/TestClass/failingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp: FAILED:
-  REQUIRE( s == "world" )
-with expansion:
-  "hello" == "world"
-
--------------------------------------------------------------------------------
-./failing/Fixture/failingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp: FAILED:
-  REQUIRE( m_a == 2 )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-./failing/conditions/equality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 6 )
-with expansion:
-  7 == 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 8 )
-with expansion:
-  7 == 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 0 )
-with expansion:
-  7 == 0
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
-with expansion:
-  9.1 == Approx( 9.11 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
-with expansion:
-  9.1 == Approx( 9 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 1 ) )
-with expansion:
-  9.1 == Approx( 1 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 0 ) )
-with expansion:
-  9.1 == Approx( 0 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.double_pi == Approx( 3.1415 ) )
-with expansion:
-  3.1415926535 == Approx( 3.1415 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "goodbye" )
-with expansion:
-  "hello" == "goodbye"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "hell" )
-with expansion:
-  "hello" == "hell"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "hello1" )
-with expansion:
-  "hello" == "hello1"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello.size() == 6 )
-with expansion:
-  5 == 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( x == Approx( 1.301 ) )
-with expansion:
-  1.3 == Approx( 1.301 )
-
--------------------------------------------------------------------------------
-./failing/conditions/inequality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven != 7 )
-with expansion:
-  7 != 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
-with expansion:
-  9.1 != Approx( 9.1 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.double_pi != Approx( 3.1415926535 ) )
-with expansion:
-  3.1415926535 != Approx( 3.14159 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello != "hello" )
-with expansion:
-  "hello" != "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello.size() != 5 )
-with expansion:
-  5 != 5
-
--------------------------------------------------------------------------------
-./failing/conditions/ordered
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven > 7 )
-with expansion:
-  7 > 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 7 )
-with expansion:
-  7 < 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven > 8 )
-with expansion:
-  7 > 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 6 )
-with expansion:
-  7 < 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 0 )
-with expansion:
-  7 < 0
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < -1 )
-with expansion:
-  7 < -1
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven >= 8 )
-with expansion:
-  7 >= 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven <= 6 )
-with expansion:
-  7 <= 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one < 9 )
-with expansion:
-  9.1 < 9
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one > 10 )
-with expansion:
-  9.1 > 10
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one > 9.2 )
-with expansion:
-  9.1 > 9.2
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "hello" )
-with expansion:
-  "hello" > "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "hello" )
-with expansion:
-  "hello" < "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "hellp" )
-with expansion:
-  "hello" > "hellp"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "z" )
-with expansion:
-  "hello" > "z"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "hellm" )
-with expansion:
-  "hello" < "hellm"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "a" )
-with expansion:
-  "hello" < "a"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello >= "z" )
-with expansion:
-  "hello" >= "z"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello <= "a" )
-with expansion:
-  "hello" <= "a"
-
--------------------------------------------------------------------------------
-./failing/conditions/not
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( false != false )
-
-ConditionTests.cpp: FAILED:
-  CHECK( true != true )
-
-ConditionTests.cpp: FAILED:
-  CHECK( !true )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( true )
-
-ConditionTests.cpp: FAILED:
-  CHECK( !trueValue )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( trueValue )
-with expansion:
-  !true
-
-ConditionTests.cpp: FAILED:
-  CHECK( !(1 == 1) )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( 1 == 1 )
-with expansion:
-  !(1 == 1)
-
--------------------------------------------------------------------------------
-./failing/exceptions/explicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  CHECK_THROWS_AS( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
-ExceptionTests.cpp: FAILED:
-  CHECK_THROWS_AS( thisDoesntThrow() )
-because no exception was thrown where one was expected:
-
-ExceptionTests.cpp: FAILED:
-  CHECK_NOTHROW( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/2
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  {Unknown expression after the reported line}
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/3
-  section name
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/4
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  CHECK( thisThrows() == 0 )
-due to unexpected exception with message:
-  expected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  custom exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/nothrow
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  REQUIRE_NOTHROW( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/throw
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  REQUIRE_THROWS_AS( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/double
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  3.14
-
--------------------------------------------------------------------------------
-./failing/message/info/1
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-  REQUIRE( a == 1 )
-with expansion:
-  2 == 1
-with messages:
-  this message should be logged
-  so should this
-
--------------------------------------------------------------------------------
-./mixed/message/info/2
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-  CHECK( a == 1 )
-with expansion:
-  2 == 1
-with messages:
-  this message may be logged later
-  this message should be logged
-
-MessageTests.cpp: FAILED:
-  CHECK( a == 0 )
-with expansion:
-  2 == 0
-with message:
-  and this, but later
-
--------------------------------------------------------------------------------
-./failing/message/fail
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  This is a failure
-
--------------------------------------------------------------------------------
-./failing/message/sections
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Message from section one
-
--------------------------------------------------------------------------------
-./failing/message/sections
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Message from section two
-
-Message from section one
-Message from section two
--------------------------------------------------------------------------------
-./mixed/message/scoped
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-  REQUIRE( i < 10 )
-with expansion:
-  10 < 10
-with messages:
-  current counter 10
-  i := 10
-
--------------------------------------------------------------------------------
-just failure
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Previous info should not be seen
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/nested2
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( a == b )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/loops
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK( b > a )
-with expansion:
-  0 > 1
-
--------------------------------------------------------------------------------
-./mixed/Misc/loops
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[0] (1) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[1] (1) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[3] (3) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[4] (5) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[6] (13) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[7] (21) is even
-
-Some information
-An error
--------------------------------------------------------------------------------
-./failing/info
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( false )
-with messages:
-  hi
-  i := 7
-
--------------------------------------------------------------------------------
-./failing/checkedif
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECKED_IF( flag )
-with expansion:
-  false
-
-MiscTests.cpp: FAILED:
-  REQUIRE( testCheckedIf( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-./failing/checkedelse
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECKED_ELSE( flag )
-with expansion:
-  false
-
-MiscTests.cpp: FAILED:
-  REQUIRE( testCheckedElse( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-./manual/onechar
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( false )
-with message:
-  3
-
--------------------------------------------------------------------------------
-./failing/matchers/Contains
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() Contains( "not there" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "not there"
-
--------------------------------------------------------------------------------
-./failing/matchers/StartsWith
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "string"
-
--------------------------------------------------------------------------------
-./failing/matchers/EndsWith
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "this"
-
--------------------------------------------------------------------------------
-./failing/matchers/Equals
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() Equals( "something else" ) )
-with expansion:
-  "this string contains 'abc' as a substring" equals: "something else"
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
-Message from section one
-Message from section two
-Some information
-An error
-Message from section one
-Message from section two
-Some information
-An error
-hello
-hello
--------------------------------------------------------------------------------
-./failing/Tricky/non streamable type
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp: FAILED:
-  CHECK( &o1 == &o2 )
-with expansion:
-  0x<hex digits> == 0x<hex digits>
-
-TrickyTests.cpp: FAILED:
-  CHECK( o1 == o2 )
-with expansion:
-  {?} == {?}
-
--------------------------------------------------------------------------------
-./failing/string literals
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp: FAILED:
-  REQUIRE( std::string( "first" ) == "second" )
-with expansion:
-  "first" == "second"
-
-===============================================================================
-121 test cases - 35 failed (737 assertions - 90 failed)
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b10 host application.
-Run with -? for options
-
--------------------------------------------------------------------------------
-./succeeding/Approx/simple
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d == Approx( 1.23 ) )
-with expansion:
-  1.23 == Approx( 1.23 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d != Approx( 1.22 ) )
-with expansion:
-  1.23 != Approx( 1.22 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d != Approx( 1.24 ) )
-with expansion:
-  1.23 != Approx( 1.24 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( Approx( d ) == 1.23 )
-with expansion:
-  Approx( 1.23 ) == 1.23
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( Approx( d ) != 1.22 )
-with expansion:
-  Approx( 1.23 ) != 1.22
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( Approx( d ) != 1.24 )
-with expansion:
-  Approx( 1.23 ) != 1.24
-
--------------------------------------------------------------------------------
-./succeeding/Approx/epsilon
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d != Approx( 1.231 ) )
-with expansion:
-  1.23 != Approx( 1.231 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
-with expansion:
-  1.23 == Approx( 1.231 )
-
--------------------------------------------------------------------------------
-./succeeding/Approx/float
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 1.23f == Approx( 1.23f ) )
-with expansion:
-  1.23 == Approx( 1.23 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 0.0f == Approx( 0.0f ) )
-with expansion:
-  0 == Approx( 0 )
-
--------------------------------------------------------------------------------
-./succeeding/Approx/int
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 1 == Approx( 1 ) )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 0 == Approx( 0 ) )
-
--------------------------------------------------------------------------------
-./succeeding/Approx/mixed
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 1.0f == Approx( 1 ) )
-with expansion:
-  1 == Approx( 1 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 0 == Approx( dZero) )
-with expansion:
-  0 == Approx( 0 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
-with expansion:
-  0 == Approx( 1e-05 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( 1.234f == Approx( dMedium ) )
-with expansion:
-  1.234 == Approx( 1.234 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( dMedium == Approx( 1.234f ) )
-with expansion:
-  1.234 == Approx( 1.234 )
-
--------------------------------------------------------------------------------
-./succeeding/Approx/custom
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d == approx( 1.23 ) )
-with expansion:
-  1.23 == Approx( 1.23 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d == approx( 1.22 ) )
-with expansion:
-  1.23 == Approx( 1.22 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d == approx( 1.24 ) )
-with expansion:
-  1.23 == Approx( 1.24 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( d != approx( 1.25 ) )
-with expansion:
-  1.23 != Approx( 1.25 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( approx( d ) == 1.23 )
-with expansion:
-  Approx( 1.23 ) == 1.23
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( approx( d ) == 1.22 )
-with expansion:
-  Approx( 1.23 ) == 1.22
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( approx( d ) == 1.24 )
-with expansion:
-  Approx( 1.23 ) == 1.24
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( approx( d ) != 1.25 )
-with expansion:
-  Approx( 1.23 ) != 1.25
-
--------------------------------------------------------------------------------
-Approximate PI
--------------------------------------------------------------------------------
-ApproxTests.cpp
-...............................................................................
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
-with expansion:
-  3.1428571429 == Approx( 3.141 )
-
-ApproxTests.cpp:
-PASSED:
-  REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
-with expansion:
-  3.1428571429 != Approx( 3.141 )
-
--------------------------------------------------------------------------------
-./succeeding/TestClass/succeedingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp:
-PASSED:
-  REQUIRE( s == "hello" )
-with expansion:
-  "hello" == "hello"
-
--------------------------------------------------------------------------------
-./failing/TestClass/failingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp: FAILED:
-  REQUIRE( s == "world" )
-with expansion:
-  "hello" == "world"
-
--------------------------------------------------------------------------------
-./succeeding/Fixture/succeedingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp:
-PASSED:
-  REQUIRE( m_a == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-./failing/Fixture/failingCase
--------------------------------------------------------------------------------
-ClassTests.cpp
-...............................................................................
-
-ClassTests.cpp: FAILED:
-  REQUIRE( m_a == 2 )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-./succeeding/conditions/equality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven == 7 )
-with expansion:
-  7 == 7
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
-with expansion:
-  9.1 == Approx( 9.1 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
-with expansion:
-  3.1415926535 == Approx( 3.14159 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello == "hello" )
-with expansion:
-  "hello" == "hello"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( "hello" == data.str_hello )
-with expansion:
-  "hello" == "hello"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello.size() == 5 )
-with expansion:
-  5 == 5
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( x == Approx( 1.3 ) )
-with expansion:
-  1.3 == Approx( 1.3 )
-
--------------------------------------------------------------------------------
-./failing/conditions/equality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 6 )
-with expansion:
-  7 == 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 8 )
-with expansion:
-  7 == 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven == 0 )
-with expansion:
-  7 == 0
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
-with expansion:
-  9.1 == Approx( 9.11 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
-with expansion:
-  9.1 == Approx( 9 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 1 ) )
-with expansion:
-  9.1 == Approx( 1 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one == Approx( 0 ) )
-with expansion:
-  9.1 == Approx( 0 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.double_pi == Approx( 3.1415 ) )
-with expansion:
-  3.1415926535 == Approx( 3.1415 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "goodbye" )
-with expansion:
-  "hello" == "goodbye"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "hell" )
-with expansion:
-  "hello" == "hell"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello == "hello1" )
-with expansion:
-  "hello" == "hello1"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello.size() == 6 )
-with expansion:
-  5 == 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( x == Approx( 1.301 ) )
-with expansion:
-  1.3 == Approx( 1.301 )
-
--------------------------------------------------------------------------------
-./succeeding/conditions/inequality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven != 6 )
-with expansion:
-  7 != 6
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven != 8 )
-with expansion:
-  7 != 8
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
-with expansion:
-  9.1 != Approx( 9.11 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
-with expansion:
-  9.1 != Approx( 9 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
-with expansion:
-  9.1 != Approx( 1 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
-with expansion:
-  9.1 != Approx( 0 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.double_pi != Approx( 3.1415 ) )
-with expansion:
-  3.1415926535 != Approx( 3.1415 )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello != "goodbye" )
-with expansion:
-  "hello" != "goodbye"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello != "hell" )
-with expansion:
-  "hello" != "hell"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello != "hello1" )
-with expansion:
-  "hello" != "hello1"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello.size() != 6 )
-with expansion:
-  5 != 6
-
--------------------------------------------------------------------------------
-./failing/conditions/inequality
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven != 7 )
-with expansion:
-  7 != 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
-with expansion:
-  9.1 != Approx( 9.1 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.double_pi != Approx( 3.1415926535 ) )
-with expansion:
-  3.1415926535 != Approx( 3.14159 )
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello != "hello" )
-with expansion:
-  "hello" != "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello.size() != 5 )
-with expansion:
-  5 != 5
-
--------------------------------------------------------------------------------
-./succeeding/conditions/ordered
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven < 8 )
-with expansion:
-  7 < 8
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven > 6 )
-with expansion:
-  7 > 6
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven > 0 )
-with expansion:
-  7 > 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven > -1 )
-with expansion:
-  7 > -1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven >= 7 )
-with expansion:
-  7 >= 7
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven >= 6 )
-with expansion:
-  7 >= 6
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven <= 7 )
-with expansion:
-  7 <= 7
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.int_seven <= 8 )
-with expansion:
-  7 <= 8
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one > 9 )
-with expansion:
-  9.1 > 9
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one < 10 )
-with expansion:
-  9.1 < 10
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.float_nine_point_one < 9.2 )
-with expansion:
-  9.1 < 9.2
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello <= "hello" )
-with expansion:
-  "hello" <= "hello"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello >= "hello" )
-with expansion:
-  "hello" >= "hello"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello < "hellp" )
-with expansion:
-  "hello" < "hellp"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello < "zebra" )
-with expansion:
-  "hello" < "zebra"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello > "hellm" )
-with expansion:
-  "hello" > "hellm"
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( data.str_hello > "a" )
-with expansion:
-  "hello" > "a"
-
--------------------------------------------------------------------------------
-./failing/conditions/ordered
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven > 7 )
-with expansion:
-  7 > 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 7 )
-with expansion:
-  7 < 7
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven > 8 )
-with expansion:
-  7 > 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 6 )
-with expansion:
-  7 < 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < 0 )
-with expansion:
-  7 < 0
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven < -1 )
-with expansion:
-  7 < -1
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven >= 8 )
-with expansion:
-  7 >= 8
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.int_seven <= 6 )
-with expansion:
-  7 <= 6
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one < 9 )
-with expansion:
-  9.1 < 9
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one > 10 )
-with expansion:
-  9.1 > 10
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.float_nine_point_one > 9.2 )
-with expansion:
-  9.1 > 9.2
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "hello" )
-with expansion:
-  "hello" > "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "hello" )
-with expansion:
-  "hello" < "hello"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "hellp" )
-with expansion:
-  "hello" > "hellp"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello > "z" )
-with expansion:
-  "hello" > "z"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "hellm" )
-with expansion:
-  "hello" < "hellm"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello < "a" )
-with expansion:
-  "hello" < "a"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello >= "z" )
-with expansion:
-  "hello" >= "z"
-
-ConditionTests.cpp: FAILED:
-  CHECK( data.str_hello <= "a" )
-with expansion:
-  "hello" <= "a"
-
--------------------------------------------------------------------------------
-./succeeding/conditions/int literals
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( i == 1 )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( ui == 2 )
-with expansion:
-  2 == 2
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( l == 3 )
-with expansion:
-  3 == 3
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( ul == 4 )
-with expansion:
-  4 == 4
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( c == 5 )
-with expansion:
-  5 == 5
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( uc == 6 )
-with expansion:
-  6 == 6
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 1 == i )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 2 == ui )
-with expansion:
-  2 == 2
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 3 == l )
-with expansion:
-  3 == 3
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 4 == ul )
-with expansion:
-  4 == 4
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 5 == c )
-with expansion:
-  5 == 5
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( 6 == uc )
-with expansion:
-  6 == 6
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
-with expansion:
-  0x<hex digits> > 4
-
--------------------------------------------------------------------------------
-./succeeding/conditions//long_to_unsigned_x
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( long_var == unsigned_char_var )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( long_var == unsigned_short_var )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( long_var == unsigned_int_var )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( long_var == unsigned_long_var )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-./succeeding/conditions/const ints to int literal
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( unsigned_char_var == 1 )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( unsigned_short_var == 1 )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( unsigned_int_var == 1 )
-with expansion:
-  1 == 1
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( unsigned_long_var == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-./succeeding/conditions/negative ints
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( ( -1 > 2u ) )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( -1 > 2u )
-with expansion:
-  -1 > 2
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( ( 2u < -1 ) )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( 2u < -1 )
-with expansion:
-  2 < -1
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( ( minInt > 2u ) )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( minInt > 2u )
-with expansion:
-  -2147483648 > 2
-
--------------------------------------------------------------------------------
-./succeeding/conditions/computed ints
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  CHECK( 54 == 6*9 )
-with expansion:
-  54 == 54
-
--------------------------------------------------------------------------------
-./succeeding/conditions/ptr
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( p == __null )
-with expansion:
-  __null == 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( p == pNULL )
-with expansion:
-  __null == __null
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( p != __null )
-with expansion:
-  0x<hex digits> != 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( cp != __null )
-with expansion:
-  0x<hex digits> != 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( cpc != __null )
-with expansion:
-  0x<hex digits> != 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( returnsNull() == __null )
-with expansion:
-  {null string} == 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( returnsConstNull() == __null )
-with expansion:
-  {null string} == 0
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( __null != p )
-with expansion:
-  0 != 0x<hex digits>
-
--------------------------------------------------------------------------------
-./succeeding/conditions/not
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( false == false )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( true == true )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( !false )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE_FALSE( false )
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( !falseValue )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE_FALSE( falseValue )
-with expansion:
-  !false
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE( !(1 == 2) )
-with expansion:
-  true
-
-ConditionTests.cpp:
-PASSED:
-  REQUIRE_FALSE( 1 == 2 )
-with expansion:
-  !(1 == 2)
-
--------------------------------------------------------------------------------
-./failing/conditions/not
--------------------------------------------------------------------------------
-ConditionTests.cpp
-...............................................................................
-
-ConditionTests.cpp: FAILED:
-  CHECK( false != false )
-
-ConditionTests.cpp: FAILED:
-  CHECK( true != true )
-
-ConditionTests.cpp: FAILED:
-  CHECK( !true )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( true )
-
-ConditionTests.cpp: FAILED:
-  CHECK( !trueValue )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( trueValue )
-with expansion:
-  !true
-
-ConditionTests.cpp: FAILED:
-  CHECK( !(1 == 1) )
-with expansion:
-  false
-
-ConditionTests.cpp: FAILED:
-  CHECK_FALSE( 1 == 1 )
-with expansion:
-  !(1 == 1)
-
--------------------------------------------------------------------------------
-./succeeding/exceptions/explicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp:
-PASSED:
-  REQUIRE_THROWS_AS( thisThrows() )
-
-ExceptionTests.cpp:
-PASSED:
-  REQUIRE_NOTHROW( thisDoesntThrow() )
-
-ExceptionTests.cpp:
-PASSED:
-  REQUIRE_THROWS( thisThrows() )
-
--------------------------------------------------------------------------------
-./failing/exceptions/explicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  CHECK_THROWS_AS( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
-ExceptionTests.cpp: FAILED:
-  CHECK_THROWS_AS( thisDoesntThrow() )
-because no exception was thrown where one was expected:
-
-ExceptionTests.cpp: FAILED:
-  CHECK_NOTHROW( thisThrows() )
-due to unexpected exception with message:
-  expected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/2
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp:
-PASSED:
-  CHECK( 1 == 1 )
-
-ExceptionTests.cpp: FAILED:
-  {Unknown expression after the reported line}
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/3
-  section name
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  unexpected exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/implicit/4
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  CHECK( thisThrows() == 0 )
-due to unexpected exception with message:
-  expected exception
-
--------------------------------------------------------------------------------
-./succeeding/exceptions/implicit
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-
-No assertions in test case './succeeding/exceptions/implicit'
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  custom exception
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/nothrow
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  REQUIRE_NOTHROW( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/throw
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-  REQUIRE_THROWS_AS( throwCustom() )
-due to unexpected exception with message:
-  custom exception - not std
-
--------------------------------------------------------------------------------
-./failing/exceptions/custom/double
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp: FAILED:
-due to unexpected exception with message:
-  3.14
-
--------------------------------------------------------------------------------
-./succeeding/exceptions/notimplemented
--------------------------------------------------------------------------------
-ExceptionTests.cpp
-...............................................................................
-
-ExceptionTests.cpp:
-PASSED:
-  REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  200 == 200
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  202 == 202
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  204 == 204
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  206 == 206
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  208 == 208
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  210 == 210
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  212 == 212
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  2 == 2
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  4 == 4
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  6 == 6
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  8 == 8
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  10 == 10
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  30 == 30
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  40 == 40
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  42 == 42
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/1
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
-with expansion:
-  72 == 72
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
-with expansion:
-  214 == 214
-
--------------------------------------------------------------------------------
-./succeeding/generators/2
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( i->first == i->second-1 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-./succeeding/generators/2
--------------------------------------------------------------------------------
-GeneratorTests.cpp
-...............................................................................
-
-GeneratorTests.cpp:
-PASSED:
-  CATCH_REQUIRE( i->first == i->second-1 )
-with expansion:
-  2 == 2
-
--------------------------------------------------------------------------------
-./succeeding/message
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp:
-warning:
-  this is a message
-  this is a warning
-
-
-No assertions in test case './succeeding/message'
-
--------------------------------------------------------------------------------
-./succeeding/succeed
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp:
-PASSED:
-with message:
-  this is a success
-
--------------------------------------------------------------------------------
-./failing/message/info/1
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-  REQUIRE( a == 1 )
-with expansion:
-  2 == 1
-with messages:
-  this message should be logged
-  so should this
-
--------------------------------------------------------------------------------
-./mixed/message/info/2
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp:
-PASSED:
-  CHECK( a == 2 )
-with expansion:
-  2 == 2
-with message:
-  this message may be logged later
-
-MessageTests.cpp: FAILED:
-  CHECK( a == 1 )
-with expansion:
-  2 == 1
-with message:
-  this message should be logged
-
-MessageTests.cpp: FAILED:
-  CHECK( a == 0 )
-with expansion:
-  2 == 0
-with message:
-  and this, but later
-
-MessageTests.cpp:
-PASSED:
-  CHECK( a == 2 )
-with expansion:
-  2 == 2
-with message:
-  but not this
-
--------------------------------------------------------------------------------
-./failing/message/fail
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  This is a failure
-
--------------------------------------------------------------------------------
-./failing/message/sections
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Message from section one
-
--------------------------------------------------------------------------------
-./failing/message/sections
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Message from section two
-
-Message from section one
--------------------------------------------------------------------------------
-./succeeding/message/sections/stdout
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-
-No assertions in section 'one'
-
-Message from section two
--------------------------------------------------------------------------------
-./succeeding/message/sections/stdout
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-
-No assertions in section 'two'
-
--------------------------------------------------------------------------------
-./mixed/message/scoped
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  0 < 10
-with messages:
-  current counter 0
-  i := 0
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  1 < 10
-with messages:
-  current counter 1
-  i := 1
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  2 < 10
-with messages:
-  current counter 2
-  i := 2
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  3 < 10
-with messages:
-  current counter 3
-  i := 3
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  4 < 10
-with messages:
-  current counter 4
-  i := 4
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  5 < 10
-with messages:
-  current counter 5
-  i := 5
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  6 < 10
-with messages:
-  current counter 6
-  i := 6
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  7 < 10
-with messages:
-  current counter 7
-  i := 7
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  8 < 10
-with messages:
-  current counter 8
-  i := 8
-
-MessageTests.cpp:
-PASSED:
-  REQUIRE( i < 10 )
-with expansion:
-  9 < 10
-with messages:
-  current counter 9
-  i := 9
-
-MessageTests.cpp: FAILED:
-  REQUIRE( i < 10 )
-with expansion:
-  10 < 10
-with messages:
-  current counter 10
-  i := 10
-
--------------------------------------------------------------------------------
-./succeeding/nofail
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp:
-FAILED - but was ok:
-  CHECK_NOFAIL( 1 == 2 )
-
-
-No assertions in test case './succeeding/nofail'
-
--------------------------------------------------------------------------------
-just info
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-
-No assertions in test case 'just info'
-
--------------------------------------------------------------------------------
-just failure
--------------------------------------------------------------------------------
-MessageTests.cpp
-...............................................................................
-
-MessageTests.cpp: FAILED:
-explicitly with message:
-  Previous info should not be seen
-
--------------------------------------------------------------------------------
-./succeeding/Misc/Sections
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( b != a )
-with expansion:
-  2 != 1
-
--------------------------------------------------------------------------------
-./succeeding/Misc/Sections
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-./succeeding/Misc/Sections/nested
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( b != a )
-with expansion:
-  2 != 1
-
--------------------------------------------------------------------------------
-./succeeding/Misc/Sections/nested
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( b != a )
-with expansion:
-  2 != 1
-
--------------------------------------------------------------------------------
-./succeeding/Misc/Sections/nested
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/nested2
-  s1
-  s2
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( a == b )
-with expansion:
-  1 == 2
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/nested2
-  s1
-  s3
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a != b )
-with expansion:
-  1 != 2
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/nested2
-  s1
-  s4
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( a < b )
-with expansion:
-  1 < 2
-
--------------------------------------------------------------------------------
-./Sections/nested/a/b
-  c
-  d (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in section 'd (leaf)'
-
--------------------------------------------------------------------------------
-./Sections/nested/a/b
-  c
-  e (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in section 'e (leaf)'
-
--------------------------------------------------------------------------------
-./Sections/nested/a/b
-  f (leaf)
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in section 'f (leaf)'
-
--------------------------------------------------------------------------------
-./mixed/Misc/Sections/loops
-  s1
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK( b > a )
-with expansion:
-  0 > 1
-
--------------------------------------------------------------------------------
-./mixed/Misc/loops
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[0] (1) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[1] (1) is even
-
-MiscTests.cpp:
-PASSED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  0 == 0
-with message:
-  Testing if fib[2] (2) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[3] (3) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[4] (5) is even
-
-MiscTests.cpp:
-PASSED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  0 == 0
-with message:
-  Testing if fib[5] (8) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[6] (13) is even
-
-MiscTests.cpp: FAILED:
-  CHECK( ( fib[i] % 2 ) == 0 )
-with expansion:
-  1 == 0
-with message:
-  Testing if fib[7] (21) is even
-
-Some information
-An error
--------------------------------------------------------------------------------
-./succeeding/Misc/stdout,stderr
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in test case './succeeding/Misc/stdout,stderr'
-
--------------------------------------------------------------------------------
-./succeeding/Misc/null strings
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( makeString( false ) != static_cast<char*>(__null) )
-with expansion:
-  "valid string" != {null string}
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( makeString( true ) == static_cast<char*>(__null) )
-with expansion:
-  {null string} == {null string}
-
--------------------------------------------------------------------------------
-./failing/info
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( false )
-with messages:
-  hi
-  i := 7
-
--------------------------------------------------------------------------------
-./succeeding/checkedif
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  CHECKED_IF( flag )
-with expansion:
-  true
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( testCheckedIf( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-./failing/checkedif
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECKED_IF( flag )
-with expansion:
-  false
-
-MiscTests.cpp: FAILED:
-  REQUIRE( testCheckedIf( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-./succeeding/checkedelse
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  CHECKED_ELSE( flag )
-with expansion:
-  true
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( testCheckedElse( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-./failing/checkedelse
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECKED_ELSE( flag )
-with expansion:
-  false
-
-MiscTests.cpp: FAILED:
-  REQUIRE( testCheckedElse( false ) )
-with expansion:
-  false
-
--------------------------------------------------------------------------------
-./misc/xmlentitycheck
-  embedded xml
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in section 'embedded xml'
-
--------------------------------------------------------------------------------
-./misc/xmlentitycheck
-  encoded chars
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in section 'encoded chars'
-
--------------------------------------------------------------------------------
-./manual/onechar
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  REQUIRE( false )
-with message:
-  3
-
--------------------------------------------------------------------------------
-./succeeding/atomic if
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( x == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-./succeeding/matchers
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "string"
-
-MiscTests.cpp:
-PASSED:
-  CHECK_THAT( testStringForMatching() Contains( "abc" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "abc"
-
-MiscTests.cpp:
-PASSED:
-  CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "this"
-
-MiscTests.cpp:
-PASSED:
-  CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "substring"
-
--------------------------------------------------------------------------------
-./failing/matchers/Contains
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() Contains( "not there" ) )
-with expansion:
-  "this string contains 'abc' as a substring" contains: "not there"
-
--------------------------------------------------------------------------------
-./failing/matchers/StartsWith
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
-with expansion:
-  "this string contains 'abc' as a substring" starts with: "string"
-
--------------------------------------------------------------------------------
-./failing/matchers/EndsWith
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
-with expansion:
-  "this string contains 'abc' as a substring" ends with: "this"
-
--------------------------------------------------------------------------------
-./failing/matchers/Equals
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-  CHECK_THAT( testStringForMatching() Equals( "something else" ) )
-with expansion:
-  "this string contains 'abc' as a substring" equals: "something else"
-
--------------------------------------------------------------------------------
-string
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE_THAT( "" Equals(__null) )
-with expansion:
-  "" equals: ""
-
--------------------------------------------------------------------------------
-./succeeding/matchers/AllOf
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-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" )
-
--------------------------------------------------------------------------------
-./succeeding/matchers/AnyOf
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-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:
-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" )
-
--------------------------------------------------------------------------------
-./succeeding/matchers/Equals
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-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"
-
--------------------------------------------------------------------------------
-Factorials are computed
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( Factorial(0) == 1 )
-with expansion:
-  1 == 1
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( Factorial(1) == 1 )
-with expansion:
-  1 == 1
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( Factorial(2) == 2 )
-with expansion:
-  2 == 2
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( Factorial(3) == 6 )
-with expansion:
-  6 == 6
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( Factorial(10) == 3628800 )
-with expansion:
-  0x<hex digits> == 3628800
-
--------------------------------------------------------------------------------
-empty
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in test case 'empty'
-
--------------------------------------------------------------------------------
-Nice descriptive name
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-warning:
-  This one ran
-
-
-No assertions in test case 'Nice descriptive name'
-
--------------------------------------------------------------------------------
-first tag
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in test case 'first tag'
-
--------------------------------------------------------------------------------
-second tag
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-
-No assertions in test case 'second tag'
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing bigger changes size and capacity
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 10 )
-with expansion:
-  10 == 10
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing smaller changes size but not capacity
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  resizing smaller changes size but not capacity
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
-MiscTests.cpp:
-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
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
-  reserving bigger changes capacity but not size
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-vectors can be sized and resized
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-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
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-MiscTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 5 )
-with expansion:
-  5 >= 5
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
-  Outer
-  Inner
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp:
-PASSED:
-with message:
-  that's not flying - that's failing in style
-
--------------------------------------------------------------------------------
-./failing/CatchSectionInfiniteLoop
--------------------------------------------------------------------------------
-MiscTests.cpp
-...............................................................................
-
-MiscTests.cpp: FAILED:
-explicitly with message:
-  to infinity and beyond
-
--------------------------------------------------------------------------------
-selftest/main
-  selftest/expected result
-  selftest/expected result/failing tests
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests failed, as expected
-
--------------------------------------------------------------------------------
-selftest/main
-  selftest/expected result
-  selftest/expected result/succeeding tests
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-Message from section one
-Message from section two
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-Some information
-An error
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-catch_self_test.hpp:
-PASSED:
-with message:
-  Tests passed, as expected
-
-Message from section one
-Message from section two
-Some information
-An error
--------------------------------------------------------------------------------
-selftest/main
-  selftest/test counts
-  selftest/test counts/succeeding tests
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.passed == 298 )
-with expansion:
-  298 == 298
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.failed == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-selftest/main
-  selftest/test counts
-  selftest/test counts/failing tests
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.passed == 2 )
-with expansion:
-  2 == 2
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.failed == 77 )
-with expansion:
-  77 == 77
-
--------------------------------------------------------------------------------
-meta/Misc/Sections
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.passed == 2 )
-with expansion:
-  2 == 2
-
-TestMain.cpp:
-PASSED:
-  CHECK( totals.assertions.failed == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  default - no arguments
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.shouldDebugBreak == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.abortAfter == -1 )
-with expansion:
-  -1 == -1
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.noThrow == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.reporterName.empty() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  1 test
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters().size() == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  Specify one test case exclusion using exclude:
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters().size() == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  Specify one test case exclusion using ~
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters().size() == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  test lists
-  Specify two test cases using -t
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters().size() == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  -r/console
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.reporterName == "console" )
-with expansion:
-  "console" == "console"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  -r/xml
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.reporterName == "xml" )
-with expansion:
-  "xml" == "xml"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  reporter
-  --reporter/junit
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.reporterName == "junit" )
-with expansion:
-  "junit" == "junit"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  debugger
-  -b
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.shouldDebugBreak == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  debugger
-  --break
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.shouldDebugBreak )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -a aborts after first failure
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-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 <number of failures>)" contains: "greater than
-  zero"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  abort
-  -x must be numeric
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) )
-with expansion:
-  "Unable to convert oops to destination type
-  - while parsing: (-x, --abortx <number of failures>)" contains: "-x"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  nothrow
-  -e
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  nothrow
-  --nothrow
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  output filename
-  -o filename
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( config.outputFilename == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-Process can be configured on command line
-  output filename
-  --out
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.abortAfter == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.shouldDebugBreak )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( config.noThrow == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-selftest/test filter
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-selftest/test filters
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-selftest/filter/prefix wildcard
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-selftest/filter/wildcard at both ends
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-selftest/tags
-  one tag
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.getTestCaseInfo().description == "" )
-with expansion:
-  "" == ""
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.hasTag( "one" ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.getTags().size() == 1 )
-with expansion:
-  1 == 1
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( p1 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( p2 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( p3 ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( p4 ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( p5 ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-selftest/tags
-  two tags
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.getTestCaseInfo().description == "" )
-with expansion:
-  "" == ""
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.hasTag( "one" ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.hasTag( "two" ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.hasTag( "Two" ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.hasTag( "three" ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.getTags().size() == 2 )
-with expansion:
-  2 == 2
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.matchesTags( p1 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.matchesTags( p2 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.matchesTags( p3 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.matchesTags( p4 ) == true )
-with expansion:
-  true == true
-
-TestMain.cpp:
-PASSED:
-  CHECK( twoTags.matchesTags( p5 ) == true )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-selftest/tags
-  one tag with characters either side
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
-with expansion:
-  "1234" == "1234"
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagWithExtras.hasTag( "one" ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagWithExtras.hasTag( "two" ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagWithExtras.getTags().size() == 1 )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-selftest/tags
-  start of a tag, but not closed
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
-with expansion:
-  "[one" == "[one"
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagOpen.hasTag( "one" ) == false )
-with expansion:
-  false == false
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTagOpen.getTags().size() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-selftest/tags
-  hidden
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.getTestCaseInfo().description == "" )
-with expansion:
-  "" == ""
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.hasTag( "." ) )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.isHidden() )
-with expansion:
-  true
-
-TestMain.cpp:
-PASSED:
-  CHECK( oneTag.matchesTags( "~[.]" ) == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  No wrapping
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
-with expansion:
-  "one two three four"
-  ==
-  "one two three four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
-with expansion:
-  "one two three
-  four"
-  ==
-  "one two three
-  four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
-with expansion:
-  "one
-  two
-  three
-  four"
-  ==
-  "one
-  two
-  three
-  four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
-with expansion:
-  "abc-
-  def"
-  ==
-  "abc-
-  def"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
-with expansion:
-  "abc-
-  defg"
-  ==
-  "abc-
-  defg"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
-with expansion:
-  "abc-
-  def-
-  gh"
-  ==
-  "abc-
-  def-
-  gh"
-
-TestMain.cpp:
-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:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  REQUIRE( text.size() == 4 )
-with expansion:
-  4 == 4
-
-TestMain.cpp:
-PASSED:
-  CHECK( text[0] == "one" )
-with expansion:
-  "one" == "one"
-
-TestMain.cpp:
-PASSED:
-  CHECK( text[1] == "two" )
-with expansion:
-  "two" == "two"
-
-TestMain.cpp:
-PASSED:
-  CHECK( text[2] == "three" )
-with expansion:
-  "three" == "three"
-
-TestMain.cpp:
-PASSED:
-  CHECK( text[3] == "four" )
-with expansion:
-  "four" == "four"
-
--------------------------------------------------------------------------------
-Long strings can be wrapped
-  plain string
-  Indent first line differently
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
-with expansion:
-  "one two
-  three four"
-  ==
-  "one two
-  three four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
-with expansion:
-  "abcdef
-  "
-  ==
-  "abcdef
-  "
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
-with expansion:
-  "abcdef" == "abcdef"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
-with expansion:
-  "one two
-  three
-  four"
-  ==
-  "one two
-  three
-  four"
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-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
-...............................................................................
-
-TestMain.cpp:
-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"
-
-hello
-hello
--------------------------------------------------------------------------------
-Strings can be rendered with colour
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-
-No assertions in test case 'Strings can be rendered with colour'
-
--------------------------------------------------------------------------------
-Text can be formatted using the Text class
--------------------------------------------------------------------------------
-TestMain.cpp
-...............................................................................
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "hi there" ).toString() == "hi there" )
-with expansion:
-  "hi there" == "hi there"
-
-TestMain.cpp:
-PASSED:
-  CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
-with expansion:
-  "hi
-  there"
-  ==
-  "hi
-  there"
-
--------------------------------------------------------------------------------
-./succeeding/Tricky/std::pair
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
-with expansion:
-  std::pair( 1, 2 ) == std::pair( 1, 2 )
-
--------------------------------------------------------------------------------
-./inprogress/failing/Tricky/trailing expression
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
-  error
-
-
-No assertions in test case './inprogress/failing/Tricky/trailing expression'
-
--------------------------------------------------------------------------------
-./inprogress/failing/Tricky/compound lhs
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-warning:
-  Uncomment the code in this test to check that it gives a sensible compiler
-  error
-
-
-No assertions in test case './inprogress/failing/Tricky/compound lhs'
-
--------------------------------------------------------------------------------
-./failing/Tricky/non streamable type
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp: FAILED:
-  CHECK( &o1 == &o2 )
-with expansion:
-  0x<hex digits> == 0x<hex digits>
-
-TrickyTests.cpp: FAILED:
-  CHECK( o1 == o2 )
-with expansion:
-  {?} == {?}
-
--------------------------------------------------------------------------------
-./failing/string literals
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp: FAILED:
-  REQUIRE( std::string( "first" ) == "second" )
-with expansion:
-  "first" == "second"
-
--------------------------------------------------------------------------------
-./succeeding/side-effects
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( i++ == 7 )
-with expansion:
-  7 == 7
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( i++ == 8 )
-with expansion:
-  8 == 8
-
--------------------------------------------------------------------------------
-./succeeding/koenig
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( 0x<hex digits> == o )
-with expansion:
-  0x<hex digits> == {?}
-
--------------------------------------------------------------------------------
-./succeeding/non-const==
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( t == 1u )
-with expansion:
-  {?} == 1
-
--------------------------------------------------------------------------------
-./succeeding/enum/bits
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( 0x<hex digits> == bit30and31 )
-with expansion:
-  0x<hex digits> == 3221225472
-
--------------------------------------------------------------------------------
-./succeeding/boolean member
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( obj.prop != __null )
-with expansion:
-  0x<hex digits> != 0
-
--------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  compare to true
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( is_true<true>::value == true )
-with expansion:
-  true == true
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( true == is_true<true>::value )
-with expansion:
-  true == true
-
--------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  compare to false
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( is_true<false>::value == false )
-with expansion:
-  false == false
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( false == is_true<false>::value )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  negation
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( !is_true<false>::value )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  double negation
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( !!is_true<true>::value )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-./succeeding/unimplemented static bool
-  direct
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( is_true<true>::value )
-with expansion:
-  true
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE_FALSE( is_true<false>::value )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-./succeeding/SafeBool
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  CHECK( True )
-with expansion:
-  true
-
-TrickyTests.cpp:
-PASSED:
-  CHECK( !False )
-with expansion:
-  true
-
-TrickyTests.cpp:
-PASSED:
-  CHECK_FALSE( False )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-Assertions then sections
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
-  Another section
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Assertions then sections
-  A section
-  Another other section
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( Catch::isTrue( true ) )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-non streamable - with conv. op
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( s == "7" )
-with expansion:
-  "7" == "7"
-
--------------------------------------------------------------------------------
-Comparing function pointers
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( a )
-with expansion:
-  true
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( a == &foo )
-with expansion:
-  1 == 1
-
--------------------------------------------------------------------------------
-pointer to class
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-  REQUIRE( p == 0 )
-with expansion:
-  __null == 0
-
--------------------------------------------------------------------------------
-X/level/0/a
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-
--------------------------------------------------------------------------------
-X/level/0/b
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-
--------------------------------------------------------------------------------
-X/level/1/a
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-
--------------------------------------------------------------------------------
-X/level/1/b
--------------------------------------------------------------------------------
-TrickyTests.cpp
-...............................................................................
-
-TrickyTests.cpp:
-PASSED:
-
--------------------------------------------------------------------------------
-Anonymous test case 1
--------------------------------------------------------------------------------
-VariadicMacrosTests.cpp
-...............................................................................
-
-VariadicMacrosTests.cpp:
-PASSED:
-with message:
-  anonymous test case
-
--------------------------------------------------------------------------------
-Test case with one argument
--------------------------------------------------------------------------------
-VariadicMacrosTests.cpp
-...............................................................................
-
-VariadicMacrosTests.cpp:
-PASSED:
-with message:
-  no assertions
-
--------------------------------------------------------------------------------
-Variadic macros
-  Section with one argument
--------------------------------------------------------------------------------
-VariadicMacrosTests.cpp
-...............................................................................
-
-VariadicMacrosTests.cpp:
-PASSED:
-with message:
-  no assertions
-
--------------------------------------------------------------------------------
-Scenario: Do that thing with the thing
-     Given: This stuff exists
-      When: I do this
-      Then: it should do this
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( itDoesThis() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Scenario: Do that thing with the thing
-     Given: This stuff exists
-      When: I do this
-      Then: it should do this
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( itDoesThis() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Scenario: Do that thing with the thing
-     Given: This stuff exists
-      When: I do this
-      Then: it should do this
-       And: do that
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( itDoesThat() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 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
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 10 )
-with expansion:
-  10 == 10
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 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
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 10 )
-with expansion:
-  10 == 10
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 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
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 10 )
-with expansion:
-  10 == 10
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-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
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 5 )
-with expansion:
-  5 == 5
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-Scenario: Vector resizing affects size and capacity
-     Given: an empty vector
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-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
--------------------------------------------------------------------------------
-BDDTests.cpp
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.capacity() >= 10 )
-with expansion:
-  10 >= 10
-
-BDDTests.cpp:
-PASSED:
-  REQUIRE( v.size() == 0 )
-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
-...............................................................................
-
-BDDTests.cpp:
-PASSED:
-with message:
-  boo!
-
--------------------------------------------------------------------------------
-cmdline
-  process name
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.processName == "test" )
-with expansion:
-  "test" == "test"
-
--------------------------------------------------------------------------------
-cmdline
-  arg separated by spaces
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.fileName == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-cmdline
-  arg separated by colon
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.fileName == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-cmdline
-  arg separated by =
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.fileName == "filename.ext" )
-with expansion:
-  "filename.ext" == "filename.ext"
-
--------------------------------------------------------------------------------
-cmdline
-  long opt
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.fileName == "%stdout" )
-with expansion:
-  "%stdout" == "%stdout"
-
--------------------------------------------------------------------------------
-cmdline
-  a number
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.number == 42 )
-with expansion:
-  42 == 42
-
--------------------------------------------------------------------------------
-cmdline
-  not a number
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK_THROWS( parseInto( cli, argv, config ) )
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config.number == 0 )
-with expansion:
-  0 == 0
-
--------------------------------------------------------------------------------
-cmdline
-  two parsers
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config1.number == 42 )
-with expansion:
-  42 == 42
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE_FALSE( unusedTokens.empty() )
-with expansion:
-  !false
-
-CmdLineTests.cpp:
-PASSED:
-  CHECK( config2.description == "some text" )
-with expansion:
-  "some text" == "some text"
-
--------------------------------------------------------------------------------
-cmdline
-  methods
-  in range
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.index == 3 )
-with expansion:
-  3 == 3
-
--------------------------------------------------------------------------------
-cmdline
-  methods
-  out of range
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE_THROWS( parseInto( cli, argv, config ) )
-
--------------------------------------------------------------------------------
-cmdline
-  flags
-  set
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.flag )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-cmdline
-  flags
-  not set
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.flag == false )
-with expansion:
-  false == false
-
--------------------------------------------------------------------------------
-cmdline
-  positional
--------------------------------------------------------------------------------
-CmdLineTests.cpp
-...............................................................................
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.firstPos == "1st" )
-with expansion:
-  "1st" == "1st"
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.secondPos == "2nd" )
-with expansion:
-  "2nd" == "2nd"
-
-CmdLineTests.cpp:
-PASSED:
-  REQUIRE( config.unpositional == "3rd" )
-with expansion:
-  "3rd" == "3rd"
-
--------------------------------------------------------------------------------
-section tracking
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-section tracking
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-section tracking
-  test case with no sections
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.isCompleted() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-section tracking
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-section tracking
-  test case with one section
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.isCompleted() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-section tracking
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-section tracking
-  test case with two consecutive sections
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section2Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.isCompleted() )
-with expansion:
-  true
-
--------------------------------------------------------------------------------
-section tracking
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
--------------------------------------------------------------------------------
-section tracking
-  test case with one section within another
--------------------------------------------------------------------------------
-SectionTrackerTests.cpp
-...............................................................................
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK_FALSE( testCaseTracker.isCompleted() )
-with expansion:
-  !false
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section1Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.enterSection( section2Name ) )
-with expansion:
-  true
-
-SectionTrackerTests.cpp:
-PASSED:
-  CHECK( testCaseTracker.isCompleted() )
-with expansion:
-  true
-
-===============================================================================
-121 test cases - 50 failed (756 assertions - 109 failed)
-
-No test cases matched '~dummy 4'
-No tests ran
-
-<testsuites>
-  <testsuite name="~dummy" errors="10" failures="99" tests="756" hostname="tbd" time="{duration}" timestamp="tbd">
-    <testcase classname="global" name="./succeeding/Approx/simple" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/Approx/epsilon" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/Approx/float" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/Approx/int" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/Approx/mixed" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/Approx/custom" time="{duration}"/>
-    <testcase classname="global" name="Approximate PI" time="{duration}"/>
-    <testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="{duration}"/>
-    <testcase classname="TestClass" name="./failing/TestClass/failingCase" time="{duration}">
-      <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
-ClassTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="{duration}"/>
-    <testcase classname="Fixture" name="./failing/Fixture/failingCase" time="{duration}">
-      <failure message="1 == 2" type="REQUIRE">
-ClassTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/conditions/equality" time="{duration}"/>
-    <testcase classname="global" name="./failing/conditions/equality" time="{duration}">
-      <failure message="7 == 6" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 == 8" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 == 0" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 == Approx( 9.11 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 == Approx( 9 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 == Approx( 1 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 == Approx( 0 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="5 == 6" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="1.3 == Approx( 1.301 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/conditions/inequality" time="{duration}"/>
-    <testcase classname="global" name="./failing/conditions/inequality" time="{duration}">
-      <failure message="7 != 7" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 != Approx( 9.1 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="3.1415926535 != Approx( 3.14159 )" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="5 != 5" type="CHECK">
-ConditionTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/conditions/ordered" time="{duration}"/>
-    <testcase classname="global" name="./failing/conditions/ordered" time="{duration}">
-      <failure message="7 > 7" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 &lt; 7" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 > 8" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 &lt; 6" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 &lt; 0" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 &lt; -1" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 >= 8" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="7 &lt;= 6" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 &lt; 9" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 > 10" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="9.1 > 9.2" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
-ConditionTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/conditions/int literals" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions//long_to_unsigned_x" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions/const ints to int literal" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions/negative ints" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions/computed ints" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions/ptr" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/conditions/not" time="{duration}"/>
-    <testcase classname="global" name="./failing/conditions/not" time="{duration}">
-      <failure message="false != false" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="true != true" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp
-      </failure>
-      <failure message="!(1 == 1)" type="CHECK_FALSE">
-ConditionTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/exceptions/explicit" time="{duration}"/>
-    <testcase classname="global" name="./failing/exceptions/explicit" time="{duration}">
-      <error message="thisThrows()" type="CHECK_THROWS_AS">
-expected exception
-ExceptionTests.cpp
-      </error>
-      <failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
-ExceptionTests.cpp
-      </failure>
-      <error message="thisThrows()" type="CHECK_NOTHROW">
-expected exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/implicit" time="{duration}">
-      <error type="TEST_CASE">
-unexpected exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/implicit/2" time="{duration}">
-      <error message="{Unknown expression after the reported line}">
-unexpected exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="./failing/exceptions/implicit/3" name="section name" time="{duration}">
-      <error type="TEST_CASE">
-unexpected exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/implicit/4" time="{duration}">
-      <error message="thisThrows() == 0" type="CHECK">
-expected exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/custom" time="{duration}">
-      <error type="TEST_CASE">
-custom exception
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="{duration}">
-      <error message="throwCustom()" type="REQUIRE_NOTHROW">
-custom exception - not std
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/custom/throw" time="{duration}">
-      <error message="throwCustom()" type="REQUIRE_THROWS_AS">
-custom exception - not std
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./failing/exceptions/custom/double" time="{duration}">
-      <error type="TEST_CASE">
-3.14
-ExceptionTests.cpp
-      </error>
-    </testcase>
-    <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/generators/1" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/generators/2" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/message" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/succeed" time="{duration}"/>
-    <testcase classname="global" name="./failing/message/info/1" time="{duration}">
-      <failure message="2 == 1" type="REQUIRE">
-this message should be logged
-so should this
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./mixed/message/info/2" time="{duration}">
-      <failure message="2 == 1" type="CHECK">
-this message should be logged
-MessageTests.cpp
-      </failure>
-      <failure message="2 == 0" type="CHECK">
-and this, but later
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./failing/message/fail" time="{duration}">
-      <failure type="FAIL">
-This is a failure
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./failing/message/sections" name="one" time="{duration}">
-      <failure type="FAIL">
-Message from section one
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./failing/message/sections" name="two" time="{duration}">
-      <failure type="FAIL">
-Message from section two
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./succeeding/message/sections/stdout" name="two" time="{duration}">
-      <system-out>
-Message from section one
-Message from section two
-      </system-out>
-    </testcase>
-    <testcase classname="global" name="./mixed/message/scoped" time="{duration}">
-      <failure message="10 &lt; 10" type="REQUIRE">
-current counter 10
-i := 10
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/nofail" time="{duration}"/>
-    <testcase classname="global" name="just failure" time="{duration}">
-      <failure type="FAIL">
-Previous info should not be seen
-MessageTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./succeeding/Misc/Sections" name="s1" time="{duration}"/>
-    <testcase classname="./succeeding/Misc/Sections" name="s2" time="{duration}"/>
-    <testcase classname="./succeeding/Misc/Sections/nested" name="s1" time="{duration}"/>
-    <testcase classname="./succeeding/Misc/Sections/nested" name="s1/s2" time="{duration}"/>
-    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s2" time="{duration}">
-      <failure message="1 == 2" type="REQUIRE">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s3" time="{duration}"/>
-    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s4" time="{duration}"/>
-    <testcase classname="./mixed/Misc/Sections/loops" name="s1" time="{duration}">
-      <failure message="0 > 1" type="CHECK">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./mixed/Misc/loops" time="{duration}">
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[0] (1) is even
-MiscTests.cpp
-      </failure>
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[1] (1) is even
-MiscTests.cpp
-      </failure>
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[3] (3) is even
-MiscTests.cpp
-      </failure>
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[4] (5) is even
-MiscTests.cpp
-      </failure>
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[6] (13) is even
-MiscTests.cpp
-      </failure>
-      <failure message="1 == 0" type="CHECK">
-Testing if fib[7] (21) is even
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="{duration}">
-      <system-out>
-Some information
-      </system-out>
-      <system-err>
-An error
-      </system-err>
-    </testcase>
-    <testcase classname="global" name="./succeeding/Misc/null strings" time="{duration}"/>
-    <testcase classname="global" name="./failing/info" time="{duration}">
-      <failure message="false" type="REQUIRE">
-hi
-i := 7
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/checkedif" time="{duration}"/>
-    <testcase classname="global" name="./failing/checkedif" time="{duration}">
-      <failure message="false" type="CHECKED_IF">
-MiscTests.cpp
-      </failure>
-      <failure message="false" type="REQUIRE">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/checkedelse" time="{duration}"/>
-    <testcase classname="global" name="./failing/checkedelse" time="{duration}">
-      <failure message="false" type="CHECKED_ELSE">
-MiscTests.cpp
-      </failure>
-      <failure message="false" type="REQUIRE">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./manual/onechar" time="{duration}">
-      <failure message="false" type="REQUIRE">
-3
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/atomic if" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/matchers" time="{duration}"/>
-    <testcase classname="global" name="./failing/matchers/Contains" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./failing/matchers/StartsWith" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./failing/matchers/EndsWith" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./failing/matchers/Equals" time="{duration}">
-      <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="string" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/matchers/AllOf" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/matchers/AnyOf" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/matchers/Equals" time="{duration}"/>
-    <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="./failing/CatchSectionInfiniteLoop" name="root" time="{duration}">
-      <failure type="FAIL">
-to infinity and beyond
-MiscTests.cpp
-      </failure>
-      <failure type="FAIL">
-to infinity and beyond
-MiscTests.cpp
-      </failure>
-      <failure type="FAIL">
-to infinity and beyond
-MiscTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="./failing/CatchSectionInfiniteLoop" name="Outer/Inner" time="{duration}"/>
-    <testcase classname="selftest/main" name="selftest/expected result/selftest/expected result/failing tests" time="{duration}"/>
-    <testcase classname="selftest/main" name="selftest/expected result/selftest/expected result/succeeding tests" time="{duration}"/>
-    <testcase classname="selftest/main" name="selftest/test counts/selftest/test counts/succeeding tests" time="{duration}"/>
-    <testcase classname="selftest/main" name="selftest/test counts/selftest/test counts/failing tests" time="{duration}">
-      <system-out>
-Message from section one
-Message from section two
-Some information
-Message from section one
-Message from section two
-Some information
-      </system-out>
-      <system-err>
-An error
-An error
-      </system-err>
-    </testcase>
-    <testcase classname="global" name="meta/Misc/Sections" 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="test lists/Specify two test cases using -t" 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/--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="global" name="selftest/test filter" time="{duration}"/>
-    <testcase classname="global" name="selftest/test filters" time="{duration}"/>
-    <testcase classname="global" name="selftest/filter/prefix wildcard" time="{duration}"/>
-    <testcase classname="global" name="selftest/filter/wildcard at both ends" time="{duration}"/>
-    <testcase classname="selftest/tags" name="one tag" time="{duration}"/>
-    <testcase classname="selftest/tags" name="two tags" time="{duration}"/>
-    <testcase classname="selftest/tags" name="one tag with characters either side" time="{duration}"/>
-    <testcase classname="selftest/tags" name="start of a tag, but not closed" time="{duration}"/>
-    <testcase classname="selftest/tags" name="hidden" 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="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="./succeeding/Tricky/std::pair" time="{duration}"/>
-    <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="{duration}"/>
-    <testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="{duration}"/>
-    <testcase classname="global" name="./failing/Tricky/non streamable type" time="{duration}">
-      <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-TrickyTests.cpp
-      </failure>
-      <failure message="{?} == {?}" type="CHECK">
-TrickyTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./failing/string literals" time="{duration}">
-      <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
-TrickyTests.cpp
-      </failure>
-    </testcase>
-    <testcase classname="global" name="./succeeding/side-effects" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/koenig" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/non-const==" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/enum/bits" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/boolean member" time="{duration}"/>
-    <testcase classname="./succeeding/unimplemented static bool" name="compare to true" time="{duration}"/>
-    <testcase classname="./succeeding/unimplemented static bool" name="compare to false" time="{duration}"/>
-    <testcase classname="./succeeding/unimplemented static bool" name="negation" time="{duration}"/>
-    <testcase classname="./succeeding/unimplemented static bool" name="double negation" time="{duration}"/>
-    <testcase classname="./succeeding/unimplemented static bool" name="direct" time="{duration}"/>
-    <testcase classname="global" name="./succeeding/SafeBool" 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="pointer to class" 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="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="cmdline" name="process name" time="{duration}"/>
-    <testcase classname="cmdline" name="arg separated by spaces" time="{duration}"/>
-    <testcase classname="cmdline" name="arg separated by colon" time="{duration}"/>
-    <testcase classname="cmdline" name="arg separated by =" time="{duration}"/>
-    <testcase classname="cmdline" name="long opt" time="{duration}"/>
-    <testcase classname="cmdline" name="a number" time="{duration}"/>
-    <testcase classname="cmdline" name="not a number" time="{duration}"/>
-    <testcase classname="cmdline" name="two parsers" time="{duration}"/>
-    <testcase classname="cmdline" name="methods/in range" time="{duration}"/>
-    <testcase classname="cmdline" name="methods/out of range" time="{duration}"/>
-    <testcase classname="cmdline" name="flags/set" time="{duration}"/>
-    <testcase classname="cmdline" name="flags/not set" time="{duration}"/>
-    <testcase classname="cmdline" name="positional" time="{duration}"/>
-    <testcase classname="section tracking" name="root" time="{duration}"/>
-    <testcase classname="section tracking" name="test case with no sections" time="{duration}"/>
-    <testcase classname="section tracking" name="test case with one section" time="{duration}"/>
-    <testcase classname="section tracking" name="test case with two consecutive sections" time="{duration}"/>
-    <testcase classname="section tracking" name="test case with one section within another" time="{duration}"/>
-    <system-out>
-Message from section one
-Message from section two
-Some information
-Message from section one
-Message from section two
-Some information
-Message from section one
-Message from section two
-Some information
-hello
-hello
-    </system-out>
-    <system-err>
-An error
-An error
-An error
-    </system-err>
-  </testsuite>
-</testsuites>
-<Catch name="CatchSelfTest">
-  <Group name="~dummy">
-    <TestCase name="./succeeding/Approx/simple">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d == Approx( 1.23 )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.23 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d != Approx( 1.22 )
-        </Original>
-        <Expanded>
-          1.23 != Approx( 1.22 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d != Approx( 1.24 )
-        </Original>
-        <Expanded>
-          1.23 != Approx( 1.24 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          Approx( d ) == 1.23
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) == 1.23
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          Approx( d ) != 1.22
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) != 1.22
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          Approx( d ) != 1.24
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) != 1.24
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Approx/epsilon">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d != Approx( 1.231 )
-        </Original>
-        <Expanded>
-          1.23 != Approx( 1.231 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d == Approx( 1.231 ).epsilon( 0.1 )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.231 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Approx/float">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          1.23f == Approx( 1.23f )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.23 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          0.0f == Approx( 0.0f )
-        </Original>
-        <Expanded>
-          0 == Approx( 0 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Approx/int">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          1 == Approx( 1 )
-        </Original>
-        <Expanded>
-          1 == Approx( 1 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          0 == Approx( 0 )
-        </Original>
-        <Expanded>
-          0 == Approx( 0 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Approx/mixed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          1.0f == Approx( 1 )
-        </Original>
-        <Expanded>
-          1 == Approx( 1 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          0 == Approx( dZero)
-        </Original>
-        <Expanded>
-          0 == Approx( 0 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          0 == Approx( dSmall ).epsilon( 0.001 )
-        </Original>
-        <Expanded>
-          0 == Approx( 1e-05 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          1.234f == Approx( dMedium )
-        </Original>
-        <Expanded>
-          1.234 == Approx( 1.234 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          dMedium == Approx( 1.234f )
-        </Original>
-        <Expanded>
-          1.234 == Approx( 1.234 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Approx/custom">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d == approx( 1.23 )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.23 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d == approx( 1.22 )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.22 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d == approx( 1.24 )
-        </Original>
-        <Expanded>
-          1.23 == Approx( 1.24 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          d != approx( 1.25 )
-        </Original>
-        <Expanded>
-          1.23 != Approx( 1.25 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          approx( d ) == 1.23
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) == 1.23
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          approx( d ) == 1.22
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) == 1.22
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          approx( d ) == 1.24
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) == 1.24
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          approx( d ) != 1.25
-        </Original>
-        <Expanded>
-          Approx( 1.23 ) != 1.25
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Approximate PI">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
-        </Original>
-        <Expanded>
-          3.1428571429 == Approx( 3.141 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ApproxTests.cpp" >
-        <Original>
-          divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
-        </Original>
-        <Expanded>
-          3.1428571429 != Approx( 3.141 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/TestClass/succeedingCase">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" >
-        <Original>
-          s == &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/TestClass/failingCase">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" >
-        <Original>
-          s == &quot;world&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;world&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/Fixture/succeedingCase">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" >
-        <Original>
-          m_a == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/Fixture/failingCase">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ClassTests.cpp" >
-        <Original>
-          m_a == 2
-        </Original>
-        <Expanded>
-          1 == 2
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/equality">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven == 7
-        </Original>
-        <Expanded>
-          7 == 7
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one == Approx( 9.1f )
-        </Original>
-        <Expanded>
-          9.1 == Approx( 9.1 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.double_pi == Approx( 3.1415926535 )
-        </Original>
-        <Expanded>
-          3.1415926535 == Approx( 3.14159 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello == &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          &quot;hello&quot; == data.str_hello
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          x == Approx( 1.3 )
-        </Original>
-        <Expanded>
-          1.3 == Approx( 1.3 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/conditions/equality">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven == 6
-        </Original>
-        <Expanded>
-          7 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven == 8
-        </Original>
-        <Expanded>
-          7 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven == 0
-        </Original>
-        <Expanded>
-          7 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one == Approx( 9.11f )
-        </Original>
-        <Expanded>
-          9.1 == Approx( 9.11 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one == Approx( 9.0f )
-        </Original>
-        <Expanded>
-          9.1 == Approx( 9 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one == Approx( 1 )
-        </Original>
-        <Expanded>
-          9.1 == Approx( 1 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one == Approx( 0 )
-        </Original>
-        <Expanded>
-          9.1 == Approx( 0 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.double_pi == Approx( 3.1415 )
-        </Original>
-        <Expanded>
-          3.1415926535 == Approx( 3.1415 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello == &quot;goodbye&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;goodbye&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello == &quot;hell&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;hell&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello == &quot;hello1&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; == &quot;hello1&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello.size() == 6
-        </Original>
-        <Expanded>
-          5 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          x == Approx( 1.301 )
-        </Original>
-        <Expanded>
-          1.3 == Approx( 1.301 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/inequality">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven != 6
-        </Original>
-        <Expanded>
-          7 != 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven != 8
-        </Original>
-        <Expanded>
-          7 != 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one != Approx( 9.11f )
-        </Original>
-        <Expanded>
-          9.1 != Approx( 9.11 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one != Approx( 9.0f )
-        </Original>
-        <Expanded>
-          9.1 != Approx( 9 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one != Approx( 1 )
-        </Original>
-        <Expanded>
-          9.1 != Approx( 1 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one != Approx( 0 )
-        </Original>
-        <Expanded>
-          9.1 != Approx( 0 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.double_pi != Approx( 3.1415 )
-        </Original>
-        <Expanded>
-          3.1415926535 != Approx( 3.1415 )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello != &quot;goodbye&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; != &quot;goodbye&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello != &quot;hell&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; != &quot;hell&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello != &quot;hello1&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; != &quot;hello1&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello.size() != 6
-        </Original>
-        <Expanded>
-          5 != 6
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/conditions/inequality">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven != 7
-        </Original>
-        <Expanded>
-          7 != 7
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one != Approx( 9.1f )
-        </Original>
-        <Expanded>
-          9.1 != Approx( 9.1 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.double_pi != Approx( 3.1415926535 )
-        </Original>
-        <Expanded>
-          3.1415926535 != Approx( 3.14159 )
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello != &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; != &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello.size() != 5
-        </Original>
-        <Expanded>
-          5 != 5
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/ordered">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt; 8
-        </Original>
-        <Expanded>
-          7 &lt; 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven > 6
-        </Original>
-        <Expanded>
-          7 > 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven > 0
-        </Original>
-        <Expanded>
-          7 > 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven > -1
-        </Original>
-        <Expanded>
-          7 > -1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven >= 7
-        </Original>
-        <Expanded>
-          7 >= 7
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven >= 6
-        </Original>
-        <Expanded>
-          7 >= 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt;= 7
-        </Original>
-        <Expanded>
-          7 &lt;= 7
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt;= 8
-        </Original>
-        <Expanded>
-          7 &lt;= 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one > 9
-        </Original>
-        <Expanded>
-          9.1 > 9
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one &lt; 10
-        </Original>
-        <Expanded>
-          9.1 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one &lt; 9.2
-        </Original>
-        <Expanded>
-          9.1 &lt; 9.2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt;= &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt;= &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello >= &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; >= &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt; &quot;hellp&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt; &quot;hellp&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt; &quot;zebra&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt; &quot;zebra&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello > &quot;hellm&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; > &quot;hellm&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello > &quot;a&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; > &quot;a&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/conditions/ordered">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven > 7
-        </Original>
-        <Expanded>
-          7 > 7
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt; 7
-        </Original>
-        <Expanded>
-          7 &lt; 7
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven > 8
-        </Original>
-        <Expanded>
-          7 > 8
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt; 6
-        </Original>
-        <Expanded>
-          7 &lt; 6
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt; 0
-        </Original>
-        <Expanded>
-          7 &lt; 0
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt; -1
-        </Original>
-        <Expanded>
-          7 &lt; -1
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven >= 8
-        </Original>
-        <Expanded>
-          7 >= 8
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.int_seven &lt;= 6
-        </Original>
-        <Expanded>
-          7 &lt;= 6
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one &lt; 9
-        </Original>
-        <Expanded>
-          9.1 &lt; 9
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one > 10
-        </Original>
-        <Expanded>
-          9.1 > 10
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.float_nine_point_one > 9.2
-        </Original>
-        <Expanded>
-          9.1 > 9.2
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello > &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; > &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt; &quot;hello&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt; &quot;hello&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello > &quot;hellp&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; > &quot;hellp&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello > &quot;z&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; > &quot;z&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt; &quot;hellm&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt; &quot;hellm&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt; &quot;a&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt; &quot;a&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello >= &quot;z&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; >= &quot;z&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          data.str_hello &lt;= &quot;a&quot;
-        </Original>
-        <Expanded>
-          &quot;hello&quot; &lt;= &quot;a&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/int literals">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          i == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          ui == 2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          l == 3
-        </Original>
-        <Expanded>
-          3 == 3
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          ul == 4
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          c == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          uc == 6
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          1 == i
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          2 == ui
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          3 == l
-        </Original>
-        <Expanded>
-          3 == 3
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          4 == ul
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          5 == c
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          6 == uc
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          (std::numeric_limits&lt;unsigned long>::max)() > ul
-        </Original>
-        <Expanded>
-          0x<hex digits> > 4
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions//long_to_unsigned_x">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          long_var == unsigned_char_var
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          long_var == unsigned_short_var
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          long_var == unsigned_int_var
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          long_var == unsigned_long_var
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/const ints to int literal">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          unsigned_char_var == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          unsigned_short_var == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          unsigned_int_var == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          unsigned_long_var == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/negative ints">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          ( -1 > 2u )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          -1 > 2u
-        </Original>
-        <Expanded>
-          -1 > 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          ( 2u &lt; -1 )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          2u &lt; -1
-        </Original>
-        <Expanded>
-          2 &lt; -1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          ( minInt > 2u )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          minInt > 2u
-        </Original>
-        <Expanded>
-          -2147483648 > 2
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/computed ints">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          54 == 6*9
-        </Original>
-        <Expanded>
-          54 == 54
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/ptr">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          p == __null
-        </Original>
-        <Expanded>
-          __null == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          p == pNULL
-        </Original>
-        <Expanded>
-          __null == __null
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          p != __null
-        </Original>
-        <Expanded>
-          0x<hex digits> != 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          cp != __null
-        </Original>
-        <Expanded>
-          0x<hex digits> != 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          cpc != __null
-        </Original>
-        <Expanded>
-          0x<hex digits> != 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          returnsNull() == __null
-        </Original>
-        <Expanded>
-          {null string} == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          returnsConstNull() == __null
-        </Original>
-        <Expanded>
-          {null string} == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          __null != p
-        </Original>
-        <Expanded>
-          0 != 0x<hex digits>
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/conditions/not">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          false == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          true == true
-        </Original>
-        <Expanded>
-          true == true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !false
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !false
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !falseValue
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !falseValue
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !(1 == 2)
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !1 == 2
-        </Original>
-        <Expanded>
-          !(1 == 2)
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/conditions/not">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          false != false
-        </Original>
-        <Expanded>
-          false != false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          true != true
-        </Original>
-        <Expanded>
-          true != true
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !true
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !true
-        </Original>
-        <Expanded>
-          !true
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !trueValue
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !trueValue
-        </Original>
-        <Expanded>
-          !true
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !(1 == 1)
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ConditionTests.cpp" >
-        <Original>
-          !1 == 1
-        </Original>
-        <Expanded>
-          !(1 == 1)
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/exceptions/explicit">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisThrows()
-        </Original>
-        <Expanded>
-          thisThrows()
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisDoesntThrow()
-        </Original>
-        <Expanded>
-          thisDoesntThrow()
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisThrows()
-        </Original>
-        <Expanded>
-          thisThrows()
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/explicit">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisThrows()
-        </Original>
-        <Expanded>
-          thisThrows()
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          expected exception
-        </Exception>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisDoesntThrow()
-        </Original>
-        <Expanded>
-          thisDoesntThrow()
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisThrows()
-        </Original>
-        <Expanded>
-          thisThrows()
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          expected exception
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/implicit">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        unexpected exception
-      </Exception>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/implicit/2">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          1 == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          {Unknown expression after the reported line}
-        </Original>
-        <Expanded>
-          {Unknown expression after the reported line}
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          unexpected exception
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/implicit/3">
-      <Section name="section name">
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          unexpected exception
-        </Exception>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/implicit/4">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisThrows() == 0
-        </Original>
-        <Expanded>
-          thisThrows() == 0
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          expected exception
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/exceptions/implicit">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/custom">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        custom exception
-      </Exception>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/custom/nothrow">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          throwCustom()
-        </Original>
-        <Expanded>
-          throwCustom()
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          custom exception - not std
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/custom/throw">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          throwCustom()
-        </Original>
-        <Expanded>
-          throwCustom()
-        </Expanded>
-        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-          custom exception - not std
-        </Exception>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/exceptions/custom/double">
-      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        3.14
-      </Exception>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/exceptions/notimplemented">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/ExceptionTests.cpp" >
-        <Original>
-          thisFunctionNotImplemented( 7 )
-        </Original>
-        <Expanded>
-          thisFunctionNotImplemented( 7 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/generators/1">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          200 == 200
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          202 == 202
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          204 == 204
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          206 == 206
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          208 == 208
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          210 == 210
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          212 == 212
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          4 == 4
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          10 == 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          30 == 30
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          40 == 40
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          42 == 42
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( i, 2 ) == i*2
-        </Original>
-        <Expanded>
-          72 == 72
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          multiply( j, 2 ) == j*2
-        </Original>
-        <Expanded>
-          214 == 214
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/generators/2">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          i->first == i->second-1
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/GeneratorTests.cpp" >
-        <Original>
-          i->first == i->second-1
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/message">
-      <Info>
-        this is a message
-      </Info>
-      <Warning>
-        this is a warning
-      </Warning>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/succeed">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/message/info/1">
-      <Info>
-        this message should be logged
-      </Info>
-      <Info>
-        so should this
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          a == 1
-        </Original>
-        <Expanded>
-          2 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./mixed/message/info/2">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          a == 2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Info>
-        this message should be logged
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          a == 1
-        </Original>
-        <Expanded>
-          2 == 1
-        </Expanded>
-      </Expression>
-      <Info>
-        and this, but later
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          a == 0
-        </Original>
-        <Expanded>
-          2 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          a == 2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/message/fail">
-      <Failure>
-        This is a failure
-      </Failure>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/message/sections">
-      <Section name="one">
-        <Failure>
-          Message from section one
-        </Failure>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="two">
-        <Failure>
-          Message from section two
-        </Failure>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/message/sections/stdout">
-      <Section name="one">
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="two">
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./mixed/message/scoped">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          0 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          1 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          2 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          3 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          4 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          5 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          6 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          7 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          8 &lt; 10
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          9 &lt; 10
-        </Expanded>
-      </Expression>
-      <Info>
-        current counter 10
-      </Info>
-      <Info>
-        i := 10
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          i &lt; 10
-        </Original>
-        <Expanded>
-          10 &lt; 10
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/nofail">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MessageTests.cpp" >
-        <Original>
-          1 == 2
-        </Original>
-        <Expanded>
-          1 == 2
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="just info">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="just failure">
-      <Failure>
-        Previous info should not be seen
-      </Failure>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/Misc/Sections">
-      <Section name="s1" description="doesn't equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            a != b
-          </Original>
-          <Expanded>
-            1 != 2
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            b != a
-          </Original>
-          <Expanded>
-            2 != 1
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="s2" description="not equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            a != b
-          </Original>
-          <Expanded>
-            1 != 2
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Misc/Sections/nested">
-      <Section name="s1" description="doesn't equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            a != b
-          </Original>
-          <Expanded>
-            1 != 2
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            b != a
-          </Original>
-          <Expanded>
-            2 != 1
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="s1" description="doesn't equal">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            a != b
-          </Original>
-          <Expanded>
-            1 != 2
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            b != a
-          </Original>
-          <Expanded>
-            2 != 1
-          </Expanded>
-        </Expression>
-        <Section name="s2" description="not equal">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-            <Original>
-              a != b
-            </Original>
-            <Expanded>
-              1 != 2
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./mixed/Misc/Sections/nested2">
-      <Section name="s1" description="doesn't equal">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="s1" description="doesn't equal">
-        <Section name="s2" description="equal">
-          <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-            <Original>
-              a == b
-            </Original>
-            <Expanded>
-              1 == 2
-            </Expanded>
-          </Expression>
-          <OverallResults successes="0" failures="1"/>
-        </Section>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="s1" description="doesn't equal">
-        <Section name="s3" description="not equal">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-            <Original>
-              a != b
-            </Original>
-            <Expanded>
-              1 != 2
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="s1" description="doesn't equal">
-        <Section name="s4" description="less than">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-            <Original>
-              a &lt; b
-            </Original>
-            <Expanded>
-              1 &lt; 2
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./Sections/nested/a/b">
-      <Section name="c">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="c">
-        <Section name="d (leaf)">
-          <OverallResults successes="0" failures="1"/>
-        </Section>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="c">
-        <Section name="e (leaf)">
-          <OverallResults successes="0" failures="1"/>
-        </Section>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="f (leaf)">
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./mixed/Misc/Sections/loops">
-      <Section name="s1" description="b is currently: 0">
-        <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            b > a
-          </Original>
-          <Expanded>
-            0 > 1
-          </Expanded>
-        </Expression>
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./mixed/Misc/loops">
-      <Info>
-        Testing if fib[0] (1) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <Info>
-        Testing if fib[1] (1) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <Info>
-        Testing if fib[3] (3) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <Info>
-        Testing if fib[4] (5) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <Info>
-        Testing if fib[6] (13) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <Info>
-        Testing if fib[7] (21) is even
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          ( fib[i] % 2 ) == 0
-        </Original>
-        <Expanded>
-          1 == 0
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/Misc/stdout,stderr">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Misc/null strings">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          makeString( false ) != static_cast&lt;char*>(__null)
-        </Original>
-        <Expanded>
-          &quot;valid string&quot; != {null string}
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          makeString( true ) == static_cast&lt;char*>(__null)
-        </Original>
-        <Expanded>
-          {null string} == {null string}
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/info">
-      <Info>
-        hi
-      </Info>
-      <Info>
-        i := 7
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          false
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/checkedif">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          flag
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testCheckedIf( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/checkedif">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          flag
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testCheckedIf( false )
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/checkedelse">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          flag
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testCheckedElse( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/checkedelse">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          flag
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testCheckedElse( false )
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./misc/xmlentitycheck">
-      <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>">
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;">
-        <OverallResults successes="0" failures="1"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./manual/onechar">
-      <Info>
-        3
-      </Info>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          false
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/atomic if">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          x == 0
-        </Original>
-        <Expanded>
-          0 == 0
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/matchers">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() Contains( &quot;string&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; contains: &quot;string&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() Contains( &quot;abc&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; contains: &quot;abc&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() StartsWith( &quot;this&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; starts with: &quot;this&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() EndsWith( &quot;substring&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; ends with: &quot;substring&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/matchers/Contains">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() Contains( &quot;not there&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/matchers/StartsWith">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() StartsWith( &quot;string&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/matchers/EndsWith">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() EndsWith( &quot;this&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/matchers/Equals">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() Equals( &quot;something else&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="string">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          &quot;&quot; Equals(__null)
-        </Original>
-        <Expanded>
-          &quot;&quot; equals: &quot;&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/matchers/AllOf">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() AllOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;abc&quot; ) )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; and contains: &quot;abc&quot; )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/matchers/AnyOf">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() AnyOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;not there&quot; ) )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; or contains: &quot;not there&quot; )
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() AnyOf( Catch::Contains( &quot;not there&quot; ), Catch::Contains( &quot;string&quot; ) )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;not there&quot; or contains: &quot;string&quot; )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/matchers/Equals">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          testStringForMatching() Equals( &quot;this string contains 'abc' as a substring&quot; )
-        </Original>
-        <Expanded>
-          &quot;this string contains 'abc' as a substring&quot; equals: &quot;this string contains 'abc' as a substring&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Factorials are computed">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          Factorial(0) == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          Factorial(1) == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          Factorial(2) == 2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          Factorial(3) == 6
-        </Original>
-        <Expanded>
-          6 == 6
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          Factorial(10) == 3628800
-        </Original>
-        <Expanded>
-          0x<hex digits> == 3628800
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="empty">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Nice descriptive name">
-      <Warning>
-        This one ran
-      </Warning>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="first tag">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="second tag">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="vectors can be sized and resized">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Section name="resizing bigger changes size and capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.size() == 10
-          </Original>
-          <Expanded>
-            10 == 10
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.capacity() >= 10
-          </Original>
-          <Expanded>
-            10 >= 10
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Section name="resizing smaller changes size but not capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.capacity() >= 5
-          </Original>
-          <Expanded>
-            5 >= 5
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Section name="resizing smaller changes size but not capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.capacity() >= 5
-          </Original>
-          <Expanded>
-            5 >= 5
-          </Expanded>
-        </Expression>
-        <Section name="We can use the 'swap trick' to reset the capacity">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-            <Original>
-              v.capacity() == 0
-            </Original>
-            <Expanded>
-              0 == 0
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Section name="reserving bigger changes capacity but not size">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.size() == 5
-          </Original>
-          <Expanded>
-            5 == 5
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.capacity() >= 10
-          </Original>
-          <Expanded>
-            10 >= 10
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.size() == 5
-        </Original>
-        <Expanded>
-          5 == 5
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-        <Original>
-          v.capacity() >= 5
-        </Original>
-        <Expanded>
-          5 >= 5
-        </Expanded>
-      </Expression>
-      <Section name="reserving smaller does not change size or capacity">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.size() == 5
-          </Original>
-          <Expanded>
-            5 == 5
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/MiscTests.cpp" >
-          <Original>
-            v.capacity() >= 5
-          </Original>
-          <Expanded>
-            5 >= 5
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/CatchSectionInfiniteLoop">
-      <Failure>
-        to infinity and beyond
-      </Failure>
-      <Section name="Outer">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Failure>
-        to infinity and beyond
-      </Failure>
-      <Section name="Outer">
-        <Section name="Inner">
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Failure>
-        to infinity and beyond
-      </Failure>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="selftest/main">
-      <Section name="selftest/expected result" description="Tests do what they claim">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="selftest/expected result" description="Tests do what they claim">
-        <Section name="selftest/expected result/failing tests" description="Tests in the 'failing' branch fail">
-          <OverallResults successes="28" failures="0"/>
-        </Section>
-        <OverallResults successes="28" failures="0"/>
-      </Section>
-      <Section name="selftest/expected result" description="Tests do what they claim">
-        <Section name="selftest/expected result/succeeding tests" description="Tests in the 'succeeding' branch succeed">
-          <OverallResults successes="46" failures="0"/>
-        </Section>
-        <OverallResults successes="46" failures="0"/>
-      </Section>
-      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
-        <Section name="selftest/test counts/succeeding tests" description="Number of 'succeeding' tests is fixed">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              totals.assertions.passed == 298
-            </Original>
-            <Expanded>
-              298 == 298
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              totals.assertions.failed == 0
-            </Original>
-            <Expanded>
-              0 == 0
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
-        <Section name="selftest/test counts/failing tests" description="Number of 'failing' tests is fixed">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              totals.assertions.passed == 2
-            </Original>
-            <Expanded>
-              2 == 2
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              totals.assertions.failed == 77
-            </Original>
-            <Expanded>
-              77 == 77
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="meta/Misc/Sections">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          totals.assertions.passed == 2
-        </Original>
-        <Expanded>
-          2 == 2
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          totals.assertions.failed == 1
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Process can be configured on command line">
-      <Section name="default - no arguments">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            parseIntoConfig( argv, config )
-          </Original>
-          <Expanded>
-            parseIntoConfig( argv, config )
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            config.shouldDebugBreak == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            config.abortAfter == -1
-          </Original>
-          <Expanded>
-            -1 == -1
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            config.noThrow == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            config.reporterName.empty()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="test lists">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="test lists">
-        <Section name="1 test" description="Specify one test case using">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters().size() == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="4" failures="0"/>
-        </Section>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <Section name="test lists">
-        <Section name="Specify one test case exclusion using exclude:">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters().size() == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="4" failures="0"/>
-        </Section>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <Section name="test lists">
-        <Section name="Specify one test case exclusion using ~">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters().size() == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="4" failures="0"/>
-        </Section>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <Section name="test lists">
-        <Section name="Specify two test cases using -t">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters().size() == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test2&quot; ) )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="5" failures="0"/>
-        </Section>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="reporter">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="reporter">
-        <Section name="-r/console">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.reporterName == &quot;console&quot;
-            </Original>
-            <Expanded>
-              &quot;console&quot; == &quot;console&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="reporter">
-        <Section name="-r/xml">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.reporterName == &quot;xml&quot;
-            </Original>
-            <Expanded>
-              &quot;xml&quot; == &quot;xml&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="reporter">
-        <Section name="--reporter/junit">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.reporterName == &quot;junit&quot;
-            </Original>
-            <Expanded>
-              &quot;junit&quot; == &quot;junit&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="debugger">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="debugger">
-        <Section name="-b">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.shouldDebugBreak == true
-            </Original>
-            <Expanded>
-              true == true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="debugger">
-        <Section name="--break">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.shouldDebugBreak
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="abort">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="abort">
-        <Section name="-a aborts after first failure">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.abortAfter == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="abort">
-        <Section name="-x 2 aborts after two failures">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.abortAfter == 2
-            </Original>
-            <Expanded>
-              2 == 2
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="abort">
-        <Section name="-x must be greater than zero">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
-            </Original>
-            <Expanded>
-              &quot;Value after -x or --abortAfter must be greater than zero
-- while parsing: (-x, --abortx &lt;number of failures>)&quot; contains: &quot;greater than zero&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="abort">
-        <Section name="-x must be numeric">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfigAndReturnError( argv, config ) Contains( &quot;-x&quot; )
-            </Original>
-            <Expanded>
-              &quot;Unable to convert oops to destination type
-- while parsing: (-x, --abortx &lt;number of failures>)&quot; contains: &quot;-x&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="nothrow">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="nothrow">
-        <Section name="-e">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.noThrow == true
-            </Original>
-            <Expanded>
-              true == true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="nothrow">
-        <Section name="--nothrow">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.noThrow == true
-            </Original>
-            <Expanded>
-              true == true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="output filename">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="output filename">
-        <Section name="-o filename">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.outputFilename == &quot;filename.ext&quot;
-            </Original>
-            <Expanded>
-              &quot;filename.ext&quot; == &quot;filename.ext&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="output filename">
-        <Section name="--out">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.outputFilename == &quot;filename.ext&quot;
-            </Original>
-            <Expanded>
-              &quot;filename.ext&quot; == &quot;filename.ext&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="combinations">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="combinations">
-        <Section name="Single character flags can be combined">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              parseIntoConfig( argv, config )
-            </Original>
-            <Expanded>
-              parseIntoConfig( argv, config )
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.abortAfter == 1
-            </Original>
-            <Expanded>
-              1 == 1
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.shouldDebugBreak
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              config.noThrow == true
-            </Original>
-            <Expanded>
-              true == true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="4" failures="0"/>
-        </Section>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="selftest/test filter">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchAny.shouldInclude( fakeTestCase( &quot;any&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchNone.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchNonHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchNonHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="selftest/test filters">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchHidden.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          filters.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          filters.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          filters.shouldInclude( fakeTestCase( &quot;./anything&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="selftest/filter/prefix wildcard">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="selftest/filter/wildcard at both ends">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;badgers are big&quot; ) )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          matchBadgers.shouldInclude( fakeTestCase( &quot;hedgehogs&quot; ) ) == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="selftest/tags">
-      <Section name="one tag">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.getTestCaseInfo().description == &quot;&quot;
-          </Original>
-          <Expanded>
-            &quot;&quot; == &quot;&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.hasTag( &quot;one&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.getTags().size() == 1
-          </Original>
-          <Expanded>
-            1 == 1
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( p1 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( p2 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( p3 ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( p4 ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( p5 ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <OverallResults successes="8" failures="0"/>
-      </Section>
-      <Section name="two tags">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.getTestCaseInfo().description == &quot;&quot;
-          </Original>
-          <Expanded>
-            &quot;&quot; == &quot;&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.hasTag( &quot;one&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.hasTag( &quot;two&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.hasTag( &quot;Two&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.hasTag( &quot;three&quot; ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.getTags().size() == 2
-          </Original>
-          <Expanded>
-            2 == 2
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.matchesTags( p1 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.matchesTags( p2 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.matchesTags( p3 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.matchesTags( p4 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            twoTags.matchesTags( p5 ) == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="11" failures="0"/>
-      </Section>
-      <Section name="one tag with characters either side">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagWithExtras.getTestCaseInfo().description == &quot;1234&quot;
-          </Original>
-          <Expanded>
-            &quot;1234&quot; == &quot;1234&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagWithExtras.hasTag( &quot;one&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagWithExtras.hasTag( &quot;two&quot; ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagWithExtras.getTags().size() == 1
-          </Original>
-          <Expanded>
-            1 == 1
-          </Expanded>
-        </Expression>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <Section name="start of a tag, but not closed">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagOpen.getTestCaseInfo().description == &quot;[one&quot;
-          </Original>
-          <Expanded>
-            &quot;[one&quot; == &quot;[one&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagOpen.hasTag( &quot;one&quot; ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTagOpen.getTags().size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="hidden">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.getTestCaseInfo().description == &quot;&quot;
-          </Original>
-          <Expanded>
-            &quot;&quot; == &quot;&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.hasTag( &quot;.&quot; )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.isHidden()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            oneTag.matchesTags( &quot;~[.]&quot; ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <OverallResults successes="4" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Long strings can be wrapped">
-      <Section name="plain string">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="No wrapping">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
-            </Original>
-            <Expanded>
-              &quot;one two three four&quot;
-==
-&quot;one two three four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
-            </Original>
-            <Expanded>
-              &quot;one two three four&quot;
-==
-&quot;one two three four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="Wrapped once">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 17 ) ).toString() == &quot;one two three\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two three
-four&quot;
-==
-&quot;one two three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 16 ) ).toString() == &quot;one two three\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two three
-four&quot;
-==
-&quot;one two three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 14 ) ).toString() == &quot;one two three\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two three
-four&quot;
-==
-&quot;one two three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 13 ) ).toString() == &quot;one two three\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two three
-four&quot;
-==
-&quot;one two three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 12 ) ).toString() == &quot;one two\nthree four&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three four&quot;
-==
-&quot;one two
-three four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="5" failures="0"/>
-        </Section>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="Wrapped twice">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="3" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="Wrapped three times">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one
-two
-three
-four&quot;
-==
-&quot;one
-two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 5 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one
-two
-three
-four&quot;
-==
-&quot;one
-two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="Short wrap">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef&quot;
-            </Original>
-            <Expanded>
-              &quot;abc-
-def&quot;
-==
-&quot;abc-
-def&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdefg&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndefg&quot;
-            </Original>
-            <Expanded>
-              &quot;abc-
-defg&quot;
-==
-&quot;abc-
-defg&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdefgh&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef-\ngh&quot;
-            </Original>
-            <Expanded>
-              &quot;abc-
-def-
-gh&quot;
-==
-&quot;abc-
-def-
-gh&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 4 ) ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one
-two
-thr-
-ee
-four&quot;
-==
-&quot;one
-two
-thr-
-ee
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 3 ) ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
-            </Original>
-            <Expanded>
-              &quot;one
-two
-th-
-ree
-fo-
-ur&quot;
-==
-&quot;one
-two
-th-
-ree
-fo-
-ur&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="5" failures="0"/>
-        </Section>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="As container">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text.size() == 4
-            </Original>
-            <Expanded>
-              4 == 4
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text[0] == &quot;one&quot;
-            </Original>
-            <Expanded>
-              &quot;one&quot; == &quot;one&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text[1] == &quot;two&quot;
-            </Original>
-            <Expanded>
-              &quot;two&quot; == &quot;two&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text[2] == &quot;three&quot;
-            </Original>
-            <Expanded>
-              &quot;three&quot; == &quot;three&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text[3] == &quot;four&quot;
-            </Original>
-            <Expanded>
-              &quot;four&quot; == &quot;four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="5" failures="0"/>
-        </Section>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="plain string">
-        <Section name="Indent first line differently">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              text.toString() == &quot; one two\n    three\n    four&quot;
-            </Original>
-            <Expanded>
-              &quot; one two
-    three
-    four&quot;
-==
-&quot; one two
-    three
-    four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="With newlines">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="With newlines">
-        <Section name="No wrapping">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
-            </Original>
-            <Expanded>
-              &quot;one two
-three four&quot;
-==
-&quot;one two
-three four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
-            </Original>
-            <Expanded>
-              &quot;one two
-three four&quot;
-==
-&quot;one two
-three four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
-            </Original>
-            <Expanded>
-              &quot;one two
-three four&quot;
-==
-&quot;one two
-three four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="3" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="With newlines">
-        <Section name="Trailing newline">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 10 ) ).toString() == &quot;abcdef\n&quot;
-            </Original>
-            <Expanded>
-              &quot;abcdef
-&quot;
-==
-&quot;abcdef
-&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef&quot;
-            </Original>
-            <Expanded>
-              &quot;abcdef&quot; == &quot;abcdef&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef\n&quot;
-            </Original>
-            <Expanded>
-              &quot;abcdef
-&quot;
-==
-&quot;abcdef
-&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="3" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="With newlines">
-        <Section name="Wrapped once">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one two
-three
-four&quot;
-==
-&quot;one two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="3" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="With newlines">
-        <Section name="Wrapped twice">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-            <Original>
-              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
-            </Original>
-            <Expanded>
-              &quot;one
-two
-three
-four&quot;
-==
-&quot;one
-two
-three
-four&quot;
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="With tabs">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-          <Original>
-            Text( testString, TextAttributes().setWidth( 15 ) ).toString() == &quot;one two three\n        four\n        five\n        six&quot;
-          </Original>
-          <Expanded>
-            &quot;one two three
-        four
-        five
-        six&quot;
-==
-&quot;one two three
-        four
-        five
-        six&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Strings can be rendered with colour">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Text can be formatted using the Text class">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          Text( &quot;hi there&quot; ).toString() == &quot;hi there&quot;
-        </Original>
-        <Expanded>
-          &quot;hi there&quot; == &quot;hi there&quot;
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TestMain.cpp" >
-        <Original>
-          Text( &quot;hi there&quot;, narrow ).toString() == &quot;hi\nthere&quot;
-        </Original>
-        <Expanded>
-          &quot;hi
-there&quot;
-==
-&quot;hi
-there&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/Tricky/std::pair">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          (std::pair&lt;int, int>( 1, 2 )) == aNicePair
-        </Original>
-        <Expanded>
-          std::pair( 1, 2 ) == std::pair( 1, 2 )
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./inprogress/failing/Tricky/trailing expression">
-      <Warning>
-        Uncomment the code in this test to check that it gives a sensible compiler error
-      </Warning>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./inprogress/failing/Tricky/compound lhs">
-      <Warning>
-        Uncomment the code in this test to check that it gives a sensible compiler error
-      </Warning>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./failing/Tricky/non streamable type">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          &amp;o1 == &amp;o2
-        </Original>
-        <Expanded>
-          0x<hex digits> == 0x<hex digits>
-        </Expanded>
-      </Expression>
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          o1 == o2
-        </Original>
-        <Expanded>
-          {?} == {?}
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./failing/string literals">
-      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          std::string( &quot;first&quot; ) == &quot;second&quot;
-        </Original>
-        <Expanded>
-          &quot;first&quot; == &quot;second&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="false"/>
-    </TestCase>
-    <TestCase name="./succeeding/side-effects">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          i++ == 7
-        </Original>
-        <Expanded>
-          7 == 7
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          i++ == 8
-        </Original>
-        <Expanded>
-          8 == 8
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/koenig">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          0x<hex digits> == o
-        </Original>
-        <Expanded>
-          0x<hex digits> == {?}
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/non-const==">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          t == 1u
-        </Original>
-        <Expanded>
-          {?} == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/enum/bits">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          0x<hex digits> == bit30and31
-        </Original>
-        <Expanded>
-          0x<hex digits> == 3221225472
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/boolean member">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          obj.prop != __null
-        </Original>
-        <Expanded>
-          0x<hex digits> != 0
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/unimplemented static bool">
-      <Section name="compare to true">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            is_true&lt;true>::value == true
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            true == is_true&lt;true>::value
-          </Original>
-          <Expanded>
-            true == true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="compare to false">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            is_true&lt;false>::value == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            false == is_true&lt;false>::value
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="negation">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            !is_true&lt;false>::value
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="double negation">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            !!is_true&lt;true>::value
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="direct">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            is_true&lt;true>::value
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            !is_true&lt;false>::value
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="./succeeding/SafeBool">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          True
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          !False
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          !False
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Assertions then sections">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          Catch::isTrue( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          Catch::isTrue( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Section name="A section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            Catch::isTrue( true )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          Catch::isTrue( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Section name="A section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            Catch::isTrue( true )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Section name="Another section">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-            <Original>
-              Catch::isTrue( true )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          Catch::isTrue( true )
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Section name="A section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-          <Original>
-            Catch::isTrue( true )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Section name="Another other section">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-            <Original>
-              Catch::isTrue( true )
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="non streamable - with conv. op">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          s == &quot;7&quot;
-        </Original>
-        <Expanded>
-          &quot;7&quot; == &quot;7&quot;
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Comparing function pointers">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          a
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          a == &amp;foo
-        </Original>
-        <Expanded>
-          1 == 1
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="pointer to class">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/TrickyTests.cpp" >
-        <Original>
-          p == 0
-        </Original>
-        <Expanded>
-          __null == 0
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="X/level/0/a">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="X/level/0/b">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="X/level/1/a">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="X/level/1/b">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Anonymous test case 1">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Test case with one argument">
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Variadic macros">
-      <Section name="Section with one argument">
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Scenario: Do that thing with the thing">
-      <Section name="   Given: This stuff exists">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="   Given: This stuff exists">
-        <Section name="    When: I do this">
-          <OverallResults successes="0" failures="0"/>
-        </Section>
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="   Given: This stuff exists">
-        <Section name="    When: I do this">
-          <Section name="    Then: it should do this">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                itDoesThis()
-              </Original>
-              <Expanded>
-                true
-              </Expanded>
-            </Expression>
-            <OverallResults successes="1" failures="0"/>
-          </Section>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="   Given: This stuff exists">
-        <Section name="    When: I do this">
-          <Section name="    Then: it should do this">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                itDoesThis()
-              </Original>
-              <Expanded>
-                true
-              </Expanded>
-            </Expression>
-            <Section name="     And: do that">
-              <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-                <Original>
-                  itDoesThat()
-                </Original>
-                <Expanded>
-                  true
-                </Expanded>
-              </Expression>
-              <OverallResults successes="1" failures="0"/>
-            </Section>
-            <OverallResults successes="2" failures="0"/>
-          </Section>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Scenario: Vector resizing affects size and capacity">
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: it is made larger">
-          <OverallResults successes="0" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: it is made larger">
-          <Section name="    Then: the size and capacity go up">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.size() == 10
-              </Original>
-              <Expanded>
-                10 == 10
-              </Expanded>
-            </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.capacity() >= 10
-              </Original>
-              <Expanded>
-                10 >= 10
-              </Expanded>
-            </Expression>
-            <OverallResults successes="2" failures="0"/>
-          </Section>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: it is made larger">
-          <Section name="    Then: the size and capacity go up">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.size() == 10
-              </Original>
-              <Expanded>
-                10 == 10
-              </Expanded>
-            </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.capacity() >= 10
-              </Original>
-              <Expanded>
-                10 >= 10
-              </Expanded>
-            </Expression>
-            <Section name="And when: it is made smaller again">
-              <OverallResults successes="0" failures="0"/>
-            </Section>
-            <OverallResults successes="2" failures="0"/>
-          </Section>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: it is made larger">
-          <Section name="    Then: the size and capacity go up">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.size() == 10
-              </Original>
-              <Expanded>
-                10 == 10
-              </Expanded>
-            </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.capacity() >= 10
-              </Original>
-              <Expanded>
-                10 >= 10
-              </Expanded>
-            </Expression>
-            <Section name="And when: it is made smaller again">
-              <Section name="    Then: the size goes down but the capacity stays the same">
-                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-                  <Original>
-                    v.size() == 5
-                  </Original>
-                  <Expanded>
-                    5 == 5
-                  </Expanded>
-                </Expression>
-                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-                  <Original>
-                    v.capacity() >= 10
-                  </Original>
-                  <Expanded>
-                    10 >= 10
-                  </Expanded>
-                </Expression>
-                <OverallResults successes="2" failures="0"/>
-              </Section>
-              <OverallResults successes="2" failures="0"/>
-            </Section>
-            <OverallResults successes="4" failures="0"/>
-          </Section>
-          <OverallResults successes="4" failures="0"/>
-        </Section>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: we reserve more space">
-          <OverallResults successes="0" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="   Given: an empty vector">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-          <Original>
-            v.size() == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <Section name="    When: we reserve more space">
-          <Section name="    Then: The capacity is increased but the size remains the same">
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.capacity() >= 10
-              </Original>
-              <Expanded>
-                10 >= 10
-              </Expanded>
-            </Expression>
-            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/BDDTests.cpp" >
-              <Original>
-                v.size() == 0
-              </Original>
-              <Expanded>
-                0 == 0
-              </Expanded>
-            </Expression>
-            <OverallResults successes="2" failures="0"/>
-          </Section>
-          <OverallResults successes="2" failures="0"/>
-        </Section>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping">
-      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
-        <Section name="    When: The test headers are printed as part of the normal running of the scenario">
-          <OverallResults successes="0" failures="0"/>
-        </Section>
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
-        <Section name="    When: The test headers are printed as part of the normal running of the scenario">
-          <Section name="    Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent">
-            <OverallResults successes="1" failures="0"/>
-          </Section>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="cmdline">
-      <Section name="process name">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.processName == &quot;test&quot;
-          </Original>
-          <Expanded>
-            &quot;test&quot; == &quot;test&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="arg separated by spaces">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.fileName == &quot;filename.ext&quot;
-          </Original>
-          <Expanded>
-            &quot;filename.ext&quot; == &quot;filename.ext&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="arg separated by colon">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.fileName == &quot;filename.ext&quot;
-          </Original>
-          <Expanded>
-            &quot;filename.ext&quot; == &quot;filename.ext&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="arg separated by =">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.fileName == &quot;filename.ext&quot;
-          </Original>
-          <Expanded>
-            &quot;filename.ext&quot; == &quot;filename.ext&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="long opt">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.fileName == &quot;%stdout&quot;
-          </Original>
-          <Expanded>
-            &quot;%stdout&quot; == &quot;%stdout&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="a number">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.number == 42
-          </Original>
-          <Expanded>
-            42 == 42
-          </Expanded>
-        </Expression>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="not a number">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            parseInto( cli, argv, config )
-          </Original>
-          <Expanded>
-            parseInto( cli, argv, config )
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.number == 0
-          </Original>
-          <Expanded>
-            0 == 0
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Section name="two parsers">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config1.number == 42
-          </Original>
-          <Expanded>
-            42 == 42
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            !unusedTokens.empty()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config2.description == &quot;some text&quot;
-          </Original>
-          <Expanded>
-            &quot;some text&quot; == &quot;some text&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <Section name="methods">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="methods">
-        <Section name="in range">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-            <Original>
-              config.index == 3
-            </Original>
-            <Expanded>
-              3 == 3
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="methods">
-        <Section name="out of range">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-            <Original>
-              parseInto( cli, argv, config )
-            </Original>
-            <Expanded>
-              parseInto( cli, argv, config )
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="flags">
-        <OverallResults successes="0" failures="0"/>
-      </Section>
-      <Section name="flags">
-        <Section name="set">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-            <Original>
-              config.flag
-            </Original>
-            <Expanded>
-              true
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="flags">
-        <Section name="not set">
-          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-            <Original>
-              config.flag == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
-          <OverallResults successes="1" failures="0"/>
-        </Section>
-        <OverallResults successes="1" failures="0"/>
-      </Section>
-      <Section name="positional">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.firstPos == &quot;1st&quot;
-          </Original>
-          <Expanded>
-            &quot;1st&quot; == &quot;1st&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.secondPos == &quot;2nd&quot;
-          </Original>
-          <Expanded>
-            &quot;2nd&quot; == &quot;2nd&quot;
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/CmdLineTests.cpp" >
-          <Original>
-            config.unpositional == &quot;3rd&quot;
-          </Original>
-          <Expanded>
-            &quot;3rd&quot; == &quot;3rd&quot;
-          </Expanded>
-        </Expression>
-        <OverallResults successes="3" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <TestCase name="section tracking">
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-        <Original>
-          !testCaseTracker.isCompleted()
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-        <Original>
-          !testCaseTracker.isCompleted()
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Section name="test case with no sections">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="2" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-        <Original>
-          !testCaseTracker.isCompleted()
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Section name="test case with one section">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="5" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-        <Original>
-          !testCaseTracker.isCompleted()
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Section name="test case with two consecutive sections">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section2Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section2Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section2Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="9" failures="0"/>
-      </Section>
-      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-        <Original>
-          !testCaseTracker.isCompleted()
-        </Original>
-        <Expanded>
-          !false
-        </Expanded>
-      </Expression>
-      <Section name="test case with one section within another">
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.enterSection( section2Name )
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            !testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            !false
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section1Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.enterSection( section2Name )
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/SectionTrackerTests.cpp" >
-          <Original>
-            testCaseTracker.isCompleted()
-          </Original>
-          <Expanded>
-            true
-          </Expanded>
-        </Expression>
-        <OverallResults successes="8" failures="0"/>
-      </Section>
-      <OverallResult success="true"/>
-    </TestCase>
-    <OverallResults successes="647" failures="109"/>
-  </Group>
-  <OverallResults successes="647" failures="109"/>
-</Catch>
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
new file mode 100644
index 00000000..83d78122
--- /dev/null
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -0,0 +1,712 @@
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+CatchSelfTest is a <version> host application.
+Run with -? for options
+
+-------------------------------------------------------------------------------
+./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( s == "world" )
+with expansion:
+  "hello" == "world"
+
+-------------------------------------------------------------------------------
+./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( m_a == 2 )
+with expansion:
+  1 == 2
+
+-------------------------------------------------------------------------------
+./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 6 )
+with expansion:
+  7 == 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 8 )
+with expansion:
+  7 == 8
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 0 )
+with expansion:
+  7 == 0
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
+with expansion:
+  9.1 == Approx( 9.11 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
+with expansion:
+  9.1 == Approx( 9 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 1 ) )
+with expansion:
+  9.1 == Approx( 1 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 0 ) )
+with expansion:
+  9.1 == Approx( 0 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.double_pi == Approx( 3.1415 ) )
+with expansion:
+  3.1415926535 == Approx( 3.1415 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "goodbye" )
+with expansion:
+  "hello" == "goodbye"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "hell" )
+with expansion:
+  "hello" == "hell"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "hello1" )
+with expansion:
+  "hello" == "hello1"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello.size() == 6 )
+with expansion:
+  5 == 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( x == Approx( 1.301 ) )
+with expansion:
+  1.3 == Approx( 1.301 )
+
+-------------------------------------------------------------------------------
+./failing/conditions/inequality
+-------------------------------------------------------------------------------
+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.1 != Approx( 9.1 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.double_pi != Approx( 3.1415926535 ) )
+with expansion:
+  3.1415926535 != Approx( 3.14159 )
+
+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 )
+with expansion:
+  5 != 5
+
+-------------------------------------------------------------------------------
+./failing/conditions/ordered
+-------------------------------------------------------------------------------
+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.1 < 9
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 10 )
+with expansion:
+  9.1 > 10
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 9.2 )
+with expansion:
+  9.1 > 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"
+
+-------------------------------------------------------------------------------
+./failing/conditions/not
+-------------------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------------------
+./failing/exceptions/explicit
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/2
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/3
+  section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/4
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK( thisThrows() == 0 )
+due to unexpected exception with message:
+  expected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_NOTHROW( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/throw
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_AS( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/double
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  3.14
+
+-------------------------------------------------------------------------------
+./failing/message/info/1
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./mixed/message/info/2
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./failing/message/fail
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  This is a failure
+
+-------------------------------------------------------------------------------
+./failing/message/sections
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section one
+
+-------------------------------------------------------------------------------
+./failing/message/sections
+  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
+-------------------------------------------------------------------------------
+./mixed/message/scoped
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( a == b )
+with expansion:
+  1 == 2
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/loops
+  s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( b > a )
+with expansion:
+  0 > 1
+
+-------------------------------------------------------------------------------
+./mixed/Misc/loops
+-------------------------------------------------------------------------------
+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>: 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>: 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
+
+Some information
+An error
+-------------------------------------------------------------------------------
+./failing/info
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with messages:
+  hi
+  i := 7
+
+-------------------------------------------------------------------------------
+./failing/checkedif
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./failing/checkedelse
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./manual/onechar
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with message:
+  3
+
+-------------------------------------------------------------------------------
+./failing/matchers/Contains
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/StartsWith
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/EndsWith
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/Equals
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+Message from section one
+Message from section two
+Some information
+An error
+Message from section one
+Message from section two
+Some information
+An error
+hello
+hello
+-------------------------------------------------------------------------------
+./failing/Tricky/non streamable type
+-------------------------------------------------------------------------------
+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:
+  {?} == {?}
+
+-------------------------------------------------------------------------------
+./failing/string literals
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>: FAILED:
+  REQUIRE( std::string( "first" ) == "second" )
+with expansion:
+  "first" == "second"
+
+===============================================================================
+121 test cases - 35 failed (744 assertions - 90 failed)
+
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
new file mode 100644
index 00000000..6d518bf5
--- /dev/null
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -0,0 +1,6511 @@
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+CatchSelfTest is a <version> host application.
+Run with -? for options
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/simple
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/epsilon
+-------------------------------------------------------------------------------
+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 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/float
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.23f == Approx( 1.23f ) )
+with expansion:
+  1.23 == Approx( 1.23 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0.0f == Approx( 0.0f ) )
+with expansion:
+  0 == Approx( 0 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/int
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1 == Approx( 1 ) )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( 0 ) )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/mixed
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.0f == Approx( 1 ) )
+with expansion:
+  1 == Approx( 1 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( dZero) )
+with expansion:
+  0 == Approx( 0 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
+with expansion:
+  0 == Approx( 1e-05 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.234f == Approx( dMedium ) )
+with expansion:
+  1.234 == Approx( 1.234 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( dMedium == Approx( 1.234f ) )
+with expansion:
+  1.234 == Approx( 1.234 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/custom
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+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 )
+
+-------------------------------------------------------------------------------
+./succeeding/TestClass/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s == "hello" )
+with expansion:
+  "hello" == "hello"
+
+-------------------------------------------------------------------------------
+./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( s == "world" )
+with expansion:
+  "hello" == "world"
+
+-------------------------------------------------------------------------------
+./succeeding/Fixture/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>:
+PASSED:
+  REQUIRE( m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( m_a == 2 )
+with expansion:
+  1 == 2
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/equality
+-------------------------------------------------------------------------------
+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.1 == Approx( 9.1 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
+with expansion:
+  3.1415926535 == Approx( 3.14159 )
+
+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 )
+
+-------------------------------------------------------------------------------
+./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 6 )
+with expansion:
+  7 == 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 8 )
+with expansion:
+  7 == 8
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 0 )
+with expansion:
+  7 == 0
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 9.11f ) )
+with expansion:
+  9.1 == Approx( 9.11 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 9.0f ) )
+with expansion:
+  9.1 == Approx( 9 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 1 ) )
+with expansion:
+  9.1 == Approx( 1 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one == Approx( 0 ) )
+with expansion:
+  9.1 == Approx( 0 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.double_pi == Approx( 3.1415 ) )
+with expansion:
+  3.1415926535 == Approx( 3.1415 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "goodbye" )
+with expansion:
+  "hello" == "goodbye"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "hell" )
+with expansion:
+  "hello" == "hell"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello == "hello1" )
+with expansion:
+  "hello" == "hello1"
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.str_hello.size() == 6 )
+with expansion:
+  5 == 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( x == Approx( 1.301 ) )
+with expansion:
+  1.3 == Approx( 1.301 )
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/inequality
+-------------------------------------------------------------------------------
+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.1 != Approx( 9.11 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
+with expansion:
+  9.1 != Approx( 9 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
+with expansion:
+  9.1 != Approx( 1 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
+with expansion:
+  9.1 != Approx( 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
+
+-------------------------------------------------------------------------------
+./failing/conditions/inequality
+-------------------------------------------------------------------------------
+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.1 != Approx( 9.1 )
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.double_pi != Approx( 3.1415926535 ) )
+with expansion:
+  3.1415926535 != Approx( 3.14159 )
+
+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 )
+with expansion:
+  5 != 5
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/ordered
+-------------------------------------------------------------------------------
+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.1 > 9
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 10 )
+with expansion:
+  9.1 < 10
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 9.2 )
+with expansion:
+  9.1 < 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"
+
+-------------------------------------------------------------------------------
+./failing/conditions/ordered
+-------------------------------------------------------------------------------
+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.1 < 9
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 10 )
+with expansion:
+  9.1 > 10
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one > 9.2 )
+with expansion:
+  9.1 > 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"
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/int literals
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i == 1 )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ui == 2 )
+with expansion:
+  2 == 2
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( l == 3 )
+with expansion:
+  3 == 3
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( ul == 4 )
+with expansion:
+  4 == 4
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( c == 5 )
+with expansion:
+  5 == 5
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( uc == 6 )
+with expansion:
+  6 == 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1 == i )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 2 == ui )
+with expansion:
+  2 == 2
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 3 == l )
+with expansion:
+  3 == 3
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 4 == ul )
+with expansion:
+  4 == 4
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 5 == c )
+with expansion:
+  5 == 5
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 6 == uc )
+with expansion:
+  6 == 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
+with expansion:
+  0x<hex digits> > 4
+
+-------------------------------------------------------------------------------
+./succeeding/conditions//long_to_unsigned_x
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( long_var == unsigned_char_var )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( long_var == unsigned_short_var )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( long_var == unsigned_int_var )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( long_var == unsigned_long_var )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/const ints to int literal
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( unsigned_char_var == 1 )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( unsigned_short_var == 1 )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( unsigned_int_var == 1 )
+with expansion:
+  1 == 1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( unsigned_long_var == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/negative ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( ( -1 > 2u ) )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( -1 > 2u )
+with expansion:
+  -1 > 2
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( ( 2u < -1 ) )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( 2u < -1 )
+with expansion:
+  2 < -1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( ( minInt > 2u ) )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( minInt > 2u )
+with expansion:
+  -2147483648 > 2
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/computed ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  CHECK( 54 == 6*9 )
+with expansion:
+  54 == 54
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/ptr
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p == __null )
+with expansion:
+  __null == 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p == pNULL )
+with expansion:
+  __null == __null
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p != __null )
+with expansion:
+  0x<hex digits> != 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( cp != __null )
+with expansion:
+  0x<hex digits> != 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( cpc != __null )
+with expansion:
+  0x<hex digits> != 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( returnsNull() == __null )
+with expansion:
+  {null string} == 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( returnsConstNull() == __null )
+with expansion:
+  {null string} == 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( __null != p )
+with expansion:
+  0 != 0x<hex digits>
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/not
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( false == false )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( true == true )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( !false )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( false )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( !falseValue )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( falseValue )
+with expansion:
+  !false
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( !(1 == 2) )
+with expansion:
+  true
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( 1 == 2 )
+with expansion:
+  !(1 == 2)
+
+-------------------------------------------------------------------------------
+./failing/conditions/not
+-------------------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------------------
+./succeeding/exceptions/explicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS_AS( thisThrows() )
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_NOTHROW( thisDoesntThrow() )
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( thisThrows() )
+
+-------------------------------------------------------------------------------
+./failing/exceptions/explicit
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/2
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  CHECK( 1 == 1 )
+
+ExceptionTests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/3
+  section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  unexpected exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/implicit/4
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  CHECK( thisThrows() == 0 )
+due to unexpected exception with message:
+  expected exception
+
+-------------------------------------------------------------------------------
+./succeeding/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case './succeeding/exceptions/implicit'
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom exception
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_NOTHROW( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/throw
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+  REQUIRE_THROWS_AS( throwCustom() )
+due to unexpected exception with message:
+  custom exception - not std
+
+-------------------------------------------------------------------------------
+./failing/exceptions/custom/double
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  3.14
+
+-------------------------------------------------------------------------------
+./succeeding/exceptions/notimplemented
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  200 == 200
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  202 == 202
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  202 == 202
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  202 == 202
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  204 == 204
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  206 == 206
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  208 == 208
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  210 == 210
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  212 == 212
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  6 == 6
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  10 == 10
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
+with expansion:
+  30 == 30
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
+with expansion:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+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:
+  214 == 214
+
+-------------------------------------------------------------------------------
+./succeeding/generators/2
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( i->first == i->second-1 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+./succeeding/generators/2
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:<line number>
+...............................................................................
+
+GeneratorTests.cpp:<line number>:
+PASSED:
+  CATCH_REQUIRE( i->first == i->second-1 )
+with expansion:
+  2 == 2
+
+-------------------------------------------------------------------------------
+./succeeding/message
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+warning:
+  this is a message
+  this is a warning
+
+
+No assertions in test case './succeeding/message'
+
+-------------------------------------------------------------------------------
+./succeeding/succeed
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+PASSED:
+with message:
+  this is a success
+
+-------------------------------------------------------------------------------
+./failing/message/info/1
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./mixed/message/info/2
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.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 )
+with expansion:
+  2 == 1
+with message:
+  this message should be logged
+
+MessageTests.cpp:<line number>: FAILED:
+  CHECK( a == 0 )
+with expansion:
+  2 == 0
+with message:
+  and this, but later
+
+MessageTests.cpp:<line number>:
+PASSED:
+  CHECK( a == 2 )
+with expansion:
+  2 == 2
+with message:
+  but not this
+
+-------------------------------------------------------------------------------
+./failing/message/fail
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  This is a failure
+
+-------------------------------------------------------------------------------
+./failing/message/sections
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section one
+
+-------------------------------------------------------------------------------
+./failing/message/sections
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Message from section two
+
+Message from section one
+-------------------------------------------------------------------------------
+./succeeding/message/sections/stdout
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'one'
+
+Message from section two
+-------------------------------------------------------------------------------
+./succeeding/message/sections/stdout
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'two'
+
+-------------------------------------------------------------------------------
+./mixed/message/scoped
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/nofail
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>:
+FAILED - but was ok:
+  CHECK_NOFAIL( 1 == 2 )
+
+
+No assertions in test case './succeeding/nofail'
+
+-------------------------------------------------------------------------------
+just info
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case 'just info'
+
+-------------------------------------------------------------------------------
+just failure
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+MessageTests.cpp:<line number>: FAILED:
+explicitly with message:
+  Previous info should not be seen
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/Sections
+  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
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/Sections
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a != b )
+with expansion:
+  1 != 2
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/Sections/nested
+  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
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/Sections/nested
+  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
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/Sections/nested
+  s1
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a != b )
+with expansion:
+  1 != 2
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( a == b )
+with expansion:
+  1 == 2
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s3
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a != b )
+with expansion:
+  1 != 2
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/nested2
+  s1
+  s4
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a < b )
+with expansion:
+  1 < 2
+
+-------------------------------------------------------------------------------
+./Sections/nested/a/b
+  c
+  d (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'd (leaf)'
+
+-------------------------------------------------------------------------------
+./Sections/nested/a/b
+  c
+  e (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'e (leaf)'
+
+-------------------------------------------------------------------------------
+./Sections/nested/a/b
+  f (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'f (leaf)'
+
+-------------------------------------------------------------------------------
+./mixed/Misc/Sections/loops
+  s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK( b > a )
+with expansion:
+  0 > 1
+
+-------------------------------------------------------------------------------
+./mixed/Misc/loops
+-------------------------------------------------------------------------------
+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
+
+Some information
+An error
+-------------------------------------------------------------------------------
+./succeeding/Misc/stdout,stderr
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case './succeeding/Misc/stdout,stderr'
+
+-------------------------------------------------------------------------------
+./succeeding/Misc/null strings
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( makeString( false ) != static_cast<char*>(__null) )
+with expansion:
+  "valid string" != {null string}
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( makeString( true ) == static_cast<char*>(__null) )
+with expansion:
+  {null string} == {null string}
+
+-------------------------------------------------------------------------------
+./failing/info
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with messages:
+  hi
+  i := 7
+
+-------------------------------------------------------------------------------
+./succeeding/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
+
+-------------------------------------------------------------------------------
+./failing/checkedif
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/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
+
+-------------------------------------------------------------------------------
+./failing/checkedelse
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./misc/xmlentitycheck
+  embedded xml
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'embedded xml'
+
+-------------------------------------------------------------------------------
+./misc/xmlentitycheck
+  encoded chars
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'encoded chars'
+
+-------------------------------------------------------------------------------
+./manual/onechar
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  REQUIRE( false )
+with message:
+  3
+
+-------------------------------------------------------------------------------
+./succeeding/atomic if
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE( x == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+./succeeding/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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/Contains
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/StartsWith
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/EndsWith
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./failing/matchers/Equals
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+string
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THAT( "" Equals(__null) )
+with expansion:
+  "" equals: ""
+
+-------------------------------------------------------------------------------
+./succeeding/matchers/AllOf
+-------------------------------------------------------------------------------
+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" )
+
+-------------------------------------------------------------------------------
+./succeeding/matchers/AnyOf
+-------------------------------------------------------------------------------
+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" )
+
+-------------------------------------------------------------------------------
+./succeeding/matchers/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"
+
+-------------------------------------------------------------------------------
+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:
+  0x<hex digits> == 3628800
+
+-------------------------------------------------------------------------------
+empty
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case 'empty'
+
+-------------------------------------------------------------------------------
+Nice descriptive name
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+warning:
+  This one ran
+
+
+No assertions in test case 'Nice descriptive name'
+
+-------------------------------------------------------------------------------
+first tag
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case 'first tag'
+
+-------------------------------------------------------------------------------
+second tag
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case 'second tag'
+
+-------------------------------------------------------------------------------
+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
+-------------------------------------------------------------------------------
+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
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+  Outer
+  Inner
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+with message:
+  that's not flying - that's failing in style
+
+-------------------------------------------------------------------------------
+./failing/CatchSectionInfiniteLoop
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+explicitly with message:
+  to infinity and beyond
+
+-------------------------------------------------------------------------------
+selftest/main
+  selftest/expected result
+  selftest/expected result/failing tests
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests failed, as expected
+
+-------------------------------------------------------------------------------
+selftest/main
+  selftest/expected result
+  selftest/expected result/succeeding tests
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+Message from section one
+Message from section two
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+Some information
+An error
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+catch_self_test.hpp:<line number>:
+PASSED:
+with message:
+  Tests passed, as expected
+
+Message from section one
+Message from section two
+Some information
+An error
+-------------------------------------------------------------------------------
+selftest/main
+  selftest/test counts
+  selftest/test counts/succeeding tests
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.passed == 298 )
+with expansion:
+  298 == 298
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.failed == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+selftest/main
+  selftest/test counts
+  selftest/test counts/failing tests
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.passed == 2 )
+with expansion:
+  2 == 2
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.failed == 77 )
+with expansion:
+  77 == 77
+
+-------------------------------------------------------------------------------
+meta/Misc/Sections
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.passed == 2 )
+with expansion:
+  2 == 2
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( totals.assertions.failed == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+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.reporterName.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.filters().size() == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( 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.filters().size() == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( 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.filters().size() == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  test lists
+  Specify two test cases using -t
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters().size() == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) )
+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.reporterName == "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.reporterName == "xml" )
+with expansion:
+  "xml" == "xml"
+
+-------------------------------------------------------------------------------
+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.reporterName == "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 <number of 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 <number of 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
+
+-------------------------------------------------------------------------------
+selftest/test filter
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+selftest/test filters
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+selftest/filter/prefix wildcard
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+selftest/filter/wildcard at both ends
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+selftest/tags
+  one tag
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.getTestCaseInfo().description == "" )
+with expansion:
+  "" == ""
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.hasTag( "one" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.getTags().size() == 1 )
+with expansion:
+  1 == 1
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( p1 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( p2 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( p3 ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( p4 ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( p5 ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+selftest/tags
+  two tags
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.getTestCaseInfo().description == "" )
+with expansion:
+  "" == ""
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.hasTag( "one" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.hasTag( "two" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.hasTag( "Two" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.hasTag( "three" ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.getTags().size() == 2 )
+with expansion:
+  2 == 2
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.matchesTags( p1 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.matchesTags( p2 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.matchesTags( p3 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.matchesTags( p4 ) == true )
+with expansion:
+  true == true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( twoTags.matchesTags( p5 ) == true )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+selftest/tags
+  complex
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( fakeTestCase( "test", "[one][.]" ).matchesTags( p1 ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( fakeTestCase( "test", "[one][.]" ).matchesTags( p5 ) )
+with expansion:
+  !false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p4 ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p5 ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( fakeTestCase( "test", "[three]" ).matchesTags( "[three]~[one]" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]~[not_apple]" ) )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+selftest/tags
+  one tag with characters either side
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
+with expansion:
+  "1234" == "1234"
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagWithExtras.hasTag( "one" ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagWithExtras.hasTag( "two" ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagWithExtras.getTags().size() == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+selftest/tags
+  start of a tag, but not closed
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
+with expansion:
+  "[one" == "[one"
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagOpen.hasTag( "one" ) == false )
+with expansion:
+  false == false
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTagOpen.getTags().size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+selftest/tags
+  hidden
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.getTestCaseInfo().description == "" )
+with expansion:
+  "" == ""
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.hasTag( "." ) )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.isHidden() )
+with expansion:
+  true
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK( oneTag.matchesTags( "~[.]" ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+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"
+
+hello
+hello
+-------------------------------------------------------------------------------
+Strings can be rendered with colour
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+
+No assertions in test case 'Strings can be rendered with colour'
+
+-------------------------------------------------------------------------------
+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"
+
+-------------------------------------------------------------------------------
+./succeeding/Tricky/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 )
+
+-------------------------------------------------------------------------------
+./inprogress/failing/Tricky/trailing expression
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
+
+
+No assertions in test case './inprogress/failing/Tricky/trailing expression'
+
+-------------------------------------------------------------------------------
+./inprogress/failing/Tricky/compound lhs
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+warning:
+  Uncomment the code in this test to check that it gives a sensible compiler
+  error
+
+
+No assertions in test case './inprogress/failing/Tricky/compound lhs'
+
+-------------------------------------------------------------------------------
+./failing/Tricky/non streamable type
+-------------------------------------------------------------------------------
+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:
+  {?} == {?}
+
+-------------------------------------------------------------------------------
+./failing/string literals
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>: FAILED:
+  REQUIRE( std::string( "first" ) == "second" )
+with expansion:
+  "first" == "second"
+
+-------------------------------------------------------------------------------
+./succeeding/side-effects
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i++ == 7 )
+with expansion:
+  7 == 7
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( i++ == 8 )
+with expansion:
+  8 == 8
+
+-------------------------------------------------------------------------------
+./succeeding/koenig
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0x<hex digits> == o )
+with expansion:
+  0x<hex digits> == {?}
+
+-------------------------------------------------------------------------------
+./succeeding/non-const==
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( t == 1u )
+with expansion:
+  {?} == 1
+
+-------------------------------------------------------------------------------
+./succeeding/enum/bits
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0x<hex digits> == bit30and31 )
+with expansion:
+  0x<hex digits> == 3221225472
+
+-------------------------------------------------------------------------------
+./succeeding/boolean member
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( obj.prop != __null )
+with expansion:
+  0x<hex digits> != 0
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to true
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( is_true<true>::value == true )
+with expansion:
+  true == true
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( true == is_true<true>::value )
+with expansion:
+  true == true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  compare to false
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( is_true<false>::value == false )
+with expansion:
+  false == false
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( false == is_true<false>::value )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  negation
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( !is_true<false>::value )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  double negation
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( !!is_true<true>::value )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+./succeeding/unimplemented static bool
+  direct
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( is_true<true>::value )
+with expansion:
+  true
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( is_true<false>::value )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+./succeeding/SafeBool
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+  Another section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Assertions then sections
+  A section
+  Another other section
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( Catch::isTrue( true ) )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+non streamable - with conv. op
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s == "7" )
+with expansion:
+  "7" == "7"
+
+-------------------------------------------------------------------------------
+Comparing function pointers
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a )
+with expansion:
+  true
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( a == &foo )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+pointer to class
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+  REQUIRE( p == 0 )
+with expansion:
+  __null == 0
+
+-------------------------------------------------------------------------------
+X/level/0/a
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+
+-------------------------------------------------------------------------------
+X/level/0/b
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+
+-------------------------------------------------------------------------------
+X/level/1/a
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+
+-------------------------------------------------------------------------------
+X/level/1/b
+-------------------------------------------------------------------------------
+TrickyTests.cpp:<line number>
+...............................................................................
+
+TrickyTests.cpp:<line number>:
+PASSED:
+
+-------------------------------------------------------------------------------
+Anonymous test case 1
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:<line number>
+...............................................................................
+
+VariadicMacrosTests.cpp:<line number>:
+PASSED:
+with message:
+  anonymous test case
+
+-------------------------------------------------------------------------------
+Test case with one argument
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:<line number>
+...............................................................................
+
+VariadicMacrosTests.cpp:<line number>:
+PASSED:
+with message:
+  no assertions
+
+-------------------------------------------------------------------------------
+Variadic macros
+  Section with one argument
+-------------------------------------------------------------------------------
+VariadicMacrosTests.cpp:<line number>
+...............................................................................
+
+VariadicMacrosTests.cpp:<line number>:
+PASSED:
+with message:
+  no assertions
+
+-------------------------------------------------------------------------------
+Scenario: Do that thing with the thing
+     Given: This stuff exists
+      When: I do this
+      Then: it should do this
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( itDoesThis() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Scenario: Do that thing with the thing
+     Given: This stuff exists
+      When: I do this
+      Then: it should do this
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( itDoesThis() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Scenario: Do that thing with the thing
+     Given: This stuff exists
+      When: I do this
+      Then: it should do this
+       And: do that
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( itDoesThat() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 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
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 10 )
+with expansion:
+  10 == 10
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 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
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 10 )
+with expansion:
+  10 == 10
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 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
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 10 )
+with expansion:
+  10 == 10
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+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
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+Scenario: Vector resizing affects size and capacity
+     Given: an empty vector
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+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
+-------------------------------------------------------------------------------
+BDDTests.cpp:<line number>
+...............................................................................
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+BDDTests.cpp:<line number>:
+PASSED:
+  REQUIRE( v.size() == 0 )
+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!
+
+-------------------------------------------------------------------------------
+cmdline
+  process name
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.processName == "test" )
+with expansion:
+  "test" == "test"
+
+-------------------------------------------------------------------------------
+cmdline
+  arg separated by spaces
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.fileName == "filename.ext" )
+with expansion:
+  "filename.ext" == "filename.ext"
+
+-------------------------------------------------------------------------------
+cmdline
+  arg separated by colon
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.fileName == "filename.ext" )
+with expansion:
+  "filename.ext" == "filename.ext"
+
+-------------------------------------------------------------------------------
+cmdline
+  arg separated by =
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.fileName == "filename.ext" )
+with expansion:
+  "filename.ext" == "filename.ext"
+
+-------------------------------------------------------------------------------
+cmdline
+  long opt
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.fileName == "%stdout" )
+with expansion:
+  "%stdout" == "%stdout"
+
+-------------------------------------------------------------------------------
+cmdline
+  a number
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.number == 42 )
+with expansion:
+  42 == 42
+
+-------------------------------------------------------------------------------
+cmdline
+  not a number
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK_THROWS( parseInto( cli, argv, config ) )
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config.number == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+cmdline
+  two parsers
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config1.number == 42 )
+with expansion:
+  42 == 42
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE_FALSE( unusedTokens.empty() )
+with expansion:
+  !false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( config2.description == "some text" )
+with expansion:
+  "some text" == "some text"
+
+-------------------------------------------------------------------------------
+cmdline
+  methods
+  in range
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.index == 3 )
+with expansion:
+  3 == 3
+
+-------------------------------------------------------------------------------
+cmdline
+  methods
+  out of range
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS( parseInto( cli, argv, config ) )
+
+-------------------------------------------------------------------------------
+cmdline
+  flags
+  set
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.flag )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+cmdline
+  flags
+  not set
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.flag == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+cmdline
+  positional
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.firstPos == "1st" )
+with expansion:
+  "1st" == "1st"
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.secondPos == "2nd" )
+with expansion:
+  "2nd" == "2nd"
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  REQUIRE( config.unpositional == "3rd" )
+with expansion:
+  "3rd" == "3rd"
+
+-------------------------------------------------------------------------------
+section tracking
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+section tracking
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+section tracking
+  test case with no sections
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.isCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+section tracking
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+section tracking
+  test case with one section
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.isCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+section tracking
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+section tracking
+  test case with two consecutive sections
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section2Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.isCompleted() )
+with expansion:
+  true
+
+-------------------------------------------------------------------------------
+section tracking
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+section tracking
+  test case with one section within another
+-------------------------------------------------------------------------------
+SectionTrackerTests.cpp:<line number>
+...............................................................................
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK_FALSE( testCaseTracker.isCompleted() )
+with expansion:
+  !false
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section1Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.enterSection( section2Name ) )
+with expansion:
+  true
+
+SectionTrackerTests.cpp:<line number>:
+PASSED:
+  CHECK( testCaseTracker.isCompleted() )
+with expansion:
+  true
+
+===============================================================================
+121 test cases - 50 failed (763 assertions - 109 failed)
+
diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt
new file mode 100644
index 00000000..aa5e2493
--- /dev/null
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -0,0 +1,318 @@
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+CatchSelfTest is a <version> host application.
+Run with -? for options
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/simple
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/epsilon
+-------------------------------------------------------------------------------
+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 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/float
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.23f == Approx( 1.23f ) )
+with expansion:
+  1.23 == Approx( 1.23 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0.0f == Approx( 0.0f ) )
+with expansion:
+  0 == Approx( 0 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/int
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1 == Approx( 1 ) )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( 0 ) )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/mixed
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.0f == Approx( 1 ) )
+with expansion:
+  1 == Approx( 1 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( dZero) )
+with expansion:
+  0 == Approx( 0 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
+with expansion:
+  0 == Approx( 1e-05 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( 1.234f == Approx( dMedium ) )
+with expansion:
+  1.234 == Approx( 1.234 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+  REQUIRE( dMedium == Approx( 1.234f ) )
+with expansion:
+  1.234 == Approx( 1.234 )
+
+-------------------------------------------------------------------------------
+./succeeding/Approx/custom
+-------------------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------------------
+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 )
+
+-------------------------------------------------------------------------------
+./succeeding/TestClass/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>:
+PASSED:
+  REQUIRE( s == "hello" )
+with expansion:
+  "hello" == "hello"
+
+-------------------------------------------------------------------------------
+./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( s == "world" )
+with expansion:
+  "hello" == "world"
+
+-------------------------------------------------------------------------------
+./succeeding/Fixture/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>:
+PASSED:
+  REQUIRE( m_a == 1 )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:<line number>
+...............................................................................
+
+ClassTests.cpp:<line number>: FAILED:
+  REQUIRE( m_a == 2 )
+with expansion:
+  1 == 2
+
+-------------------------------------------------------------------------------
+./succeeding/conditions/equality
+-------------------------------------------------------------------------------
+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.1 == Approx( 9.1 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
+with expansion:
+  3.1415926535 == Approx( 3.14159 )
+
+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 )
+
+-------------------------------------------------------------------------------
+./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 6 )
+with expansion:
+  7 == 6
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven == 8 )
+with expansion:
+  7 == 8
+
+===============================================================================
+13 test cases - 3 failed (40 assertions - 4 failed)
+
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
new file mode 100644
index 00000000..6b256f72
--- /dev/null
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -0,0 +1,579 @@
+<testsuites>
+  <testsuite name="~_" errors="10" failures="99" tests="763" hostname="tbd" time="{duration}" timestamp="tbd">
+    <testcase classname="global" name="./succeeding/Approx/simple" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/Approx/epsilon" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/Approx/float" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/Approx/int" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/Approx/mixed" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/Approx/custom" time="{duration}"/>
+    <testcase classname="global" name="Approximate PI" time="{duration}"/>
+    <testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="{duration}"/>
+    <testcase classname="TestClass" name="./failing/TestClass/failingCase" time="{duration}">
+      <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
+ClassTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="{duration}"/>
+    <testcase classname="Fixture" name="./failing/Fixture/failingCase" time="{duration}">
+      <failure message="1 == 2" type="REQUIRE">
+ClassTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/conditions/equality" time="{duration}"/>
+    <testcase classname="global" name="./failing/conditions/equality" time="{duration}">
+      <failure message="7 == 6" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 == 8" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 == 0" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 == Approx( 9.11 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 == Approx( 9 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 == Approx( 1 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 == Approx( 0 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="5 == 6" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="1.3 == Approx( 1.301 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/conditions/inequality" time="{duration}"/>
+    <testcase classname="global" name="./failing/conditions/inequality" time="{duration}">
+      <failure message="7 != 7" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 != Approx( 9.1 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="3.1415926535 != Approx( 3.14159 )" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="5 != 5" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/conditions/ordered" time="{duration}"/>
+    <testcase classname="global" name="./failing/conditions/ordered" time="{duration}">
+      <failure message="7 > 7" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 &lt; 7" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 > 8" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 &lt; 6" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 &lt; 0" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 &lt; -1" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 >= 8" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="7 &lt;= 6" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 &lt; 9" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 > 10" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="9.1 > 9.2" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+      <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
+ConditionTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/conditions/int literals" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions//long_to_unsigned_x" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions/const ints to int literal" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions/negative ints" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions/computed ints" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions/ptr" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/conditions/not" time="{duration}"/>
+    <testcase classname="global" name="./failing/conditions/not" 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="./succeeding/exceptions/explicit" time="{duration}"/>
+    <testcase classname="global" name="./failing/exceptions/explicit" 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="./failing/exceptions/implicit" time="{duration}">
+      <error type="TEST_CASE">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/implicit/2" time="{duration}">
+      <error message="{Unknown expression after the reported line}">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="./failing/exceptions/implicit/3" name="section name" time="{duration}">
+      <error type="TEST_CASE">
+unexpected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/implicit/4" time="{duration}">
+      <error message="thisThrows() == 0" type="CHECK">
+expected exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/custom" time="{duration}">
+      <error type="TEST_CASE">
+custom exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="{duration}">
+      <error message="throwCustom()" type="REQUIRE_NOTHROW">
+custom exception - not std
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/custom/throw" time="{duration}">
+      <error message="throwCustom()" type="REQUIRE_THROWS_AS">
+custom exception - not std
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./failing/exceptions/custom/double" time="{duration}">
+      <error type="TEST_CASE">
+3.14
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/generators/1" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/generators/2" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/message" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/succeed" time="{duration}"/>
+    <testcase classname="global" name="./failing/message/info/1" 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="./mixed/message/info/2" 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="./failing/message/fail" time="{duration}">
+      <failure type="FAIL">
+This is a failure
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="./failing/message/sections" name="one" time="{duration}">
+      <failure type="FAIL">
+Message from section one
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="./failing/message/sections" name="two" time="{duration}">
+      <failure type="FAIL">
+Message from section two
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="./succeeding/message/sections/stdout" name="two" time="{duration}">
+      <system-out>
+Message from section one
+Message from section two
+      </system-out>
+    </testcase>
+    <testcase classname="global" name="./mixed/message/scoped" time="{duration}">
+      <failure message="10 &lt; 10" type="REQUIRE">
+current counter 10
+i := 10
+MessageTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/nofail" 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="./succeeding/Misc/Sections" name="s1" time="{duration}"/>
+    <testcase classname="./succeeding/Misc/Sections" name="s2" time="{duration}"/>
+    <testcase classname="./succeeding/Misc/Sections/nested" name="s1" time="{duration}"/>
+    <testcase classname="./succeeding/Misc/Sections/nested" name="s1/s2" time="{duration}"/>
+    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s2" time="{duration}">
+      <failure message="1 == 2" type="REQUIRE">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s3" time="{duration}"/>
+    <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s4" time="{duration}"/>
+    <testcase classname="./mixed/Misc/Sections/loops" name="s1" time="{duration}">
+      <failure message="0 > 1" type="CHECK">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./mixed/Misc/loops" time="{duration}">
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[0] (1) is even
+MiscTests.cpp:<line number>
+      </failure>
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[1] (1) is even
+MiscTests.cpp:<line number>
+      </failure>
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[3] (3) is even
+MiscTests.cpp:<line number>
+      </failure>
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[4] (5) is even
+MiscTests.cpp:<line number>
+      </failure>
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[6] (13) is even
+MiscTests.cpp:<line number>
+      </failure>
+      <failure message="1 == 0" type="CHECK">
+Testing if fib[7] (21) is even
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="{duration}">
+      <system-out>
+Some information
+      </system-out>
+      <system-err>
+An error
+      </system-err>
+    </testcase>
+    <testcase classname="global" name="./succeeding/Misc/null strings" time="{duration}"/>
+    <testcase classname="global" name="./failing/info" time="{duration}">
+      <failure message="false" type="REQUIRE">
+hi
+i := 7
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/checkedif" time="{duration}"/>
+    <testcase classname="global" name="./failing/checkedif" 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="./succeeding/checkedelse" time="{duration}"/>
+    <testcase classname="global" name="./failing/checkedelse" 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="global" name="./manual/onechar" time="{duration}">
+      <failure message="false" type="REQUIRE">
+3
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/atomic if" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/matchers" time="{duration}"/>
+    <testcase classname="global" name="./failing/matchers/Contains" 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="./failing/matchers/StartsWith" 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="./failing/matchers/EndsWith" 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="./failing/matchers/Equals" 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="string" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/matchers/AllOf" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/matchers/AnyOf" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/matchers/Equals" time="{duration}"/>
+    <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="./failing/CatchSectionInfiniteLoop" name="root" time="{duration}">
+      <failure type="FAIL">
+to infinity and beyond
+MiscTests.cpp:<line number>
+      </failure>
+      <failure type="FAIL">
+to infinity and beyond
+MiscTests.cpp:<line number>
+      </failure>
+      <failure type="FAIL">
+to infinity and beyond
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="./failing/CatchSectionInfiniteLoop" name="Outer/Inner" time="{duration}"/>
+    <testcase classname="selftest/main" name="selftest/expected result/selftest/expected result/failing tests" time="{duration}"/>
+    <testcase classname="selftest/main" name="selftest/expected result/selftest/expected result/succeeding tests" time="{duration}"/>
+    <testcase classname="selftest/main" name="selftest/test counts/selftest/test counts/succeeding tests" time="{duration}"/>
+    <testcase classname="selftest/main" name="selftest/test counts/selftest/test counts/failing tests" time="{duration}">
+      <system-out>
+Message from section one
+Message from section two
+Some information
+Message from section one
+Message from section two
+Some information
+      </system-out>
+      <system-err>
+An error
+An error
+      </system-err>
+    </testcase>
+    <testcase classname="global" name="meta/Misc/Sections" 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="test lists/Specify two test cases using -t" 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/--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="global" name="selftest/test filter" time="{duration}"/>
+    <testcase classname="global" name="selftest/test filters" time="{duration}"/>
+    <testcase classname="global" name="selftest/filter/prefix wildcard" time="{duration}"/>
+    <testcase classname="global" name="selftest/filter/wildcard at both ends" time="{duration}"/>
+    <testcase classname="selftest/tags" name="one tag" time="{duration}"/>
+    <testcase classname="selftest/tags" name="two tags" time="{duration}"/>
+    <testcase classname="selftest/tags" name="complex" time="{duration}"/>
+    <testcase classname="selftest/tags" name="one tag with characters either side" time="{duration}"/>
+    <testcase classname="selftest/tags" name="start of a tag, but not closed" time="{duration}"/>
+    <testcase classname="selftest/tags" name="hidden" 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="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="./succeeding/Tricky/std::pair" time="{duration}"/>
+    <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="{duration}"/>
+    <testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="{duration}"/>
+    <testcase classname="global" name="./failing/Tricky/non streamable type" 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="./failing/string literals" time="{duration}">
+      <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
+TrickyTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="./succeeding/side-effects" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/koenig" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/non-const==" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/enum/bits" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/boolean member" time="{duration}"/>
+    <testcase classname="./succeeding/unimplemented static bool" name="compare to true" time="{duration}"/>
+    <testcase classname="./succeeding/unimplemented static bool" name="compare to false" time="{duration}"/>
+    <testcase classname="./succeeding/unimplemented static bool" name="negation" time="{duration}"/>
+    <testcase classname="./succeeding/unimplemented static bool" name="double negation" time="{duration}"/>
+    <testcase classname="./succeeding/unimplemented static bool" name="direct" time="{duration}"/>
+    <testcase classname="global" name="./succeeding/SafeBool" 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="pointer to class" 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="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="cmdline" name="process name" time="{duration}"/>
+    <testcase classname="cmdline" name="arg separated by spaces" time="{duration}"/>
+    <testcase classname="cmdline" name="arg separated by colon" time="{duration}"/>
+    <testcase classname="cmdline" name="arg separated by =" time="{duration}"/>
+    <testcase classname="cmdline" name="long opt" time="{duration}"/>
+    <testcase classname="cmdline" name="a number" time="{duration}"/>
+    <testcase classname="cmdline" name="not a number" time="{duration}"/>
+    <testcase classname="cmdline" name="two parsers" time="{duration}"/>
+    <testcase classname="cmdline" name="methods/in range" time="{duration}"/>
+    <testcase classname="cmdline" name="methods/out of range" time="{duration}"/>
+    <testcase classname="cmdline" name="flags/set" time="{duration}"/>
+    <testcase classname="cmdline" name="flags/not set" time="{duration}"/>
+    <testcase classname="cmdline" name="positional" time="{duration}"/>
+    <testcase classname="section tracking" name="root" time="{duration}"/>
+    <testcase classname="section tracking" name="test case with no sections" time="{duration}"/>
+    <testcase classname="section tracking" name="test case with one section" time="{duration}"/>
+    <testcase classname="section tracking" name="test case with two consecutive sections" time="{duration}"/>
+    <testcase classname="section tracking" name="test case with one section within another" time="{duration}"/>
+    <system-out>
+Message from section one
+Message from section two
+Some information
+Message from section one
+Message from section two
+Some information
+Message from section one
+Message from section two
+Some information
+hello
+hello
+    </system-out>
+    <system-err>
+An error
+An error
+An error
+    </system-err>
+  </testsuite>
+</testsuites>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
new file mode 100644
index 00000000..5c2ebab4
--- /dev/null
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -0,0 +1,6410 @@
+<Catch name="CatchSelfTest">
+  <Group name="~_">
+    <TestCase name="./succeeding/Approx/simple">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d == Approx( 1.23 )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.23 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d != Approx( 1.22 )
+        </Original>
+        <Expanded>
+          1.23 != Approx( 1.22 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d != Approx( 1.24 )
+        </Original>
+        <Expanded>
+          1.23 != Approx( 1.24 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          Approx( d ) == 1.23
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) == 1.23
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          Approx( d ) != 1.22
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) != 1.22
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          Approx( d ) != 1.24
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) != 1.24
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Approx/epsilon">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d != Approx( 1.231 )
+        </Original>
+        <Expanded>
+          1.23 != Approx( 1.231 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d == Approx( 1.231 ).epsilon( 0.1 )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.231 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Approx/float">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          1.23f == Approx( 1.23f )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.23 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          0.0f == Approx( 0.0f )
+        </Original>
+        <Expanded>
+          0 == Approx( 0 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Approx/int">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          1 == Approx( 1 )
+        </Original>
+        <Expanded>
+          1 == Approx( 1 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          0 == Approx( 0 )
+        </Original>
+        <Expanded>
+          0 == Approx( 0 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Approx/mixed">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          1.0f == Approx( 1 )
+        </Original>
+        <Expanded>
+          1 == Approx( 1 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          0 == Approx( dZero)
+        </Original>
+        <Expanded>
+          0 == Approx( 0 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          0 == Approx( dSmall ).epsilon( 0.001 )
+        </Original>
+        <Expanded>
+          0 == Approx( 1e-05 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          1.234f == Approx( dMedium )
+        </Original>
+        <Expanded>
+          1.234 == Approx( 1.234 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          dMedium == Approx( 1.234f )
+        </Original>
+        <Expanded>
+          1.234 == Approx( 1.234 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Approx/custom">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d == approx( 1.23 )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.23 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d == approx( 1.22 )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.22 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d == approx( 1.24 )
+        </Original>
+        <Expanded>
+          1.23 == Approx( 1.24 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          d != approx( 1.25 )
+        </Original>
+        <Expanded>
+          1.23 != Approx( 1.25 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          approx( d ) == 1.23
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) == 1.23
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          approx( d ) == 1.22
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) == 1.22
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          approx( d ) == 1.24
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) == 1.24
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          approx( d ) != 1.25
+        </Original>
+        <Expanded>
+          Approx( 1.23 ) != 1.25
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Approximate PI">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 )
+        </Original>
+        <Expanded>
+          3.1428571429 == Approx( 3.141 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" >
+        <Original>
+          divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 )
+        </Original>
+        <Expanded>
+          3.1428571429 != Approx( 3.141 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/TestClass/succeedingCase">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp" >
+        <Original>
+          s == &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/TestClass/failingCase">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp" >
+        <Original>
+          s == &quot;world&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;world&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/Fixture/succeedingCase">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp" >
+        <Original>
+          m_a == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/Fixture/failingCase">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp" >
+        <Original>
+          m_a == 2
+        </Original>
+        <Expanded>
+          1 == 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/equality">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven == 7
+        </Original>
+        <Expanded>
+          7 == 7
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one == Approx( 9.1f )
+        </Original>
+        <Expanded>
+          9.1 == Approx( 9.1 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.double_pi == Approx( 3.1415926535 )
+        </Original>
+        <Expanded>
+          3.1415926535 == Approx( 3.14159 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello == &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          &quot;hello&quot; == data.str_hello
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          x == Approx( 1.3 )
+        </Original>
+        <Expanded>
+          1.3 == Approx( 1.3 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/conditions/equality">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven == 6
+        </Original>
+        <Expanded>
+          7 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven == 8
+        </Original>
+        <Expanded>
+          7 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven == 0
+        </Original>
+        <Expanded>
+          7 == 0
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one == Approx( 9.11f )
+        </Original>
+        <Expanded>
+          9.1 == Approx( 9.11 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one == Approx( 9.0f )
+        </Original>
+        <Expanded>
+          9.1 == Approx( 9 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one == Approx( 1 )
+        </Original>
+        <Expanded>
+          9.1 == Approx( 1 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one == Approx( 0 )
+        </Original>
+        <Expanded>
+          9.1 == Approx( 0 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.double_pi == Approx( 3.1415 )
+        </Original>
+        <Expanded>
+          3.1415926535 == Approx( 3.1415 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello == &quot;goodbye&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;goodbye&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello == &quot;hell&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;hell&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello == &quot;hello1&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; == &quot;hello1&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello.size() == 6
+        </Original>
+        <Expanded>
+          5 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          x == Approx( 1.301 )
+        </Original>
+        <Expanded>
+          1.3 == Approx( 1.301 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/inequality">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven != 6
+        </Original>
+        <Expanded>
+          7 != 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven != 8
+        </Original>
+        <Expanded>
+          7 != 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one != Approx( 9.11f )
+        </Original>
+        <Expanded>
+          9.1 != Approx( 9.11 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one != Approx( 9.0f )
+        </Original>
+        <Expanded>
+          9.1 != Approx( 9 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one != Approx( 1 )
+        </Original>
+        <Expanded>
+          9.1 != Approx( 1 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one != Approx( 0 )
+        </Original>
+        <Expanded>
+          9.1 != Approx( 0 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.double_pi != Approx( 3.1415 )
+        </Original>
+        <Expanded>
+          3.1415926535 != Approx( 3.1415 )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello != &quot;goodbye&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; != &quot;goodbye&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello != &quot;hell&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; != &quot;hell&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello != &quot;hello1&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; != &quot;hello1&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello.size() != 6
+        </Original>
+        <Expanded>
+          5 != 6
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/conditions/inequality">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven != 7
+        </Original>
+        <Expanded>
+          7 != 7
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one != Approx( 9.1f )
+        </Original>
+        <Expanded>
+          9.1 != Approx( 9.1 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.double_pi != Approx( 3.1415926535 )
+        </Original>
+        <Expanded>
+          3.1415926535 != Approx( 3.14159 )
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello != &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; != &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello.size() != 5
+        </Original>
+        <Expanded>
+          5 != 5
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/ordered">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt; 8
+        </Original>
+        <Expanded>
+          7 &lt; 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven > 6
+        </Original>
+        <Expanded>
+          7 > 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven > 0
+        </Original>
+        <Expanded>
+          7 > 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven > -1
+        </Original>
+        <Expanded>
+          7 > -1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven >= 7
+        </Original>
+        <Expanded>
+          7 >= 7
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven >= 6
+        </Original>
+        <Expanded>
+          7 >= 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt;= 7
+        </Original>
+        <Expanded>
+          7 &lt;= 7
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt;= 8
+        </Original>
+        <Expanded>
+          7 &lt;= 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one > 9
+        </Original>
+        <Expanded>
+          9.1 > 9
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one &lt; 10
+        </Original>
+        <Expanded>
+          9.1 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one &lt; 9.2
+        </Original>
+        <Expanded>
+          9.1 &lt; 9.2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt;= &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt;= &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello >= &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; >= &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt; &quot;hellp&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt; &quot;hellp&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt; &quot;zebra&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt; &quot;zebra&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello > &quot;hellm&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; > &quot;hellm&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello > &quot;a&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; > &quot;a&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/conditions/ordered">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven > 7
+        </Original>
+        <Expanded>
+          7 > 7
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt; 7
+        </Original>
+        <Expanded>
+          7 &lt; 7
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven > 8
+        </Original>
+        <Expanded>
+          7 > 8
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt; 6
+        </Original>
+        <Expanded>
+          7 &lt; 6
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt; 0
+        </Original>
+        <Expanded>
+          7 &lt; 0
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt; -1
+        </Original>
+        <Expanded>
+          7 &lt; -1
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven >= 8
+        </Original>
+        <Expanded>
+          7 >= 8
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.int_seven &lt;= 6
+        </Original>
+        <Expanded>
+          7 &lt;= 6
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one &lt; 9
+        </Original>
+        <Expanded>
+          9.1 &lt; 9
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one > 10
+        </Original>
+        <Expanded>
+          9.1 > 10
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.float_nine_point_one > 9.2
+        </Original>
+        <Expanded>
+          9.1 > 9.2
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello > &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; > &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt; &quot;hello&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt; &quot;hello&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello > &quot;hellp&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; > &quot;hellp&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello > &quot;z&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; > &quot;z&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt; &quot;hellm&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt; &quot;hellm&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt; &quot;a&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt; &quot;a&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello >= &quot;z&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; >= &quot;z&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          data.str_hello &lt;= &quot;a&quot;
+        </Original>
+        <Expanded>
+          &quot;hello&quot; &lt;= &quot;a&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/int literals">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          i == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          ui == 2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          l == 3
+        </Original>
+        <Expanded>
+          3 == 3
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          ul == 4
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          c == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          uc == 6
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          1 == i
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          2 == ui
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          3 == l
+        </Original>
+        <Expanded>
+          3 == 3
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          4 == ul
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          5 == c
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          6 == uc
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          (std::numeric_limits&lt;unsigned long>::max)() > ul
+        </Original>
+        <Expanded>
+          0x<hex digits> > 4
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions//long_to_unsigned_x">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          long_var == unsigned_char_var
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          long_var == unsigned_short_var
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          long_var == unsigned_int_var
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          long_var == unsigned_long_var
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/const ints to int literal">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          unsigned_char_var == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          unsigned_short_var == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          unsigned_int_var == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          unsigned_long_var == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/negative ints">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          ( -1 > 2u )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          -1 > 2u
+        </Original>
+        <Expanded>
+          -1 > 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          ( 2u &lt; -1 )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          2u &lt; -1
+        </Original>
+        <Expanded>
+          2 &lt; -1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          ( minInt > 2u )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          minInt > 2u
+        </Original>
+        <Expanded>
+          -2147483648 > 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/computed ints">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          54 == 6*9
+        </Original>
+        <Expanded>
+          54 == 54
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/ptr">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          p == __null
+        </Original>
+        <Expanded>
+          __null == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          p == pNULL
+        </Original>
+        <Expanded>
+          __null == __null
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          p != __null
+        </Original>
+        <Expanded>
+          0x<hex digits> != 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          cp != __null
+        </Original>
+        <Expanded>
+          0x<hex digits> != 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          cpc != __null
+        </Original>
+        <Expanded>
+          0x<hex digits> != 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          returnsNull() == __null
+        </Original>
+        <Expanded>
+          {null string} == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          returnsConstNull() == __null
+        </Original>
+        <Expanded>
+          {null string} == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          __null != p
+        </Original>
+        <Expanded>
+          0 != 0x<hex digits>
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/conditions/not">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          false == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          true == true
+        </Original>
+        <Expanded>
+          true == true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !false
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !false
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !falseValue
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !falseValue
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !(1 == 2)
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !1 == 2
+        </Original>
+        <Expanded>
+          !(1 == 2)
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/conditions/not">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          false != false
+        </Original>
+        <Expanded>
+          false != false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          true != true
+        </Original>
+        <Expanded>
+          true != true
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !true
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !true
+        </Original>
+        <Expanded>
+          !true
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !trueValue
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !trueValue
+        </Original>
+        <Expanded>
+          !true
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !(1 == 1)
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp" >
+        <Original>
+          !1 == 1
+        </Original>
+        <Expanded>
+          !(1 == 1)
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/exceptions/explicit">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisThrows()
+        </Original>
+        <Expanded>
+          thisThrows()
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisDoesntThrow()
+        </Original>
+        <Expanded>
+          thisDoesntThrow()
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisThrows()
+        </Original>
+        <Expanded>
+          thisThrows()
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/explicit">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisThrows()
+        </Original>
+        <Expanded>
+          thisThrows()
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisDoesntThrow()
+        </Original>
+        <Expanded>
+          thisDoesntThrow()
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisThrows()
+        </Original>
+        <Expanded>
+          thisThrows()
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/implicit">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        unexpected exception
+      </Exception>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/implicit/2">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          1 == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          {Unknown expression after the reported line}
+        </Original>
+        <Expanded>
+          {Unknown expression after the reported line}
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          unexpected exception
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/implicit/3">
+      <Section name="section name">
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          unexpected exception
+        </Exception>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/implicit/4">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisThrows() == 0
+        </Original>
+        <Expanded>
+          thisThrows() == 0
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          expected exception
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/exceptions/implicit">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/custom">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        custom exception
+      </Exception>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/custom/nothrow">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          throwCustom()
+        </Original>
+        <Expanded>
+          throwCustom()
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          custom exception - not std
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/custom/throw">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          throwCustom()
+        </Original>
+        <Expanded>
+          throwCustom()
+        </Expanded>
+        <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+          custom exception - not std
+        </Exception>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/exceptions/custom/double">
+      <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        3.14
+      </Exception>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/exceptions/notimplemented">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
+        <Original>
+          thisFunctionNotImplemented( 7 )
+        </Original>
+        <Expanded>
+          thisFunctionNotImplemented( 7 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/generators/1">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          200 == 200
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          202 == 202
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          204 == 204
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          206 == 206
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          208 == 208
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          210 == 210
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          212 == 212
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          4 == 4
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          10 == 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          30 == 30
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          40 == 40
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          42 == 42
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( i, 2 ) == i*2
+        </Original>
+        <Expanded>
+          72 == 72
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          multiply( j, 2 ) == j*2
+        </Original>
+        <Expanded>
+          214 == 214
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/generators/2">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          i->first == i->second-1
+        </Original>
+        <Expanded>
+          0 == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp" >
+        <Original>
+          i->first == i->second-1
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/message">
+      <Info>
+        this is a message
+      </Info>
+      <Warning>
+        this is a warning
+      </Warning>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/succeed">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/message/info/1">
+      <Info>
+        this message should be logged
+      </Info>
+      <Info>
+        so should this
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          a == 1
+        </Original>
+        <Expanded>
+          2 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./mixed/message/info/2">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          a == 2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Info>
+        this message should be logged
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          a == 1
+        </Original>
+        <Expanded>
+          2 == 1
+        </Expanded>
+      </Expression>
+      <Info>
+        and this, but later
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          a == 0
+        </Original>
+        <Expanded>
+          2 == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          a == 2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/message/fail">
+      <Failure>
+        This is a failure
+      </Failure>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/message/sections">
+      <Section name="one">
+        <Failure>
+          Message from section one
+        </Failure>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="two">
+        <Failure>
+          Message from section two
+        </Failure>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/message/sections/stdout">
+      <Section name="one">
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="two">
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./mixed/message/scoped">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          0 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          1 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          2 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          3 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          4 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          5 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          6 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          7 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          8 &lt; 10
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          9 &lt; 10
+        </Expanded>
+      </Expression>
+      <Info>
+        current counter 10
+      </Info>
+      <Info>
+        i := 10
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          i &lt; 10
+        </Original>
+        <Expanded>
+          10 &lt; 10
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/nofail">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp" >
+        <Original>
+          1 == 2
+        </Original>
+        <Expanded>
+          1 == 2
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="just info">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="just failure">
+      <Failure>
+        Previous info should not be seen
+      </Failure>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/Misc/Sections">
+      <Section name="s1" description="doesn't equal">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            a != b
+          </Original>
+          <Expanded>
+            1 != 2
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            b != a
+          </Original>
+          <Expanded>
+            2 != 1
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="s2" description="not equal">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            a != b
+          </Original>
+          <Expanded>
+            1 != 2
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Misc/Sections/nested">
+      <Section name="s1" description="doesn't equal">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            a != b
+          </Original>
+          <Expanded>
+            1 != 2
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            b != a
+          </Original>
+          <Expanded>
+            2 != 1
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="s1" description="doesn't equal">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            a != b
+          </Original>
+          <Expanded>
+            1 != 2
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            b != a
+          </Original>
+          <Expanded>
+            2 != 1
+          </Expanded>
+        </Expression>
+        <Section name="s2" description="not equal">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a != b
+            </Original>
+            <Expanded>
+              1 != 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./mixed/Misc/Sections/nested2">
+      <Section name="s1" description="doesn't equal">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="s1" description="doesn't equal">
+        <Section name="s2" description="equal">
+          <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a == b
+            </Original>
+            <Expanded>
+              1 == 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="0" failures="1"/>
+        </Section>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="s1" description="doesn't equal">
+        <Section name="s3" description="not equal">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a != b
+            </Original>
+            <Expanded>
+              1 != 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="s1" description="doesn't equal">
+        <Section name="s4" description="less than">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              a &lt; b
+            </Original>
+            <Expanded>
+              1 &lt; 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./Sections/nested/a/b">
+      <Section name="c">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="c">
+        <Section name="d (leaf)">
+          <OverallResults successes="0" failures="1"/>
+        </Section>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="c">
+        <Section name="e (leaf)">
+          <OverallResults successes="0" failures="1"/>
+        </Section>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="f (leaf)">
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./mixed/Misc/Sections/loops">
+      <Section name="s1" description="b is currently: 0">
+        <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            b > a
+          </Original>
+          <Expanded>
+            0 > 1
+          </Expanded>
+        </Expression>
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./mixed/Misc/loops">
+      <Info>
+        Testing if fib[0] (1) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <Info>
+        Testing if fib[1] (1) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          0 == 0
+        </Expanded>
+      </Expression>
+      <Info>
+        Testing if fib[3] (3) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <Info>
+        Testing if fib[4] (5) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          0 == 0
+        </Expanded>
+      </Expression>
+      <Info>
+        Testing if fib[6] (13) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <Info>
+        Testing if fib[7] (21) is even
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          ( fib[i] % 2 ) == 0
+        </Original>
+        <Expanded>
+          1 == 0
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/Misc/stdout,stderr">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Misc/null strings">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          makeString( false ) != static_cast&lt;char*>(__null)
+        </Original>
+        <Expanded>
+          &quot;valid string&quot; != {null string}
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          makeString( true ) == static_cast&lt;char*>(__null)
+        </Original>
+        <Expanded>
+          {null string} == {null string}
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/info">
+      <Info>
+        hi
+      </Info>
+      <Info>
+        i := 7
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          false
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/checkedif">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          flag
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testCheckedIf( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/checkedif">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          flag
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testCheckedIf( false )
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/checkedelse">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          flag
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testCheckedElse( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/checkedelse">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          flag
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testCheckedElse( false )
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./misc/xmlentitycheck">
+      <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>">
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;">
+        <OverallResults successes="0" failures="1"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./manual/onechar">
+      <Info>
+        3
+      </Info>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          false
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/atomic if">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          x == 0
+        </Original>
+        <Expanded>
+          0 == 0
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/matchers">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() Contains( &quot;string&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; contains: &quot;string&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() Contains( &quot;abc&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; contains: &quot;abc&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() StartsWith( &quot;this&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; starts with: &quot;this&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() EndsWith( &quot;substring&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; ends with: &quot;substring&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/matchers/Contains">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() Contains( &quot;not there&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/matchers/StartsWith">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() StartsWith( &quot;string&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/matchers/EndsWith">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() EndsWith( &quot;this&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/matchers/Equals">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() Equals( &quot;something else&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="string">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          &quot;&quot; Equals(__null)
+        </Original>
+        <Expanded>
+          &quot;&quot; equals: &quot;&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/matchers/AllOf">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() AllOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;abc&quot; ) )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; and contains: &quot;abc&quot; )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/matchers/AnyOf">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() AnyOf( Catch::Contains( &quot;string&quot; ), Catch::Contains( &quot;not there&quot; ) )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;string&quot; or contains: &quot;not there&quot; )
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() AnyOf( Catch::Contains( &quot;not there&quot; ), Catch::Contains( &quot;string&quot; ) )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; ( contains: &quot;not there&quot; or contains: &quot;string&quot; )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/matchers/Equals">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching() Equals( &quot;this string contains 'abc' as a substring&quot; )
+        </Original>
+        <Expanded>
+          &quot;this string contains 'abc' as a substring&quot; equals: &quot;this string contains 'abc' as a substring&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Factorials are computed">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          Factorial(0) == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          Factorial(1) == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          Factorial(2) == 2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          Factorial(3) == 6
+        </Original>
+        <Expanded>
+          6 == 6
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          Factorial(10) == 3628800
+        </Original>
+        <Expanded>
+          0x<hex digits> == 3628800
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="empty">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Nice descriptive name">
+      <Warning>
+        This one ran
+      </Warning>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="first tag">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="second tag">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="vectors can be sized and resized">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing bigger changes size and capacity">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.size() == 10
+          </Original>
+          <Expanded>
+            10 == 10
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.capacity() >= 10
+          </Original>
+          <Expanded>
+            10 >= 10
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing smaller changes size but not capacity">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing smaller changes size but not capacity">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <Section name="We can use the 'swap trick' to reset the capacity">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+            <Original>
+              v.capacity() == 0
+            </Original>
+            <Expanded>
+              0 == 0
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="reserving bigger changes capacity but not size">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.size() == 5
+          </Original>
+          <Expanded>
+            5 == 5
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.capacity() >= 10
+          </Original>
+          <Expanded>
+            10 >= 10
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="reserving smaller does not change size or capacity">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.size() == 5
+          </Original>
+          <Expanded>
+            5 == 5
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/CatchSectionInfiniteLoop">
+      <Failure>
+        to infinity and beyond
+      </Failure>
+      <Section name="Outer">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Failure>
+        to infinity and beyond
+      </Failure>
+      <Section name="Outer">
+        <Section name="Inner">
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Failure>
+        to infinity and beyond
+      </Failure>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="selftest/main">
+      <Section name="selftest/expected result" description="Tests do what they claim">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="selftest/expected result" description="Tests do what they claim">
+        <Section name="selftest/expected result/failing tests" description="Tests in the 'failing' branch fail">
+          <OverallResults successes="28" failures="0"/>
+        </Section>
+        <OverallResults successes="28" failures="0"/>
+      </Section>
+      <Section name="selftest/expected result" description="Tests do what they claim">
+        <Section name="selftest/expected result/succeeding tests" description="Tests in the 'succeeding' branch succeed">
+          <OverallResults successes="46" failures="0"/>
+        </Section>
+        <OverallResults successes="46" failures="0"/>
+      </Section>
+      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
+        <Section name="selftest/test counts/succeeding tests" description="Number of 'succeeding' tests is fixed">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              totals.assertions.passed == 298
+            </Original>
+            <Expanded>
+              298 == 298
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              totals.assertions.failed == 0
+            </Original>
+            <Expanded>
+              0 == 0
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="selftest/test counts" description="Number of test cases that run is fixed">
+        <Section name="selftest/test counts/failing tests" description="Number of 'failing' tests is fixed">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              totals.assertions.passed == 2
+            </Original>
+            <Expanded>
+              2 == 2
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              totals.assertions.failed == 77
+            </Original>
+            <Expanded>
+              77 == 77
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="meta/Misc/Sections">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          totals.assertions.passed == 2
+        </Original>
+        <Expanded>
+          2 == 2
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          totals.assertions.failed == 1
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Process can be configured on command line">
+      <Section name="default - no arguments">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            parseIntoConfig( argv, config )
+          </Original>
+          <Expanded>
+            parseIntoConfig( argv, config )
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            config.shouldDebugBreak == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            config.abortAfter == -1
+          </Original>
+          <Expanded>
+            -1 == -1
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            config.noThrow == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            config.reporterName.empty()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="test lists">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="test lists">
+        <Section name="1 test" description="Specify one test case using">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters().size() == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="4" failures="0"/>
+        </Section>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <Section name="test lists">
+        <Section name="Specify one test case exclusion using exclude:">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters().size() == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="4" failures="0"/>
+        </Section>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <Section name="test lists">
+        <Section name="Specify one test case exclusion using ~">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters().size() == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="4" failures="0"/>
+        </Section>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <Section name="test lists">
+        <Section name="Specify two test cases using -t">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters().size() == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              cfg.filters()[0].shouldInclude( fakeTestCase( &quot;test2&quot; ) )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="5" failures="0"/>
+        </Section>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="reporter">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="reporter">
+        <Section name="-r/console">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.reporterName == &quot;console&quot;
+            </Original>
+            <Expanded>
+              &quot;console&quot; == &quot;console&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="reporter">
+        <Section name="-r/xml">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.reporterName == &quot;xml&quot;
+            </Original>
+            <Expanded>
+              &quot;xml&quot; == &quot;xml&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="reporter">
+        <Section name="--reporter/junit">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.reporterName == &quot;junit&quot;
+            </Original>
+            <Expanded>
+              &quot;junit&quot; == &quot;junit&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="debugger">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="debugger">
+        <Section name="-b">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.shouldDebugBreak == true
+            </Original>
+            <Expanded>
+              true == true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="debugger">
+        <Section name="--break">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.shouldDebugBreak
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="abort">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="abort">
+        <Section name="-a aborts after first failure">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.abortAfter == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="abort">
+        <Section name="-x 2 aborts after two failures">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.abortAfter == 2
+            </Original>
+            <Expanded>
+              2 == 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="abort">
+        <Section name="-x must be greater than zero">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
+            </Original>
+            <Expanded>
+              &quot;Value after -x or --abortAfter must be greater than zero
+- while parsing: (-x, --abortx &lt;number of failures>)&quot; contains: &quot;greater than zero&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="abort">
+        <Section name="-x must be numeric">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfigAndReturnError( argv, config ) Contains( &quot;-x&quot; )
+            </Original>
+            <Expanded>
+              &quot;Unable to convert oops to destination type
+- while parsing: (-x, --abortx &lt;number of failures>)&quot; contains: &quot;-x&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="nothrow">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="nothrow">
+        <Section name="-e">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.noThrow == true
+            </Original>
+            <Expanded>
+              true == true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="nothrow">
+        <Section name="--nothrow">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.noThrow == true
+            </Original>
+            <Expanded>
+              true == true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="output filename">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="output filename">
+        <Section name="-o filename">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.outputFilename == &quot;filename.ext&quot;
+            </Original>
+            <Expanded>
+              &quot;filename.ext&quot; == &quot;filename.ext&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="output filename">
+        <Section name="--out">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.outputFilename == &quot;filename.ext&quot;
+            </Original>
+            <Expanded>
+              &quot;filename.ext&quot; == &quot;filename.ext&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="combinations">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="combinations">
+        <Section name="Single character flags can be combined">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.abortAfter == 1
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.shouldDebugBreak
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.noThrow == true
+            </Original>
+            <Expanded>
+              true == true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="4" failures="0"/>
+        </Section>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="selftest/test filter">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchAny.shouldInclude( fakeTestCase( &quot;any&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchNone.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchNonHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchNonHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="selftest/test filters">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchHidden.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          filters.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          filters.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          filters.shouldInclude( fakeTestCase( &quot;./anything&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="selftest/filter/prefix wildcard">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="selftest/filter/wildcard at both ends">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;badgers are big&quot; ) )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          matchBadgers.shouldInclude( fakeTestCase( &quot;hedgehogs&quot; ) ) == false
+        </Original>
+        <Expanded>
+          false == false
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="selftest/tags">
+      <Section name="one tag">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.getTestCaseInfo().description == &quot;&quot;
+          </Original>
+          <Expanded>
+            &quot;&quot; == &quot;&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.hasTag( &quot;one&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.getTags().size() == 1
+          </Original>
+          <Expanded>
+            1 == 1
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( p1 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( p2 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( p3 ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( p4 ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( p5 ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="8" failures="0"/>
+      </Section>
+      <Section name="two tags">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.getTestCaseInfo().description == &quot;&quot;
+          </Original>
+          <Expanded>
+            &quot;&quot; == &quot;&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.hasTag( &quot;one&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.hasTag( &quot;two&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.hasTag( &quot;Two&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.hasTag( &quot;three&quot; ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.getTags().size() == 2
+          </Original>
+          <Expanded>
+            2 == 2
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.matchesTags( p1 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.matchesTags( p2 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.matchesTags( p3 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.matchesTags( p4 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            twoTags.matchesTags( p5 ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="11" failures="0"/>
+      </Section>
+      <Section name="complex">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            fakeTestCase( &quot;test&quot;, &quot;[one][.]&quot; ).matchesTags( p1 )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            !fakeTestCase( &quot;test&quot;, &quot;[one][.]&quot; ).matchesTags( p5 )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            fakeTestCase( &quot;test&quot;, &quot;[three]&quot; ).matchesTags( p4 )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            fakeTestCase( &quot;test&quot;, &quot;[three]&quot; ).matchesTags( p5 )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            fakeTestCase( &quot;test&quot;, &quot;[three]&quot; ).matchesTags( &quot;[three]~[one]&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            fakeTestCase( &quot;test&quot;, &quot;[unit][not_apple]&quot; ).matchesTags( &quot;[unit]&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            !fakeTestCase( &quot;test&quot;, &quot;[unit][not_apple]&quot; ).matchesTags( &quot;[unit]~[not_apple]&quot; )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="7" failures="0"/>
+      </Section>
+      <Section name="one tag with characters either side">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagWithExtras.getTestCaseInfo().description == &quot;1234&quot;
+          </Original>
+          <Expanded>
+            &quot;1234&quot; == &quot;1234&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagWithExtras.hasTag( &quot;one&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagWithExtras.hasTag( &quot;two&quot; ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagWithExtras.getTags().size() == 1
+          </Original>
+          <Expanded>
+            1 == 1
+          </Expanded>
+        </Expression>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <Section name="start of a tag, but not closed">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagOpen.getTestCaseInfo().description == &quot;[one&quot;
+          </Original>
+          <Expanded>
+            &quot;[one&quot; == &quot;[one&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagOpen.hasTag( &quot;one&quot; ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTagOpen.getTags().size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="hidden">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.getTestCaseInfo().description == &quot;&quot;
+          </Original>
+          <Expanded>
+            &quot;&quot; == &quot;&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.hasTag( &quot;.&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.isHidden()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            oneTag.matchesTags( &quot;~[.]&quot; ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="4" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Long strings can be wrapped">
+      <Section name="plain string">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="No wrapping">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
+            </Original>
+            <Expanded>
+              &quot;one two three four&quot;
+==
+&quot;one two three four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
+            </Original>
+            <Expanded>
+              &quot;one two three four&quot;
+==
+&quot;one two three four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="Wrapped once">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 17 ) ).toString() == &quot;one two three\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 16 ) ).toString() == &quot;one two three\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 14 ) ).toString() == &quot;one two three\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 13 ) ).toString() == &quot;one two three\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 12 ) ).toString() == &quot;one two\nthree four&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three four&quot;
+==
+&quot;one two
+three four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="5" failures="0"/>
+        </Section>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="Wrapped twice">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="3" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="Wrapped three times">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one
+two
+three
+four&quot;
+==
+&quot;one
+two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 5 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one
+two
+three
+four&quot;
+==
+&quot;one
+two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="Short wrap">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef&quot;
+            </Original>
+            <Expanded>
+              &quot;abc-
+def&quot;
+==
+&quot;abc-
+def&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdefg&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndefg&quot;
+            </Original>
+            <Expanded>
+              &quot;abc-
+defg&quot;
+==
+&quot;abc-
+defg&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdefgh&quot;, TextAttributes().setWidth( 4 ) ).toString() == &quot;abc-\ndef-\ngh&quot;
+            </Original>
+            <Expanded>
+              &quot;abc-
+def-
+gh&quot;
+==
+&quot;abc-
+def-
+gh&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 4 ) ).toString() == &quot;one\ntwo\nthr-\nee\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one
+two
+thr-
+ee
+four&quot;
+==
+&quot;one
+two
+thr-
+ee
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 3 ) ).toString() == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
+            </Original>
+            <Expanded>
+              &quot;one
+two
+th-
+ree
+fo-
+ur&quot;
+==
+&quot;one
+two
+th-
+ree
+fo-
+ur&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="5" failures="0"/>
+        </Section>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="As container">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text.size() == 4
+            </Original>
+            <Expanded>
+              4 == 4
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text[0] == &quot;one&quot;
+            </Original>
+            <Expanded>
+              &quot;one&quot; == &quot;one&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text[1] == &quot;two&quot;
+            </Original>
+            <Expanded>
+              &quot;two&quot; == &quot;two&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text[2] == &quot;three&quot;
+            </Original>
+            <Expanded>
+              &quot;three&quot; == &quot;three&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text[3] == &quot;four&quot;
+            </Original>
+            <Expanded>
+              &quot;four&quot; == &quot;four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="5" failures="0"/>
+        </Section>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="plain string">
+        <Section name="Indent first line differently">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              text.toString() == &quot; one two\n    three\n    four&quot;
+            </Original>
+            <Expanded>
+              &quot; one two
+    three
+    four&quot;
+==
+&quot; one two
+    three
+    four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="With newlines">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="With newlines">
+        <Section name="No wrapping">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString
+            </Original>
+            <Expanded>
+              &quot;one two
+three four&quot;
+==
+&quot;one two
+three four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString
+            </Original>
+            <Expanded>
+              &quot;one two
+three four&quot;
+==
+&quot;one two
+three four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString
+            </Original>
+            <Expanded>
+              &quot;one two
+three four&quot;
+==
+&quot;one two
+three four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="3" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="With newlines">
+        <Section name="Trailing newline">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 10 ) ).toString() == &quot;abcdef\n&quot;
+            </Original>
+            <Expanded>
+              &quot;abcdef
+&quot;
+==
+&quot;abcdef
+&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdef&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef&quot;
+            </Original>
+            <Expanded>
+              &quot;abcdef&quot; == &quot;abcdef&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( &quot;abcdef\n&quot;, TextAttributes().setWidth( 6 ) ).toString() == &quot;abcdef\n&quot;
+            </Original>
+            <Expanded>
+              &quot;abcdef
+&quot;
+==
+&quot;abcdef
+&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="3" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="With newlines">
+        <Section name="Wrapped once">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 9 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 8 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 7 ) ).toString() == &quot;one two\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="3" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="With newlines">
+        <Section name="Wrapped twice">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+            <Original>
+              Text( testString, TextAttributes().setWidth( 6 ) ).toString() == &quot;one\ntwo\nthree\nfour&quot;
+            </Original>
+            <Expanded>
+              &quot;one
+two
+three
+four&quot;
+==
+&quot;one
+two
+three
+four&quot;
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="With tabs">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+          <Original>
+            Text( testString, TextAttributes().setWidth( 15 ) ).toString() == &quot;one two three\n        four\n        five\n        six&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+        four
+        five
+        six&quot;
+==
+&quot;one two three
+        four
+        five
+        six&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Strings can be rendered with colour">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Text can be formatted using the Text class">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          Text( &quot;hi there&quot; ).toString() == &quot;hi there&quot;
+        </Original>
+        <Expanded>
+          &quot;hi there&quot; == &quot;hi there&quot;
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
+        <Original>
+          Text( &quot;hi there&quot;, narrow ).toString() == &quot;hi\nthere&quot;
+        </Original>
+        <Expanded>
+          &quot;hi
+there&quot;
+==
+&quot;hi
+there&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/Tricky/std::pair">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          (std::pair&lt;int, int>( 1, 2 )) == aNicePair
+        </Original>
+        <Expanded>
+          std::pair( 1, 2 ) == std::pair( 1, 2 )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./inprogress/failing/Tricky/trailing expression">
+      <Warning>
+        Uncomment the code in this test to check that it gives a sensible compiler error
+      </Warning>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./inprogress/failing/Tricky/compound lhs">
+      <Warning>
+        Uncomment the code in this test to check that it gives a sensible compiler error
+      </Warning>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./failing/Tricky/non streamable type">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          &amp;o1 == &amp;o2
+        </Original>
+        <Expanded>
+          0x<hex digits> == 0x<hex digits>
+        </Expanded>
+      </Expression>
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          o1 == o2
+        </Original>
+        <Expanded>
+          {?} == {?}
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./failing/string literals">
+      <Expression success="false" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          std::string( &quot;first&quot; ) == &quot;second&quot;
+        </Original>
+        <Expanded>
+          &quot;first&quot; == &quot;second&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="./succeeding/side-effects">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          i++ == 7
+        </Original>
+        <Expanded>
+          7 == 7
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          i++ == 8
+        </Original>
+        <Expanded>
+          8 == 8
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/koenig">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          0x<hex digits> == o
+        </Original>
+        <Expanded>
+          0x<hex digits> == {?}
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/non-const==">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          t == 1u
+        </Original>
+        <Expanded>
+          {?} == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/enum/bits">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          0x<hex digits> == bit30and31
+        </Original>
+        <Expanded>
+          0x<hex digits> == 3221225472
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/boolean member">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          obj.prop != __null
+        </Original>
+        <Expanded>
+          0x<hex digits> != 0
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/unimplemented static bool">
+      <Section name="compare to true">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;true>::value == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            true == is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="compare to false">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;false>::value == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            false == is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="negation">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="double negation">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !!is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="direct">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            is_true&lt;true>::value
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            !is_true&lt;false>::value
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="./succeeding/SafeBool">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          True
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          !False
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          !False
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Assertions then sections">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="A section">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            Catch::isTrue( true )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="A section">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            Catch::isTrue( true )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another section">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+            <Original>
+              Catch::isTrue( true )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          Catch::isTrue( true )
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Section name="A section">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+          <Original>
+            Catch::isTrue( true )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Section name="Another other section">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+            <Original>
+              Catch::isTrue( true )
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="non streamable - with conv. op">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          s == &quot;7&quot;
+        </Original>
+        <Expanded>
+          &quot;7&quot; == &quot;7&quot;
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Comparing function pointers">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          a
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          a == &amp;foo
+        </Original>
+        <Expanded>
+          1 == 1
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="pointer to class">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
+        <Original>
+          p == 0
+        </Original>
+        <Expanded>
+          __null == 0
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="X/level/0/a">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="X/level/0/b">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="X/level/1/a">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="X/level/1/b">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Anonymous test case 1">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Test case with one argument">
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Variadic macros">
+      <Section name="Section with one argument">
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Scenario: Do that thing with the thing">
+      <Section name="   Given: This stuff exists">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="   Given: This stuff exists">
+        <Section name="    When: I do this">
+          <OverallResults successes="0" failures="0"/>
+        </Section>
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="   Given: This stuff exists">
+        <Section name="    When: I do this">
+          <Section name="    Then: it should do this">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                itDoesThis()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <OverallResults successes="1" failures="0"/>
+          </Section>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="   Given: This stuff exists">
+        <Section name="    When: I do this">
+          <Section name="    Then: it should do this">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                itDoesThis()
+              </Original>
+              <Expanded>
+                true
+              </Expanded>
+            </Expression>
+            <Section name="     And: do that">
+              <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+                <Original>
+                  itDoesThat()
+                </Original>
+                <Expanded>
+                  true
+                </Expanded>
+              </Expression>
+              <OverallResults successes="1" failures="0"/>
+            </Section>
+            <OverallResults successes="2" failures="0"/>
+          </Section>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Scenario: Vector resizing affects size and capacity">
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: it is made larger">
+          <OverallResults successes="0" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: it is made larger">
+          <Section name="    Then: the size and capacity go up">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.size() == 10
+              </Original>
+              <Expanded>
+                10 == 10
+              </Expanded>
+            </Expression>
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.capacity() >= 10
+              </Original>
+              <Expanded>
+                10 >= 10
+              </Expanded>
+            </Expression>
+            <OverallResults successes="2" failures="0"/>
+          </Section>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: it is made larger">
+          <Section name="    Then: the size and capacity go up">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.size() == 10
+              </Original>
+              <Expanded>
+                10 == 10
+              </Expanded>
+            </Expression>
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.capacity() >= 10
+              </Original>
+              <Expanded>
+                10 >= 10
+              </Expanded>
+            </Expression>
+            <Section name="And when: it is made smaller again">
+              <OverallResults successes="0" failures="0"/>
+            </Section>
+            <OverallResults successes="2" failures="0"/>
+          </Section>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: it is made larger">
+          <Section name="    Then: the size and capacity go up">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.size() == 10
+              </Original>
+              <Expanded>
+                10 == 10
+              </Expanded>
+            </Expression>
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.capacity() >= 10
+              </Original>
+              <Expanded>
+                10 >= 10
+              </Expanded>
+            </Expression>
+            <Section name="And when: it is made smaller again">
+              <Section name="    Then: the size goes down but the capacity stays the same">
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+                  <Original>
+                    v.size() == 5
+                  </Original>
+                  <Expanded>
+                    5 == 5
+                  </Expanded>
+                </Expression>
+                <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+                  <Original>
+                    v.capacity() >= 10
+                  </Original>
+                  <Expanded>
+                    10 >= 10
+                  </Expanded>
+                </Expression>
+                <OverallResults successes="2" failures="0"/>
+              </Section>
+              <OverallResults successes="2" failures="0"/>
+            </Section>
+            <OverallResults successes="4" failures="0"/>
+          </Section>
+          <OverallResults successes="4" failures="0"/>
+        </Section>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: we reserve more space">
+          <OverallResults successes="0" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="   Given: an empty vector">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <Section name="    When: we reserve more space">
+          <Section name="    Then: The capacity is increased but the size remains the same">
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.capacity() >= 10
+              </Original>
+              <Expanded>
+                10 >= 10
+              </Expanded>
+            </Expression>
+            <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
+              <Original>
+                v.size() == 0
+              </Original>
+              <Expanded>
+                0 == 0
+              </Expanded>
+            </Expression>
+            <OverallResults successes="2" failures="0"/>
+          </Section>
+          <OverallResults successes="2" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping">
+      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
+        <Section name="    When: The test headers are printed as part of the normal running of the scenario">
+          <OverallResults successes="0" failures="0"/>
+        </Section>
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="   Given: A section name that is so long that it cannot fit in a single console width">
+        <Section name="    When: The test headers are printed as part of the normal running of the scenario">
+          <Section name="    Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent">
+            <OverallResults successes="1" failures="0"/>
+          </Section>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="cmdline">
+      <Section name="process name">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.processName == &quot;test&quot;
+          </Original>
+          <Expanded>
+            &quot;test&quot; == &quot;test&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="arg separated by spaces">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.fileName == &quot;filename.ext&quot;
+          </Original>
+          <Expanded>
+            &quot;filename.ext&quot; == &quot;filename.ext&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="arg separated by colon">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.fileName == &quot;filename.ext&quot;
+          </Original>
+          <Expanded>
+            &quot;filename.ext&quot; == &quot;filename.ext&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="arg separated by =">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.fileName == &quot;filename.ext&quot;
+          </Original>
+          <Expanded>
+            &quot;filename.ext&quot; == &quot;filename.ext&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="long opt">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.fileName == &quot;%stdout&quot;
+          </Original>
+          <Expanded>
+            &quot;%stdout&quot; == &quot;%stdout&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="a number">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.number == 42
+          </Original>
+          <Expanded>
+            42 == 42
+          </Expanded>
+        </Expression>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="not a number">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            parseInto( cli, argv, config )
+          </Original>
+          <Expanded>
+            parseInto( cli, argv, config )
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.number == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="two parsers">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config1.number == 42
+          </Original>
+          <Expanded>
+            42 == 42
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            !unusedTokens.empty()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config2.description == &quot;some text&quot;
+          </Original>
+          <Expanded>
+            &quot;some text&quot; == &quot;some text&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="methods">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="methods">
+        <Section name="in range">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+            <Original>
+              config.index == 3
+            </Original>
+            <Expanded>
+              3 == 3
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="methods">
+        <Section name="out of range">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+            <Original>
+              parseInto( cli, argv, config )
+            </Original>
+            <Expanded>
+              parseInto( cli, argv, config )
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="flags">
+        <OverallResults successes="0" failures="0"/>
+      </Section>
+      <Section name="flags">
+        <Section name="set">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+            <Original>
+              config.flag
+            </Original>
+            <Expanded>
+              true
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="flags">
+        <Section name="not set">
+          <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+            <Original>
+              config.flag == false
+            </Original>
+            <Expanded>
+              false == false
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0"/>
+      </Section>
+      <Section name="positional">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.firstPos == &quot;1st&quot;
+          </Original>
+          <Expanded>
+            &quot;1st&quot; == &quot;1st&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.secondPos == &quot;2nd&quot;
+          </Original>
+          <Expanded>
+            &quot;2nd&quot; == &quot;2nd&quot;
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            config.unpositional == &quot;3rd&quot;
+          </Original>
+          <Expanded>
+            &quot;3rd&quot; == &quot;3rd&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="section tracking">
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Original>
+          !testCaseTracker.isCompleted()
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Original>
+          !testCaseTracker.isCompleted()
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Section name="test case with no sections">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Original>
+          !testCaseTracker.isCompleted()
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Section name="test case with one section">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Original>
+          !testCaseTracker.isCompleted()
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Section name="test case with two consecutive sections">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section2Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section2Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section2Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="9" failures="0"/>
+      </Section>
+      <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+        <Original>
+          !testCaseTracker.isCompleted()
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+      <Section name="test case with one section within another">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.enterSection( section2Name )
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            !testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            !false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section1Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.enterSection( section2Name )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
+          <Original>
+            testCaseTracker.isCompleted()
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="8" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
+    <OverallResults successes="654" failures="109"/>
+  </Group>
+  <OverallResults successes="654" failures="109"/>
+</Catch>
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index 6ee07fb7..dc2684ed 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -86,7 +86,7 @@ std::string parseIntoConfigAndReturnError( const char * (&argv)[size], Catch::Co
     return "";
 }
 
-inline Catch::TestCase fakeTestCase( const char* name ){ return Catch::makeTestCase( NULL, "", name, "", CATCH_INTERNAL_LINEINFO ); }
+inline Catch::TestCase fakeTestCase( const char* name, const char* desc = "" ){ return Catch::makeTestCase( NULL, "", name, desc, CATCH_INTERNAL_LINEINFO ); }
 
 TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
 
@@ -298,7 +298,7 @@ int getArgc( const char * (&)[size] ) {
     return size;
 }
 
-TEST_CASE( "selftest/tags", "" ) {
+TEST_CASE( "selftest/tags", "[tags]" ) {
 
     std::string p1 = "[one]";
     std::string p2 = "[one],[two]";
@@ -306,7 +306,7 @@ TEST_CASE( "selftest/tags", "" ) {
     std::string p4 = "[one][two],[three]";
     std::string p5 = "[one][two]~[.],[three]";
     
-    SECTION( "one tag", "" ) {
+    SECTION( "single [one] tag", "" ) {
         Catch::TestCase oneTag = makeTestCase( NULL, "", "test", "[one]", CATCH_INTERNAL_LINEINFO );
 
         CHECK( oneTag.getTestCaseInfo().description == "" );
@@ -320,6 +320,20 @@ TEST_CASE( "selftest/tags", "" ) {
         CHECK( oneTag.matchesTags( p5 ) == false );
     }
 
+    SECTION( "single [two] tag", "" ) {
+        Catch::TestCase oneTag = makeTestCase( NULL, "", "test", "[two]", CATCH_INTERNAL_LINEINFO );
+
+        CHECK( oneTag.getTestCaseInfo().description == "" );
+        CHECK( oneTag.hasTag( "two" ) );
+        CHECK( oneTag.getTags().size() == 1 );
+
+        CHECK( oneTag.matchesTags( p1 ) == false );
+        CHECK( oneTag.matchesTags( p2 ) == true );
+        CHECK( oneTag.matchesTags( p3 ) == false );
+        CHECK( oneTag.matchesTags( p4 ) == false );
+        CHECK( oneTag.matchesTags( p5 ) == false );
+    }
+
     SECTION( "two tags", "" ) {
         Catch::TestCase twoTags= makeTestCase( NULL, "", "test", "[one][two]", CATCH_INTERNAL_LINEINFO );
 
@@ -336,6 +350,15 @@ TEST_CASE( "selftest/tags", "" ) {
         CHECK( twoTags.matchesTags( p4 ) == true );
         CHECK( twoTags.matchesTags( p5 ) == true );
     }
+    SECTION( "complex", "" ) {
+        CHECK( fakeTestCase( "test", "[one][.]" ).matchesTags( p1 ) );
+        CHECK_FALSE( fakeTestCase( "test", "[one][.]" ).matchesTags( p5 ) );
+        CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p4 ) );
+        CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p5 ) );
+        CHECK( fakeTestCase( "test", "[three]" ).matchesTags( "[three]~[one]" ) );
+        CHECK( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]" ) );
+        CHECK_FALSE( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]~[not_apple]" ) );
+    }
 
     SECTION( "one tag with characters either side", "" ) {
 
@@ -558,3 +581,15 @@ TEST_CASE( "Text can be formatted using the Text class", "" ) {
     
     CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" );
 }
+
+TEST_CASE( "Long text is truncted", "[Text][Truncated]" ) {
+
+    std::string longLine( 90, '*' );
+
+    std::ostringstream oss;
+    for(int i = 0; i < 600; ++i )
+        oss << longLine << longLine << "\n";
+    Text t( oss.str() );
+    CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) );
+    
+}
diff --git a/projects/SelfTest/makefile b/projects/SelfTest/makefile
new file mode 100644
index 00000000..e5dec0dc
--- /dev/null
+++ b/projects/SelfTest/makefile
@@ -0,0 +1,21 @@
+SOURCES =	ApproxTests.cpp \
+			ClassTests.cpp \
+			ConditionTests.cpp \
+      		ExceptionTests.cpp \
+      		GeneratorTests.cpp \
+      		MessageTests.cpp \
+      		MiscTests.cpp \
+      		TestMain.cpp \
+      		TrickyTests.cpp \
+      		BDDTests.cpp \
+      		VariadicMacrosTests.cpp \
+      		catch_self_test.cpp
+OBJECTS    = $(patsubst %.cpp, %.o, $(SOURCES))
+CXX = g++
+CXXFLAGS  = -I../../include
+
+CatchSelfTest: $(OBJECTS)
+	$(CXX) -o $@ $^
+
+clean:
+	rm -f $(OBJECTS)
diff --git a/projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj b/projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj
index bf3bdf59..f140739c 100644
--- a/projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj
+++ b/projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj
@@ -1,149 +1,154 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}</ProjectGuid>
-    <RootNamespace>TestCatch</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\SelfTest\TestMain.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\catch_self_test.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\ClassTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\ConditionTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\ExceptionTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\GeneratorTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\MessageTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\MiscTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\TrickyTests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\catch.hpp" />
-    <ClInclude Include="..\..\..\..\include\catch_objc.hpp" />
-    <ClInclude Include="..\..\..\..\include\catch_objc_main.hpp" />
-    <ClInclude Include="..\..\..\..\include\catch_runner.hpp" />
-    <ClInclude Include="..\..\..\..\include\catch_with_main.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_capture.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_commandline.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_common.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_config.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_debugger.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_evaluate.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_exception_translator_registry.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_generators.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_generators_impl.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_hub.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_hub_impl.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_capture.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_exception.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_reporter.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_runner.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_testcase.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_list.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_reporter_registrars.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_reporter_registry.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_result_type.h" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_resultinfo.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_runner_impl.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_section.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_self_test.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_stream.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_test_case_info.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_test_case_registry_impl.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_test_registry.hpp" />
-    <ClInclude Include="..\..\..\..\include\internal\catch_xmlwriter.hpp" />
-    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_basic.hpp" />
-    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_junit.hpp" />
-    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_xml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}</ProjectGuid>
+    <RootNamespace>TestCatch</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\SelfTest\ApproxTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\BDDTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\CmdLineTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\SectionTrackerTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\TestMain.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\catch_self_test.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\ClassTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\ConditionTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\ExceptionTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\GeneratorTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\MessageTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\MiscTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\TrickyTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\VariadicMacrosTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\catch.hpp" />
+    <ClInclude Include="..\..\..\..\include\catch_objc.hpp" />
+    <ClInclude Include="..\..\..\..\include\catch_objc_main.hpp" />
+    <ClInclude Include="..\..\..\..\include\catch_runner.hpp" />
+    <ClInclude Include="..\..\..\..\include\catch_with_main.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_capture.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_commandline.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_common.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_config.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_debugger.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_evaluate.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_exception_translator_registry.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_generators.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_generators_impl.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_hub.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_hub_impl.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_capture.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_exception.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_reporter.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_runner.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_interfaces_testcase.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_list.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_reporter_registrars.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_reporter_registry.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_result_type.h" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_resultinfo.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_runner_impl.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_section.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_self_test.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_stream.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_test_case_info.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_test_case_registry_impl.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_test_registry.hpp" />
+    <ClInclude Include="..\..\..\..\include\internal\catch_xmlwriter.hpp" />
+    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_basic.hpp" />
+    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_junit.hpp" />
+    <ClInclude Include="..\..\..\..\include\reporters\catch_reporter_xml.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/XCode3/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode3/CatchSelfTest.xcodeproj/project.pbxproj
deleted file mode 100644
index ac8f2095..00000000
--- a/projects/XCode3/CatchSelfTest.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,440 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		4A060CEC1362030B00BBA8F8 /* TestMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE41362030B00BBA8F8 /* TestMain.cpp */; };
-		4A060CED1362030B00BBA8F8 /* TrickyTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE51362030B00BBA8F8 /* TrickyTests.cpp */; };
-		4A060CEE1362030B00BBA8F8 /* ExceptionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE61362030B00BBA8F8 /* ExceptionTests.cpp */; };
-		4A060CEF1362030B00BBA8F8 /* ClassTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE71362030B00BBA8F8 /* ClassTests.cpp */; };
-		4A060CF01362030B00BBA8F8 /* MiscTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE81362030B00BBA8F8 /* MiscTests.cpp */; };
-		4A060CF11362030B00BBA8F8 /* ConditionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CE91362030B00BBA8F8 /* ConditionTests.cpp */; };
-		4A060CF21362030B00BBA8F8 /* MessageTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CEA1362030B00BBA8F8 /* MessageTests.cpp */; };
-		4A060CF31362030B00BBA8F8 /* GeneratorTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A060CEB1362030B00BBA8F8 /* GeneratorTests.cpp */; };
-		4A1A232913694D53002FDDE0 /* ApproxTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A1A232813694D53002FDDE0 /* ApproxTests.cpp */; };
-		8DD76F6A0486A84900D96B5E /* Test.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* Test.1 */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		8DD76F690486A84900D96B5E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-				8DD76F6A0486A84900D96B5E /* Test.1 in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		4A060CE41362030B00BBA8F8 /* TestMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestMain.cpp; path = ../SelfTest/TestMain.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CE51362030B00BBA8F8 /* TrickyTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TrickyTests.cpp; path = ../SelfTest/TrickyTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CE61362030B00BBA8F8 /* ExceptionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExceptionTests.cpp; path = ../SelfTest/ExceptionTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CE71362030B00BBA8F8 /* ClassTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClassTests.cpp; path = ../SelfTest/ClassTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CE81362030B00BBA8F8 /* MiscTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MiscTests.cpp; path = ../SelfTest/MiscTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CE91362030B00BBA8F8 /* ConditionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConditionTests.cpp; path = ../SelfTest/ConditionTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CEA1362030B00BBA8F8 /* MessageTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MessageTests.cpp; path = ../SelfTest/MessageTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CEB1362030B00BBA8F8 /* GeneratorTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeneratorTests.cpp; path = ../SelfTest/GeneratorTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A060CF41362033300BBA8F8 /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../../include/catch.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CF51362033300BBA8F8 /* catch_runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner.hpp; path = ../../include/catch_runner.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CF61362033300BBA8F8 /* catch_with_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_with_main.hpp; path = ../../include/catch_with_main.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CF71362036F00BBA8F8 /* catch_reporter_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_xml.hpp; path = ../../include/reporters/catch_reporter_xml.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CF81362036F00BBA8F8 /* catch_reporter_basic.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_basic.hpp; path = ../../include/reporters/catch_reporter_basic.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CF91362036F00BBA8F8 /* catch_reporter_junit.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_junit.hpp; path = ../../include/reporters/catch_reporter_junit.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CFA1362038F00BBA8F8 /* catch_exception_translator_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_exception_translator_registry.hpp; path = ../../include/internal/catch_exception_translator_registry.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CFB1362038F00BBA8F8 /* catch_interfaces_exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_interfaces_exception.h; path = ../../include/internal/catch_interfaces_exception.h; sourceTree = SOURCE_ROOT; };
-		4A060CFC136203B800BBA8F8 /* catch_section.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_section.hpp; path = ../../include/internal/catch_section.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CFD136203B800BBA8F8 /* catch_runner_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner_impl.hpp; path = ../../include/internal/catch_runner_impl.hpp; sourceTree = SOURCE_ROOT; };
-		4A060CFE136203B800BBA8F8 /* catch_interfaces_capture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_interfaces_capture.h; path = ../../include/internal/catch_interfaces_capture.h; sourceTree = SOURCE_ROOT; };
-		4A060CFF136203B800BBA8F8 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_test_case_info.hpp; path = ../../include/internal/catch_test_case_info.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D00136203B800BBA8F8 /* catch_test_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_test_registry.hpp; path = ../../include/internal/catch_test_registry.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D01136203B800BBA8F8 /* catch_test_case_registry_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_test_case_registry_impl.hpp; path = ../../include/internal/catch_test_case_registry_impl.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D02136203B800BBA8F8 /* catch_capture.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_capture.hpp; path = ../../include/internal/catch_capture.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D03136203B800BBA8F8 /* catch_hub_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_hub_impl.hpp; path = ../../include/internal/catch_hub_impl.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D04136203B800BBA8F8 /* catch_hub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_hub.h; path = ../../include/internal/catch_hub.h; sourceTree = SOURCE_ROOT; };
-		4A060D05136203B800BBA8F8 /* catch_interfaces_reporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_interfaces_reporter.h; path = ../../include/internal/catch_interfaces_reporter.h; sourceTree = SOURCE_ROOT; };
-		4A060D06136203B800BBA8F8 /* catch_commandline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_commandline.hpp; path = ../../include/internal/catch_commandline.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D07136203B800BBA8F8 /* catch_config.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_config.hpp; path = ../../include/internal/catch_config.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D09136203B800BBA8F8 /* catch_resultinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_resultinfo.hpp; path = ../../include/internal/catch_resultinfo.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D0A136203B800BBA8F8 /* catch_result_type.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_result_type.h; path = ../../include/internal/catch_result_type.h; sourceTree = SOURCE_ROOT; };
-		4A060D0B136203B800BBA8F8 /* catch_interfaces_testcase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_interfaces_testcase.h; path = ../../include/internal/catch_interfaces_testcase.h; sourceTree = SOURCE_ROOT; };
-		4A060D0C136203B800BBA8F8 /* catch_interfaces_runner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_interfaces_runner.h; path = ../../include/internal/catch_interfaces_runner.h; sourceTree = SOURCE_ROOT; };
-		4A060D0D136203B800BBA8F8 /* catch_generators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_generators.hpp; path = ../../include/internal/catch_generators.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D0E136203B800BBA8F8 /* catch_evaluate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_evaluate.hpp; path = ../../include/internal/catch_evaluate.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D0F136203B800BBA8F8 /* catch_debugger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_debugger.hpp; path = ../../include/internal/catch_debugger.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D10136203B800BBA8F8 /* catch_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = catch_common.h; path = ../../include/internal/catch_common.h; sourceTree = SOURCE_ROOT; };
-		4A060D11136203B800BBA8F8 /* catch_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_stream.hpp; path = ../../include/internal/catch_stream.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D12136203B800BBA8F8 /* catch_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_list.hpp; path = ../../include/internal/catch_list.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D13136203B800BBA8F8 /* catch_reporter_registry.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_registry.hpp; path = ../../include/internal/catch_reporter_registry.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D14136203B800BBA8F8 /* catch_reporter_registrars.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_registrars.hpp; path = ../../include/internal/catch_reporter_registrars.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D15136203B800BBA8F8 /* catch_xmlwriter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_xmlwriter.hpp; path = ../../include/internal/catch_xmlwriter.hpp; sourceTree = SOURCE_ROOT; };
-		4A060D16136203B800BBA8F8 /* catch_generators_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_generators_impl.hpp; path = ../../include/internal/catch_generators_impl.hpp; sourceTree = SOURCE_ROOT; };
-		4A1A22AF136946E0002FDDE0 /* catch_approx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_approx.hpp; path = ../../include/internal/catch_approx.hpp; sourceTree = SOURCE_ROOT; };
-		4A1A232813694D53002FDDE0 /* ApproxTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ApproxTests.cpp; path = ../SelfTest/ApproxTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A27F2A813864BA6007B4B4E /* catch_default_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_default_main.hpp; path = ../../include/internal/catch_default_main.hpp; sourceTree = SOURCE_ROOT; };
-		4A29343D138B8FC900C99100 /* catch_self_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_self_test.hpp; path = ../SelfTest/catch_self_test.hpp; sourceTree = SOURCE_ROOT; };
-		8DD76F6C0486A84900D96B5E /* Test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Test; sourceTree = BUILT_PRODUCTS_DIR; };
-		C6859E8B029090EE04C91782 /* Test.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = Test.1; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8DD76F660486A84900D96B5E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* Test */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				C6859E8C029090F304C91782 /* Documentation */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-			);
-			name = Test;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				4A060CE41362030B00BBA8F8 /* TestMain.cpp */,
-				4AA7E96C129FA2A0005A0B97 /* Tests */,
-				4AFC341312809A12003A0C29 /* Catch */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8DD76F6C0486A84900D96B5E /* Test */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		4A13FF92135EBED500EC5928 /* Exceptions */ = {
-			isa = PBXGroup;
-			children = (
-				4A060CFA1362038F00BBA8F8 /* catch_exception_translator_registry.hpp */,
-				4A060CFB1362038F00BBA8F8 /* catch_interfaces_exception.h */,
-			);
-			name = Exceptions;
-			sourceTree = "<group>";
-		};
-		4A302E3712D515B700C84B67 /* TestCase registration */ = {
-			isa = PBXGroup;
-			children = (
-				4A060CFC136203B800BBA8F8 /* catch_section.hpp */,
-				4A060D02136203B800BBA8F8 /* catch_capture.hpp */,
-				4A060CFF136203B800BBA8F8 /* catch_test_case_info.hpp */,
-				4A060D00136203B800BBA8F8 /* catch_test_registry.hpp */,
-				4A060D0B136203B800BBA8F8 /* catch_interfaces_testcase.h */,
-				4A060CFE136203B800BBA8F8 /* catch_interfaces_capture.h */,
-				4A060D0A136203B800BBA8F8 /* catch_result_type.h */,
-			);
-			name = "TestCase registration";
-			sourceTree = "<group>";
-		};
-		4A302E3812D515DF00C84B67 /* Running & Results */ = {
-			isa = PBXGroup;
-			children = (
-				4A060D07136203B800BBA8F8 /* catch_config.hpp */,
-				4A060D09136203B800BBA8F8 /* catch_resultinfo.hpp */,
-				4A060CFD136203B800BBA8F8 /* catch_runner_impl.hpp */,
-				4A060D0C136203B800BBA8F8 /* catch_interfaces_runner.h */,
-				4A060D0D136203B800BBA8F8 /* catch_generators.hpp */,
-				4A1A22AF136946E0002FDDE0 /* catch_approx.hpp */,
-				4A27F2A813864BA6007B4B4E /* catch_default_main.hpp */,
-			);
-			name = "Running & Results";
-			sourceTree = "<group>";
-		};
-		4A302E3912D5160400C84B67 /* Hub-Impl */ = {
-			isa = PBXGroup;
-			children = (
-				4A060D01136203B800BBA8F8 /* catch_test_case_registry_impl.hpp */,
-				4A060D04136203B800BBA8F8 /* catch_hub.h */,
-				4A060D03136203B800BBA8F8 /* catch_hub_impl.hpp */,
-				4A060D16136203B800BBA8F8 /* catch_generators_impl.hpp */,
-			);
-			name = "Hub-Impl";
-			sourceTree = "<group>";
-		};
-		4A33BE0C12CE93380052A211 /* reporting */ = {
-			isa = PBXGroup;
-			children = (
-				4A060D12136203B800BBA8F8 /* catch_list.hpp */,
-				4A060D13136203B800BBA8F8 /* catch_reporter_registry.hpp */,
-				4A060D14136203B800BBA8F8 /* catch_reporter_registrars.hpp */,
-				4A060D05136203B800BBA8F8 /* catch_interfaces_reporter.h */,
-			);
-			name = reporting;
-			sourceTree = "<group>";
-		};
-		4A33BE0F12CE936C0052A211 /* support */ = {
-			isa = PBXGroup;
-			children = (
-				4A060D06136203B800BBA8F8 /* catch_commandline.hpp */,
-				4A060D0F136203B800BBA8F8 /* catch_debugger.hpp */,
-				4A060D10136203B800BBA8F8 /* catch_common.h */,
-				4A060D15136203B800BBA8F8 /* catch_xmlwriter.hpp */,
-				4A060D11136203B800BBA8F8 /* catch_stream.hpp */,
-				4A060D0E136203B800BBA8F8 /* catch_evaluate.hpp */,
-			);
-			name = support;
-			sourceTree = "<group>";
-		};
-		4AA7E96B129FA282005A0B97 /* Reporters */ = {
-			isa = PBXGroup;
-			children = (
-				4A060CF71362036F00BBA8F8 /* catch_reporter_xml.hpp */,
-				4A060CF81362036F00BBA8F8 /* catch_reporter_basic.hpp */,
-				4A060CF91362036F00BBA8F8 /* catch_reporter_junit.hpp */,
-			);
-			name = Reporters;
-			sourceTree = "<group>";
-		};
-		4AA7E96C129FA2A0005A0B97 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				4A060CE51362030B00BBA8F8 /* TrickyTests.cpp */,
-				4A060CE61362030B00BBA8F8 /* ExceptionTests.cpp */,
-				4A060CE71362030B00BBA8F8 /* ClassTests.cpp */,
-				4A060CE81362030B00BBA8F8 /* MiscTests.cpp */,
-				4A060CE91362030B00BBA8F8 /* ConditionTests.cpp */,
-				4A060CEA1362030B00BBA8F8 /* MessageTests.cpp */,
-				4A060CEB1362030B00BBA8F8 /* GeneratorTests.cpp */,
-				4A1A232813694D53002FDDE0 /* ApproxTests.cpp */,
-			);
-			name = Tests;
-			sourceTree = "<group>";
-		};
-		4AFC341312809A12003A0C29 /* Catch */ = {
-			isa = PBXGroup;
-			children = (
-				4A29343D138B8FC900C99100 /* catch_self_test.hpp */,
-				4A060CF41362033300BBA8F8 /* catch.hpp */,
-				4A060CF51362033300BBA8F8 /* catch_runner.hpp */,
-				4A060CF61362033300BBA8F8 /* catch_with_main.hpp */,
-				4AA7E96B129FA282005A0B97 /* Reporters */,
-				4AFC341412809A1B003A0C29 /* Internal */,
-			);
-			name = Catch;
-			sourceTree = "<group>";
-		};
-		4AFC341412809A1B003A0C29 /* Internal */ = {
-			isa = PBXGroup;
-			children = (
-				4A13FF92135EBED500EC5928 /* Exceptions */,
-				4A302E3912D5160400C84B67 /* Hub-Impl */,
-				4A302E3812D515DF00C84B67 /* Running & Results */,
-				4A302E3712D515B700C84B67 /* TestCase registration */,
-				4A33BE0F12CE936C0052A211 /* support */,
-				4A33BE0C12CE93380052A211 /* reporting */,
-			);
-			name = Internal;
-			sourceTree = "<group>";
-		};
-		C6859E8C029090F304C91782 /* Documentation */ = {
-			isa = PBXGroup;
-			children = (
-				C6859E8B029090EE04C91782 /* Test.1 */,
-			);
-			name = Documentation;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8DD76F620486A84900D96B5E /* Test */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "Test" */;
-			buildPhases = (
-				8DD76F640486A84900D96B5E /* Sources */,
-				8DD76F660486A84900D96B5E /* Frameworks */,
-				8DD76F690486A84900D96B5E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Test;
-			productInstallPath = "$(HOME)/bin";
-			productName = Test;
-			productReference = 8DD76F6C0486A84900D96B5E /* Test */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "CatchSelfTest" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 08FB7794FE84155DC02AAC07 /* Test */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8DD76F620486A84900D96B5E /* Test */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8DD76F640486A84900D96B5E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4A060CEC1362030B00BBA8F8 /* TestMain.cpp in Sources */,
-				4A060CED1362030B00BBA8F8 /* TrickyTests.cpp in Sources */,
-				4A060CEE1362030B00BBA8F8 /* ExceptionTests.cpp in Sources */,
-				4A060CEF1362030B00BBA8F8 /* ClassTests.cpp in Sources */,
-				4A060CF01362030B00BBA8F8 /* MiscTests.cpp in Sources */,
-				4A060CF11362030B00BBA8F8 /* ConditionTests.cpp in Sources */,
-				4A060CF21362030B00BBA8F8 /* MessageTests.cpp in Sources */,
-				4A060CF31362030B00BBA8F8 /* GeneratorTests.cpp in Sources */,
-				4A1A232913694D53002FDDE0 /* ApproxTests.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB923208733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = Test;
-			};
-			name = Debug;
-		};
-		1DEB923308733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = Test;
-			};
-			name = Release;
-		};
-		1DEB923608733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = NO;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_PEDANTIC = YES;
-				GCC_WARN_PROTOTYPE_CONVERSION = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_STRICT_SELECTOR_MATCH = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-				USER_HEADER_SEARCH_PATHS = ../../include;
-				WARNING_CFLAGS = (
-					"-Winit-self",
-					"-Wswitch-enum",
-					"-Wunused",
-					"-Wredundant-decls",
-				);
-			};
-			name = Debug;
-		};
-		1DEB923708733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-				USER_HEADER_SEARCH_PATHS = ../../include;
-				WARNING_CFLAGS = (
-					"-Winit-self",
-					"-Wswitch-enum",
-					"-Wunused",
-					"-Wredundant-decls",
-				);
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "Test" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923208733DC60010E9CD /* Debug */,
-				1DEB923308733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "CatchSelfTest" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923608733DC60010E9CD /* Debug */,
-				1DEB923708733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/projects/XCode3/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/projects/XCode3/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 87cc241f..00000000
--- a/projects/XCode3/CatchSelfTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:Test.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
deleted file mode 100644
index b3461dc1..00000000
--- a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "1"
-   version = "1.0">
-   <FileBreakpoints>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "0"
-         filePath = "/TwoBlueCubes/Dev/GitHub/Catch/catch_reporter_junit.hpp"
-         timestampString = "322167915.384904"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "155"
-         endingLineNumber = "155">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "0"
-         filePath = "/TwoBlueCubes/Dev/GitHub/Catch/catch_reporter_junit.hpp"
-         timestampString = "322167915.384942"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "199"
-         endingLineNumber = "199">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "0"
-         filePath = "/TwoBlueCubes/Dev/GitHub/Catch/internal/catch_commandline.hpp"
-         timestampString = "322167915.384952"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "167"
-         endingLineNumber = "167">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "0"
-         filePath = "/TwoBlueCubes/Dev/GitHub/Catch/catch_reporter_basic.hpp"
-         timestampString = "322167915.384982"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "213"
-         endingLineNumber = "213">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "1"
-         filePath = "ConditionTests.cpp"
-         timestampString = "322167915.893464"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "229"
-         endingLineNumber = "229">
-      </FileBreakpoint>
-      <FileBreakpoint
-         shouldBeEnabled = "Yes"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         isPathRelative = "0"
-         filePath = "/TwoBlueCubes/Dev/GitHub/Catch/internal/catch_hub_impl.hpp"
-         timestampString = "322421671.367839"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "82"
-         endingLineNumber = "82"
-         landmarkName = "Hub::createStreamBuf ( const std::string&amp; streamName )"
-         landmarkType = "5">
-      </FileBreakpoint>
-   </FileBreakpoints>
-</Bucket>
diff --git a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/Test.xcscheme b/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/Test.xcscheme
deleted file mode 100644
index a5cb42b4..00000000
--- a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/Test.xcscheme
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8DD76F620486A84900D96B5E"
-               BuildableName = "Test"
-               BlueprintName = "Test"
-               ReferencedContainer = "container:Test.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8DD76F620486A84900D96B5E"
-            BuildableName = "Test"
-            BlueprintName = "Test"
-            ReferencedContainer = "container:Test.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "-t ./inprogress/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-r junit"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-r xml"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t ./succeeding/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-s"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t explore/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-o %debug"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t &quot;./succeeding/conditions/unsigned-negative&quot;"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t &quot;./failing/conditions/unsigned-negative&quot;"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t &quot;investigation/neg comp&quot;"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t meta/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-b"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-l"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t example/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t ./failing/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t ./inprogress/succeeding/side-effects"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-h"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t &quot;./failing/string literals&quot;"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-t ./succeeding/generators/*"
-            isEnabled = "NO">
-         </CommandLineArgument>
-      </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      displayScaleIsEnabled = "NO"
-      displayScale = "1.00"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8DD76F620486A84900D96B5E"
-            BuildableName = "Test"
-            BlueprintName = "Test"
-            ReferencedContainer = "container:Test.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/xcschememanagement.plist b/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 0d2068c4..00000000
--- a/projects/XCode3/CatchSelfTest.xcodeproj/xcuserdata/phil.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Test.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>8DD76F620486A84900D96B5E</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.1 b/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.1
deleted file mode 100644
index 9b8cdce5..00000000
--- a/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"Modified from man(1) of FreeBSD, the NetBSD mdoc.template, and mdoc.samples.
-.\"See Also:
-.\"man mdoc.samples for a complete listing of options
-.\"man mdoc for the short list of editing options
-.\"/usr/share/misc/mdoc.template
-.Dd 24/05/2011               \" DATE 
-.Dt CatchSelfTestSingle 1      \" Program name and manual section number 
-.Os Darwin
-.Sh NAME                 \" Section Header - required - don't modify 
-.Nm CatchSelfTestSingle,
-.\" The following lines are read in generating the apropos(man -k) database. Use only key
-.\" words here as the database is built based on the words here and in the .ND line. 
-.Nm Other_name_for_same_program(),
-.Nm Yet another name for the same program.
-.\" Use .Nm macro to designate other names for the documented program.
-.Nd This line parsed for whatis database.
-.Sh SYNOPSIS             \" Section Header - required - don't modify
-.Nm
-.Op Fl abcd              \" [-abcd]
-.Op Fl a Ar path         \" [-a path] 
-.Op Ar file              \" [file]
-.Op Ar                   \" [file ...]
-.Ar arg0                 \" Underlined argument - use .Ar anywhere to underline
-arg2 ...                 \" Arguments
-.Sh DESCRIPTION          \" Section Header - required - don't modify
-Use the .Nm macro to refer to your program throughout the man page like such:
-.Nm
-Underlining is accomplished with the .Ar macro like this:
-.Ar underlined text .
-.Pp                      \" Inserts a space
-A list of items with descriptions:
-.Bl -tag -width -indent  \" Begins a tagged list 
-.It item a               \" Each item preceded by .It macro
-Description of item a
-.It item b
-Description of item b
-.El                      \" Ends the list
-.Pp
-A list of flags and their descriptions:
-.Bl -tag -width -indent  \" Differs from above in tag removed 
-.It Fl a                 \"-a flag as a list item
-Description of -a flag
-.It Fl b
-Description of -b flag
-.El                      \" Ends the list
-.Pp
-.\" .Sh ENVIRONMENT      \" May not be needed
-.\" .Bl -tag -width "ENV_VAR_1" -indent \" ENV_VAR_1 is width of the string ENV_VAR_1
-.\" .It Ev ENV_VAR_1
-.\" Description of ENV_VAR_1
-.\" .It Ev ENV_VAR_2
-.\" Description of ENV_VAR_2
-.\" .El                      
-.Sh FILES                \" File used or created by the topic of the man page
-.Bl -tag -width "/Users/joeuser/Library/really_long_file_name" -compact
-.It Pa /usr/share/file_name
-FILE_1 description
-.It Pa /Users/joeuser/Library/really_long_file_name
-FILE_2 description
-.El                      \" Ends the list
-.\" .Sh DIAGNOSTICS       \" May not be needed
-.\" .Bl -diag
-.\" .It Diagnostic Tag
-.\" Diagnostic informtion here.
-.\" .It Diagnostic Tag
-.\" Diagnostic informtion here.
-.\" .El
-.Sh SEE ALSO 
-.\" List links in ascending order by section, alphabetically within a section.
-.\" Please do not reference files that do not exist without filing a bug report
-.Xr a 1 , 
-.Xr b 1 ,
-.Xr c 1 ,
-.Xr a 2 ,
-.Xr b 2 ,
-.Xr a 3 ,
-.Xr b 3 
-.\" .Sh BUGS              \" Document known, unremedied bugs 
-.\" .Sh HISTORY           \" Document history if command behaves in a unique manner 
\ No newline at end of file
diff --git a/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.xcodeproj/project.pbxproj b/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.xcodeproj/project.pbxproj
deleted file mode 100644
index eb912e3a..00000000
--- a/projects/XCode3/CatchSelfTestSingle/CatchSelfTestSingle.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,246 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		4A29349A138B924800C99100 /* MessageTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293490138B924800C99100 /* MessageTests.cpp */; };
-		4A29349B138B924800C99100 /* ConditionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293491138B924800C99100 /* ConditionTests.cpp */; };
-		4A29349C138B924800C99100 /* TestMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293492138B924800C99100 /* TestMain.cpp */; };
-		4A29349D138B924800C99100 /* ApproxTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293494138B924800C99100 /* ApproxTests.cpp */; };
-		4A29349E138B924800C99100 /* TrickyTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293495138B924800C99100 /* TrickyTests.cpp */; };
-		4A29349F138B924800C99100 /* GeneratorTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293496138B924800C99100 /* GeneratorTests.cpp */; };
-		4A2934A0138B924800C99100 /* MiscTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293497138B924800C99100 /* MiscTests.cpp */; };
-		4A2934A1138B924800C99100 /* ClassTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293498138B924800C99100 /* ClassTests.cpp */; };
-		4A2934A2138B924800C99100 /* ExceptionTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A293499138B924800C99100 /* ExceptionTests.cpp */; };
-		8DD76F6A0486A84900D96B5E /* CatchSelfTestSingle.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* CatchSelfTestSingle.1 */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		8DD76F690486A84900D96B5E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-				8DD76F6A0486A84900D96B5E /* CatchSelfTestSingle.1 in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		4A293490138B924800C99100 /* MessageTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MessageTests.cpp; path = ../../SelfTest/MessageTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293491138B924800C99100 /* ConditionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConditionTests.cpp; path = ../../SelfTest/ConditionTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293492138B924800C99100 /* TestMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TestMain.cpp; path = ../../SelfTest/TestMain.cpp; sourceTree = SOURCE_ROOT; };
-		4A293493138B924800C99100 /* catch_self_test.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_self_test.hpp; path = ../../SelfTest/catch_self_test.hpp; sourceTree = SOURCE_ROOT; };
-		4A293494138B924800C99100 /* ApproxTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ApproxTests.cpp; path = ../../SelfTest/ApproxTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293495138B924800C99100 /* TrickyTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TrickyTests.cpp; path = ../../SelfTest/TrickyTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293496138B924800C99100 /* GeneratorTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeneratorTests.cpp; path = ../../SelfTest/GeneratorTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293497138B924800C99100 /* MiscTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MiscTests.cpp; path = ../../SelfTest/MiscTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293498138B924800C99100 /* ClassTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClassTests.cpp; path = ../../SelfTest/ClassTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A293499138B924800C99100 /* ExceptionTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExceptionTests.cpp; path = ../../SelfTest/ExceptionTests.cpp; sourceTree = SOURCE_ROOT; };
-		4A2934A5138B925A00C99100 /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../../../single_include/catch.hpp; sourceTree = SOURCE_ROOT; };
-		8DD76F6C0486A84900D96B5E /* CatchSelfTestSingle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CatchSelfTestSingle; sourceTree = BUILT_PRODUCTS_DIR; };
-		C6859E8B029090EE04C91782 /* CatchSelfTestSingle.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = CatchSelfTestSingle.1; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8DD76F660486A84900D96B5E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* CatchSelfTestSingle */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				C6859E8C029090F304C91782 /* Documentation */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-			);
-			name = CatchSelfTestSingle;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				4A2934A5138B925A00C99100 /* catch.hpp */,
-				4A293490138B924800C99100 /* MessageTests.cpp */,
-				4A293491138B924800C99100 /* ConditionTests.cpp */,
-				4A293492138B924800C99100 /* TestMain.cpp */,
-				4A293493138B924800C99100 /* catch_self_test.hpp */,
-				4A293494138B924800C99100 /* ApproxTests.cpp */,
-				4A293495138B924800C99100 /* TrickyTests.cpp */,
-				4A293496138B924800C99100 /* GeneratorTests.cpp */,
-				4A293497138B924800C99100 /* MiscTests.cpp */,
-				4A293498138B924800C99100 /* ClassTests.cpp */,
-				4A293499138B924800C99100 /* ExceptionTests.cpp */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8DD76F6C0486A84900D96B5E /* CatchSelfTestSingle */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		C6859E8C029090F304C91782 /* Documentation */ = {
-			isa = PBXGroup;
-			children = (
-				C6859E8B029090EE04C91782 /* CatchSelfTestSingle.1 */,
-			);
-			name = Documentation;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8DD76F620486A84900D96B5E /* CatchSelfTestSingle */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "CatchSelfTestSingle" */;
-			buildPhases = (
-				8DD76F640486A84900D96B5E /* Sources */,
-				8DD76F660486A84900D96B5E /* Frameworks */,
-				8DD76F690486A84900D96B5E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = CatchSelfTestSingle;
-			productInstallPath = "$(HOME)/bin";
-			productName = CatchSelfTestSingle;
-			productReference = 8DD76F6C0486A84900D96B5E /* CatchSelfTestSingle */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "CatchSelfTestSingle" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 08FB7794FE84155DC02AAC07 /* CatchSelfTestSingle */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8DD76F620486A84900D96B5E /* CatchSelfTestSingle */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8DD76F640486A84900D96B5E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4A29349A138B924800C99100 /* MessageTests.cpp in Sources */,
-				4A29349B138B924800C99100 /* ConditionTests.cpp in Sources */,
-				4A29349C138B924800C99100 /* TestMain.cpp in Sources */,
-				4A29349D138B924800C99100 /* ApproxTests.cpp in Sources */,
-				4A29349E138B924800C99100 /* TrickyTests.cpp in Sources */,
-				4A29349F138B924800C99100 /* GeneratorTests.cpp in Sources */,
-				4A2934A0138B924800C99100 /* MiscTests.cpp in Sources */,
-				4A2934A1138B924800C99100 /* ClassTests.cpp in Sources */,
-				4A2934A2138B924800C99100 /* ExceptionTests.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB923208733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = CatchSelfTestSingle;
-			};
-			name = Debug;
-		};
-		1DEB923308733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = CatchSelfTestSingle;
-			};
-			name = Release;
-		};
-		1DEB923608733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-			};
-			name = Debug;
-		};
-		1DEB923708733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "CatchSelfTestSingle" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923208733DC60010E9CD /* Debug */,
-				1DEB923308733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "CatchSelfTestSingle" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923608733DC60010E9CD /* Debug */,
-				1DEB923708733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/projects/XCode3/OCTest/CatchOCTestCase.h b/projects/XCode3/OCTest/CatchOCTestCase.h
deleted file mode 100644
index bd26239a..00000000
--- a/projects/XCode3/OCTest/CatchOCTestCase.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  CatchOCTestCase.h
-//  OCTest
-//
-//  Created by Phil on 13/11/2010.
-//  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED
-#define TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED
-
-#include "catch.hpp"
-
-#import <Cocoa/Cocoa.h>
-#import "TestObj.h"
-
-@interface TestFixture : NSObject <OcFixture>
-{
-    TestObj* obj;
-}
-
-@end
-
-#endif // TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED
diff --git a/projects/XCode3/OCTest/CatchOCTestCase.mm b/projects/XCode3/OCTest/CatchOCTestCase.mm
deleted file mode 100644
index b07bf712..00000000
--- a/projects/XCode3/OCTest/CatchOCTestCase.mm
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  CatchOCTestCase.mm
-//  OCTest
-//
-//  Created by Phil Nash on 13/11/2010.
-//  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#import "CatchOCTestCase.h"
-
-
-@implementation TestFixture
-
-
--(void) setUp
-{
-    obj = [[TestObj alloc] init];    
-}
-
--(void) tearDown
-{
-    [obj release];
-}
-
-OC_TEST_CASE( "OCTest/test1", "This is a test case" )
-{
-    REQUIRE( obj.int_val == 0 );
-    
-    obj.int_val = 1;
-    
-    REQUIRE( obj.int_val == 1 );
-}
-
-OC_TEST_CASE( "OCTest/test2", "This is another test case" )
-{
-    REQUIRE( obj.int_val == 0 );
-    
-    obj.int_val = 2;
-    
-    REQUIRE( obj.int_val == 2 );
-}
-
-@end
diff --git a/projects/XCode3/OCTest/Main.mm b/projects/XCode3/OCTest/Main.mm
deleted file mode 100644
index e74b71dc..00000000
--- a/projects/XCode3/OCTest/Main.mm
+++ /dev/null
@@ -1 +0,0 @@
-#import "catch_with_main.hpp"
diff --git a/projects/XCode3/OCTest/OCTest.1 b/projects/XCode3/OCTest/OCTest.1
deleted file mode 100644
index ff72db79..00000000
--- a/projects/XCode3/OCTest/OCTest.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"Modified from man(1) of FreeBSD, the NetBSD mdoc.template, and mdoc.samples.
-.\"See Also:
-.\"man mdoc.samples for a complete listing of options
-.\"man mdoc for the short list of editing options
-.\"/usr/share/misc/mdoc.template
-.Dd 13/11/2010               \" DATE 
-.Dt OCTest 1      \" Program name and manual section number 
-.Os Darwin
-.Sh NAME                 \" Section Header - required - don't modify 
-.Nm OCTest,
-.\" The following lines are read in generating the apropos(man -k) database. Use only key
-.\" words here as the database is built based on the words here and in the .ND line. 
-.Nm Other_name_for_same_program(),
-.Nm Yet another name for the same program.
-.\" Use .Nm macro to designate other names for the documented program.
-.Nd This line parsed for whatis database.
-.Sh SYNOPSIS             \" Section Header - required - don't modify
-.Nm
-.Op Fl abcd              \" [-abcd]
-.Op Fl a Ar path         \" [-a path] 
-.Op Ar file              \" [file]
-.Op Ar                   \" [file ...]
-.Ar arg0                 \" Underlined argument - use .Ar anywhere to underline
-arg2 ...                 \" Arguments
-.Sh DESCRIPTION          \" Section Header - required - don't modify
-Use the .Nm macro to refer to your program throughout the man page like such:
-.Nm
-Underlining is accomplished with the .Ar macro like this:
-.Ar underlined text .
-.Pp                      \" Inserts a space
-A list of items with descriptions:
-.Bl -tag -width -indent  \" Begins a tagged list 
-.It item a               \" Each item preceded by .It macro
-Description of item a
-.It item b
-Description of item b
-.El                      \" Ends the list
-.Pp
-A list of flags and their descriptions:
-.Bl -tag -width -indent  \" Differs from above in tag removed 
-.It Fl a                 \"-a flag as a list item
-Description of -a flag
-.It Fl b
-Description of -b flag
-.El                      \" Ends the list
-.Pp
-.\" .Sh ENVIRONMENT      \" May not be needed
-.\" .Bl -tag -width "ENV_VAR_1" -indent \" ENV_VAR_1 is width of the string ENV_VAR_1
-.\" .It Ev ENV_VAR_1
-.\" Description of ENV_VAR_1
-.\" .It Ev ENV_VAR_2
-.\" Description of ENV_VAR_2
-.\" .El                      
-.Sh FILES                \" File used or created by the topic of the man page
-.Bl -tag -width "/Users/joeuser/Library/really_long_file_name" -compact
-.It Pa /usr/share/file_name
-FILE_1 description
-.It Pa /Users/joeuser/Library/really_long_file_name
-FILE_2 description
-.El                      \" Ends the list
-.\" .Sh DIAGNOSTICS       \" May not be needed
-.\" .Bl -diag
-.\" .It Diagnostic Tag
-.\" Diagnostic informtion here.
-.\" .It Diagnostic Tag
-.\" Diagnostic informtion here.
-.\" .El
-.Sh SEE ALSO 
-.\" List links in ascending order by section, alphabetically within a section.
-.\" Please do not reference files that do not exist without filing a bug report
-.Xr a 1 , 
-.Xr b 1 ,
-.Xr c 1 ,
-.Xr a 2 ,
-.Xr b 2 ,
-.Xr a 3 ,
-.Xr b 3 
-.\" .Sh BUGS              \" Document known, unremedied bugs 
-.\" .Sh HISTORY           \" Document history if command behaves in a unique manner
\ No newline at end of file
diff --git a/projects/XCode3/OCTest/OCTest.mm b/projects/XCode3/OCTest/OCTest.mm
deleted file mode 100644
index 12b789eb..00000000
--- a/projects/XCode3/OCTest/OCTest.mm
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  OCTest.mm
- *  OCTest
- *
- *  Created by Phil on 13/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-#import "catch.hpp"
-
-#import "TestObj.h"
-
-TEST_CASE( "OCTest/TestObj", "tests TestObj" )
-{
-    TestObj* obj = [[TestObj alloc] init];
-    
-    REQUIRE( obj.int_val == 0 );
-    
-    obj.int_val = 1;
-    
-    REQUIRE( obj.int_val == 1 );
-    
-    [obj release];
-}
diff --git a/projects/XCode3/OCTest/OCTest.xcodeproj/project.pbxproj b/projects/XCode3/OCTest/OCTest.xcodeproj/project.pbxproj
deleted file mode 100644
index afed59e0..00000000
--- a/projects/XCode3/OCTest/OCTest.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,259 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		4A5953B5128E95B8009DC1B9 /* TestObj.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5953B4128E95B8009DC1B9 /* TestObj.m */; };
-		4A5953B7128E95D6009DC1B9 /* OCTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A5953B6128E95D6009DC1B9 /* OCTest.mm */; };
-		4A5953F1128E9A61009DC1B9 /* CatchOCTestCase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A5953F0128E9A61009DC1B9 /* CatchOCTestCase.mm */; };
-		8DD76F9A0486AA7600D96B5E /* Main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* Main.mm */; settings = {ATTRIBUTES = (); }; };
-		8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
-		8DD76F9F0486AA7600D96B5E /* OCTest.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859EA3029092ED04C91782 /* OCTest.1 */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		8DD76F9E0486AA7600D96B5E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-				8DD76F9F0486AA7600D96B5E /* OCTest.1 in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		08FB7796FE84155DC02AAC07 /* Main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Main.mm; sourceTree = "<group>"; };
-		08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		32A70AAB03705E1F00C91783 /* OCTest_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCTest_Prefix.pch; sourceTree = "<group>"; };
-		4A5953B3128E95B8009DC1B9 /* TestObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestObj.h; sourceTree = "<group>"; };
-		4A5953B4128E95B8009DC1B9 /* TestObj.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestObj.m; sourceTree = "<group>"; };
-		4A5953B6128E95D6009DC1B9 /* OCTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OCTest.mm; sourceTree = "<group>"; };
-		4A5953EF128E9A61009DC1B9 /* CatchOCTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CatchOCTestCase.h; sourceTree = "<group>"; };
-		4A5953F0128E9A61009DC1B9 /* CatchOCTestCase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CatchOCTestCase.mm; sourceTree = "<group>"; };
-		4A97DB2813673E3100C8087C /* catch_objc.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_objc.hpp; path = ../../../include/internal/catch_objc.hpp; sourceTree = SOURCE_ROOT; };
-		4A97DB2B13673E4700C8087C /* catch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch.hpp; path = ../../../include/catch.hpp; sourceTree = SOURCE_ROOT; };
-		4A97DB3613673EA300C8087C /* catch_with_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_with_main.hpp; path = ../../../include/catch_with_main.hpp; sourceTree = SOURCE_ROOT; };
-		8DD76FA10486AA7600D96B5E /* OCTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = OCTest; sourceTree = BUILT_PRODUCTS_DIR; };
-		C6859EA3029092ED04C91782 /* OCTest.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = OCTest.1; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8DD76F9B0486AA7600D96B5E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* OCTest */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				C6859EA2029092E104C91782 /* Documentation */,
-				08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-			);
-			name = OCTest;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				4AFDF58212CA9E2800F15202 /* Catch */,
-				32A70AAB03705E1F00C91783 /* OCTest_Prefix.pch */,
-				08FB7796FE84155DC02AAC07 /* Main.mm */,
-				4A5953B3128E95B8009DC1B9 /* TestObj.h */,
-				4A5953B4128E95B8009DC1B9 /* TestObj.m */,
-				4A5953B6128E95D6009DC1B9 /* OCTest.mm */,
-				4A5953EF128E9A61009DC1B9 /* CatchOCTestCase.h */,
-				4A5953F0128E9A61009DC1B9 /* CatchOCTestCase.mm */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				08FB779EFE84155DC02AAC07 /* Foundation.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8DD76FA10486AA7600D96B5E /* OCTest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		4AFDF58212CA9E2800F15202 /* Catch */ = {
-			isa = PBXGroup;
-			children = (
-				4A97DB3613673EA300C8087C /* catch_with_main.hpp */,
-				4A97DB2B13673E4700C8087C /* catch.hpp */,
-				4A97DB2813673E3100C8087C /* catch_objc.hpp */,
-			);
-			name = Catch;
-			sourceTree = "<group>";
-		};
-		C6859EA2029092E104C91782 /* Documentation */ = {
-			isa = PBXGroup;
-			children = (
-				C6859EA3029092ED04C91782 /* OCTest.1 */,
-			);
-			name = Documentation;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8DD76F960486AA7600D96B5E /* OCTest */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "OCTest" */;
-			buildPhases = (
-				8DD76F990486AA7600D96B5E /* Sources */,
-				8DD76F9B0486AA7600D96B5E /* Frameworks */,
-				8DD76F9E0486AA7600D96B5E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = OCTest;
-			productInstallPath = "$(HOME)/bin";
-			productName = OCTest;
-			productReference = 8DD76FA10486AA7600D96B5E /* OCTest */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "OCTest" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 08FB7794FE84155DC02AAC07 /* OCTest */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8DD76F960486AA7600D96B5E /* OCTest */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8DD76F990486AA7600D96B5E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8DD76F9A0486AA7600D96B5E /* Main.mm in Sources */,
-				4A5953B5128E95B8009DC1B9 /* TestObj.m in Sources */,
-				4A5953B7128E95D6009DC1B9 /* OCTest.mm in Sources */,
-				4A5953F1128E9A61009DC1B9 /* CatchOCTestCase.mm in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB927508733DD40010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCTest_Prefix.pch;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = OCTest;
-			};
-			name = Debug;
-		};
-		1DEB927608733DD40010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCTest_Prefix.pch;
-				INSTALL_PATH = /usr/local/bin;
-				PRODUCT_NAME = OCTest;
-			};
-			name = Release;
-		};
-		1DEB927908733DD40010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-				USER_HEADER_SEARCH_PATHS = ../../../include;
-			};
-			name = Debug;
-		};
-		1DEB927A08733DD40010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-				USER_HEADER_SEARCH_PATHS = ../../../include;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "OCTest" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB927508733DD40010E9CD /* Debug */,
-				1DEB927608733DD40010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "OCTest" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB927908733DD40010E9CD /* Debug */,
-				1DEB927A08733DD40010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/projects/XCode3/OCTest/OCTest_Prefix.pch b/projects/XCode3/OCTest/OCTest_Prefix.pch
deleted file mode 100644
index a89ea59c..00000000
--- a/projects/XCode3/OCTest/OCTest_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'OCTest' target in the 'OCTest' project.
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif
diff --git a/projects/XCode3/OCTest/TestObj.h b/projects/XCode3/OCTest/TestObj.h
deleted file mode 100644
index c39aaa03..00000000
--- a/projects/XCode3/OCTest/TestObj.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TestObj.h
-//  OCTest
-//
-//  Created by Phil on 13/11/2010.
-//  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef TWOBLUECUBES_TESTOBJ_H_INCLUDED
-#define TWOBLUECUBES_TESTOBJ_H_INCLUDED
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface TestObj : NSObject {
-
-    int int_val;
-}
-
-@property (nonatomic, assign ) int int_val;
-
-@end
-
-#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED
diff --git a/projects/XCode3/OCTest/TestObj.m b/projects/XCode3/OCTest/TestObj.m
deleted file mode 100644
index 943f4450..00000000
--- a/projects/XCode3/OCTest/TestObj.m
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  TestObj.m
-//  OCTest
-//
-//  Created by Phil on 13/11/2010.
-//  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#import "TestObj.h"
-
-
-@implementation TestObj
-
-@synthesize int_val;
-
-@end
diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
index c6403046..16b0a4af 100644
--- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
+++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
@@ -466,7 +466,7 @@
 		4A6D0C17149B3D3B00DB3EAA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 			};
 			buildConfigurationList = 4A6D0C1A149B3D3B00DB3EAA /* Build configuration list for PBXProject "CatchSelfTest" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -532,10 +532,10 @@
 		4A6D0C28149B3D3B00DB3EAA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CXX0X_EXTENSIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -565,6 +565,7 @@
 				GCC_WARN_PEDANTIC = YES;
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
@@ -580,10 +581,10 @@
 		4A6D0C29149B3D3B00DB3EAA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CXX0X_EXTENSIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -607,6 +608,7 @@
 				GCC_WARN_PEDANTIC = YES;
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index 4dd4e97f..f39553dd 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -5,40 +5,36 @@ import re
 
 from scriptCommon import catchPath
 
-filenameParser = re.compile( r'\s*.*/(.*\..pp):([0-9]*)(.*)' )
+rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
+
+filenameParser = re.compile( r'.*/(.*\..pp:)(.*)' )
+filelineParser = re.compile( r'(.*\..pp:)([0-9]*)(.*)' )
 lineNumberParser = re.compile( r'(.*)line="[0-9]*"(.*)' )
 hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
 durationsParser = re.compile( r'(.*)time="[0-9]*\.[0-9]*"(.*)' )
-
-#catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
-
-baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedResults.txt' )
-rawResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/_rawResults.tmp' )
-filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/unapprovedResults.txt' )
+versionParser = re.compile( r'(.*?)Catch v[0-9]*.[0-9]* b[0-9]*(.*)' )
 
 if len(sys.argv) == 2:
 	cmdPath = sys.argv[1]
 else:
 	cmdPath = os.path.join( catchPath, 'projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest' )
 
-f = open( rawResultsPath, 'w' )
-subprocess.call([ cmdPath, "~dummy", "-r", "console" ], stdout=f, stderr=f )
-subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console" ], stdout=f, stderr=f )
-subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console", "-a", "4" ], stdout=f, stderr=f )
-subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "junit" ], stdout=f, stderr=f )
-subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "xml" ], stdout=f, stderr=f )
-f.close()
+overallResult = 0
 
-rawFile = open( rawResultsPath, 'r' )
-filteredFile = open( filteredResultsPath, 'w' )
-for line in rawFile:
+def filterLine( line ):
 	m = filenameParser.match( line )
 	if m:
-		line = m.group(1) + m.group(3)
+		line = m.group(1) + m.group(2)
+		m = filelineParser.match( line )
+		if m:
+			line = m.group(1) + "<line number>" + m.group(3)
 	else:
 		m = lineNumberParser.match( line )
 		if m:
 			line = m.group(1) + m.group(2)
+	m = versionParser.match( line )
+	if m:
+		line = m.group(1) + "<version>" + m.group(2)
 
 	while True:
 		m = hexParser.match( line )
@@ -49,18 +45,55 @@ for line in rawFile:
 	m = durationsParser.match( line )
 	if m:
 		line = m.group(1) + 'time="{duration}"' + m.group(2)
+	return line
 
-	filteredFile.write( line.rstrip() + "\n" )
-filteredFile.close()
-rawFile.close()
+def approve( baseName, args ):
+	global overallResult
+	args[0:0] = [cmdPath]
+	baselinesPath = os.path.join( rootPath, '{0}.approved.txt'.format( baseName ) )
+	rawResultsPath = os.path.join( rootPath, '_{0}.tmp'.format( baseName ) )
+	filteredResultsPath = os.path.join( rootPath, '{0}.unapproved.txt'.format( baseName ) )
 
-os.remove( rawResultsPath )
-print
-diffResult = subprocess.call([ "diff", baselinesPath, filteredResultsPath ] )
-if diffResult == 0:
-	os.remove( filteredResultsPath )
-	print "\033[92mResults matched"
-else:
-	print "\n****************************\n\033[91mResults differed"
-print "\033[0m"
-exit( diffResult)
\ No newline at end of file
+	f = open( rawResultsPath, 'w' )
+	subprocess.call( args, stdout=f, stderr=f )
+	f.close()
+
+	rawFile = open( rawResultsPath, 'r' )
+	filteredFile = open( filteredResultsPath, 'w' )
+	for line in rawFile:
+		filteredFile.write( filterLine( line ).rstrip() + "\n" )
+	filteredFile.close()
+	rawFile.close()
+
+	os.remove( rawResultsPath )
+	print
+	print baseName + ":"
+	if os.path.exists( baselinesPath ):
+		diffResult = subprocess.call([ "diff", baselinesPath, filteredResultsPath ] )
+		if diffResult == 0:
+			os.remove( filteredResultsPath )
+			print "  \033[92mResults matched"
+		else:
+			print "  \n****************************\n  \033[91mResults differed"
+			if diffResult > overallResult:
+				overallResult = diffResult
+		print "\033[0m"
+	else:
+		print "  first approval"
+		if overallResult == 0:
+			overallResult = 1
+
+# Standard console reporter
+approve( "console.std", ["~_"] )
+# console reporter, include passes, warn about No Assertions
+approve( "console.sw", ["~_", "-s", "-w", "NoAssertions"] )
+# console reporter, include passes, warn about No Assertions, limit failures to first 4
+approve( "console.swa4", ["~_", "-s", "-w", "NoAssertions", "-x", "4"] )
+# junit reporter, include passes, warn about No Assertions
+approve( "junit.sw", ["~_", "-s", "-w", "NoAssertions", "-r", "junit"] )
+# xml reporter, include passes, warn about No Assertions
+approve( "xml.sw", ["~_", "-s", "-w", "NoAssertions", "-r", "xml"] )
+
+if overallResult <> 0:
+	print "run approve.py to approve new baselines"
+exit( overallResult)
\ No newline at end of file
diff --git a/scripts/approve.py b/scripts/approve.py
index 9302ae56..7801b546 100644
--- a/scripts/approve.py
+++ b/scripts/approve.py
@@ -1,14 +1,29 @@
 import os
 import sys
 import shutil
-
+import glob
 from scriptCommon import catchPath
 
-baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedResults.txt' )
-filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/unapprovedResults.txt' )
+rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
 
-if os.path.isfile( filteredResultsPath ):
-	os.remove( baselinesPath )
-	os.rename( filteredResultsPath, baselinesPath )
+if len(sys.argv) > 1:
+	files = [os.path.join( rootPath, f ) for f in sys.argv[1:]]
 else:
-	print "approval file " + filteredResultsPath + " does not exist"
+	files = glob.glob( os.path.join( rootPath, "*.unapproved.txt" ) )
+
+
+def approveFile( approvedFile, unapprovedFile ):
+	justFilename = unapprovedFile[len(rootPath)+1:]
+	if os.path.exists( unapprovedFile ):
+		if os.path.exists( approvedFile ):
+			os.remove( approvedFile )
+		os.rename( unapprovedFile, approvedFile )
+		print "approved " + justFilename		
+	else:
+		print "approval file " + justFilename + " does not exist"
+
+if len(files) > 0:
+	for unapprovedFile in files:
+		approveFile( unapprovedFile.replace( "unapproved.txt", "approved.txt" ), unapprovedFile )
+else:
+	print "no files to approve"
\ No newline at end of file
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index dba2e304..144dab57 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 10 (master branch)
- *  Generated: 2013-09-21 19:07:52.759646
+ *  CATCH v1.0 build 11 (master branch)
+ *  Generated: 2013-10-17 22:42:24.922987
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -1753,9 +1753,10 @@ namespace Catch {
         }
 
         bool matches( std::set<std::string> const& tags ) const {
-            TagMap::const_iterator it = m_tags.begin();
-            TagMap::const_iterator itEnd = m_tags.end();
-            for(; it != itEnd; ++it ) {
+            for(    TagMap::const_iterator
+                        it = m_tags.begin(), itEnd = m_tags.end();
+                    it != itEnd;
+                    ++it ) {
                 bool found = tags.find( it->first ) != tags.end();
                 if( found == it->second.isNegated() )
                     return false;
@@ -1770,9 +1771,10 @@ namespace Catch {
     class TagExpression {
     public:
         bool matches( std::set<std::string> const& tags ) const {
-            std::vector<TagSet>::const_iterator it = m_tagSets.begin();
-            std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
-            for(; it != itEnd; ++it )
+            for(    std::vector<TagSet>::const_iterator
+                        it = m_tagSets.begin(), itEnd = m_tagSets.end();
+                    it != itEnd;
+                    ++it )
                 if( it->matches( tags ) )
                     return true;
             return false;
@@ -1805,6 +1807,7 @@ namespace Catch {
                     break;
                 case ',':
                     m_exp.m_tagSets.push_back( m_currentTagSet );
+                    m_currentTagSet = TagSet();
                     break;
             }
         }
@@ -4598,7 +4601,7 @@ namespace Catch {
                 matchedTests++;
                 Text nameWrapper(   it->getTestCaseInfo().name,
                                     TextAttributes()
-                                        .setWidth( maxNameLen )
+                                        .setWidth( maxNameLen+2 )
                                         .setInitialIndent(2)
                                         .setIndent(4) );
 
@@ -6368,7 +6371,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 10, "master" );
+    Version libraryVersion( 1, 0, 11, "master" );
 }
 
 // #included from: catch_text.hpp
@@ -6389,7 +6392,10 @@ namespace Catch {
         std::string remainder = _str;
 
         while( !remainder.empty() ) {
-            assert( lines.size() < 1000 );
+            if( lines.size() >= 1000 ) {
+                lines.push_back( "... message truncated due to excessive size" );
+                return;
+            }
             std::size_t tabPos = std::string::npos;
             std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
             std::size_t pos = remainder.find_first_of( '\n' );
@@ -6703,9 +6709,9 @@ namespace Catch {
 }
 
 #define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
-    Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
+    namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
 #define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
-    Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
 
 // #included from: ../internal/catch_xmlwriter.hpp
 #define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED