v1.5.4

This addresses #657 while (hopefully) maintaining fix for #574

.travis.yml

@@ -64,7 +64,7 @@ matrix:
       compiler: clang
       addons: &clang38
         apt:
-          sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test']
+          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
           packages: ['clang-3.8']
       env: COMPILER='ccache clang++-3.8' BUILD_TYPE='Release'
 

README.md

@@ -1,12 +1,10 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.2.1-develop.15*
+*v1.5.4*
 
 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 
-[Please see this page if you are updating from a version before 1.0](docs/whats-changed.md)
-
-<a href="https://raw.githubusercontent.com/philsquared/Catch/master/single_include/catch.hpp">[The latest, single header, version can be downloaded directly using this link]</a>
+<a href="https://raw.githubusercontent.com/philsquared/Catch/master/single_include/catch.hpp">The latest, single header, version can be downloaded directly using this link</a>
 
 ## What's the Catch?
 
@@ -19,8 +17,6 @@ This documentation comprises these three parts:
 * [Tutorial](docs/tutorial.md) - getting started
 * [Reference section](docs/Readme.md) - all the details
 
-The documentation will continue until morale improves
-
 ## More
 * Issues and bugs can be raised on the [Issue tracker on GitHub](https://github.com/philsquared/Catch/issues)
 * For discussion or questions please use [the dedicated Google Groups forum](https://groups.google.com/forum/?fromgroups#!forum/catch-forum)

docs/Readme.md

@@ -16,5 +16,4 @@ Before looking at this material be sure to read the [tutorial](tutorial.md)
 Other
 
 * [Why Catch?](why-catch.md)
-* [What's changed](whats-changed.md)
 * [Contributing](contributing.md)

docs/tostring.md

@@ -55,6 +55,16 @@ namespace Catch {
 }
 ```
 
+## Exceptions
+
+By default all exceptions deriving from `std::exception` will be translated to strings by calling the `what()` method. For exception types that do not derive from `std::exception` - or if `what()` does not return a suitable string - use `CATCH_TRANSLATE_EXCEPTION`. This defines a function that takes your exception type, by reference, and returns a string. It can appear anywhere in the code - it doesn't have to be in the same translation unit. For example:
+
+```
+CATCH_TRANSLATE_EXCEPTION( MyType& ex ) {
+	return ex.message();
+}
+```
+
 ---
 
 [Home](Readme.md)

docs/tutorial.md

@@ -1,6 +1,6 @@
 # Getting Catch
 
-The simplest way to get Catch is to download the single header version from [http://builds.catch-lib.net](http://builds.catch-lib.net). Don't be put off by the word "builds" there. The single header is generated by merging a set of individual headers but it is still just normal source code in a header file.
+The simplest way to get Catch is to download the latest [single header version](https://raw.githubusercontent.com/philsquared/Catch/master/single_include/catch.hpp). The single header is generated by merging a set of individual headers but it is still just normal source code in a header file.
 
 The full source for Catch, including test projects, documentation, and other things, is hosted on GitHub. [http://catch-lib.net](http://catch-lib.net) will redirect you there.
 

docs/whats-changed.md

@@ -1,24 +0,0 @@
-## What's new in Catch for 1.0
-
-After a long "developer preview" state Catch turned 1.0 in mid-2013. Just prior to this a large number of changes, some of them breaking, where merged from the integration branch and now form part of the 1.0 code-base. If this might affect you please read this summary through so you know what to expect.
-
-* Calling Catch from your own ```main()``` has changed - please review [the updated docs](own-main.md)
-* The command line has changed. The biggest change is that test case names and tags should now only be supplied as primary arguments - in fact the ```-t``` option has been repurposed to mean "list tags". There are [updated docs for this too](command-line.md)
-* There is a new reporter interface. If you have written a custom reporter you can use the ```LegacyReporterAdapter``` to minimise any differences. Ideally you should update to the new interface - especially as it has been designed to be more robust in the face of future changes (which should be minimal).
-* The docs have moved from the wiki to the repository itself. They consist of a set of markdown files in the docs folder and are referenced directly from the README in the root. You can still read them online from GitHub.
-* Lots of new goodness - more documentation for which is coming. The existing docs have been updated to account for some of the changes already (e.g. variadic macros). A quick rundown:
-	* Variadic macros are used, where possible, so that, e.g. you can write a ```TEST_CASE``` with just a name - or even no name at all (making it an anonymous test case).
-	* The hierarchical naming convention is deprecated in favour of using tags (see next)
-	* ```TEST_CASE```s (but not ```SECTION```s) can now be tagged by placing keywords in square brackets in the second argument - e.g.: ```TEST_CASE( "A nice name", "[tag1][tag2]")```. The old style is still supported but please consider using this new style.
-	* Tests can still be "hidden" using the ```./``` prefix as before, but the preferred way now is to give it the ```[hide]``` tag (hidden tests are skipped if you run the test process without specifying any test specs).
-	* As well as ```TEST_CASE```s and ```SECTION```s you can now also use BDD-style ```SCENARIO``` (in place of ```TEST_CASE```) and ```GIVEN```, ```WHEN``` and ```THEN``` macros (in place of ```SECTION```s).
-	* New command line parser. Under the hood it is a complete rewrite - now powered by a command line library that will soon be spun out as a separate project: Clara. The options themselves are largely the same but there are some notable differences (as already discussed).
-	* Completely overhauled output from the textual reporter (now the Console reporter). This now features a much clearer, cleaner format, including good use of indentation.
-
-More information can be found in [this blog post](http://www.levelofindirection.com/journal/2013/6/28/catch-10.html).
-
-If you find any issues please raise issue tickets on the [issue tracker on GitHub](https://github.com/philsquared/Catch/issues) as before. For general questions, comments and suggestions, though, please use the [new forums on Google Groups](https://groups.google.com/forum/?fromgroups#!forum/catch-forum).
-
----
-
-[Home](Readme.md)

include/catch.hpp

@@ -99,6 +99,7 @@
     #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
     #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
     #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+    #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
     #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
     #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ )
     #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", __VA_ARGS__ )
@@ -106,6 +107,7 @@
     #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
     #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
     #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
+    #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description )
     #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
     #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", msg )
     #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", msg )
@@ -166,6 +168,7 @@
     #define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
     #define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
     #define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+    #define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
     #define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
     #define FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", __VA_ARGS__ )
     #define SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", __VA_ARGS__ )
@@ -173,6 +176,7 @@
     #define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
     #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
     #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
+    #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description )
     #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
     #define FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", msg )
     #define SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", msg )

include/catch_session.hpp

@@ -30,7 +30,7 @@ namespace Catch {
         }
         return reporter;
     }
-    
+
     Ptr<IStreamingReporter> makeReporter( Ptr<Config> const& config ) {
         std::vector<std::string> reporters = config->getReporterNames();
         if( reporters.empty() )
@@ -40,7 +40,7 @@ namespace Catch {
         for( std::vector<std::string>::const_iterator it = reporters.begin(), itEnd = reporters.end();
                 it != itEnd;
                 ++it )
-            reporter = addReporter( reporter, createReporter( *it, config ) );        
+            reporter = addReporter( reporter, createReporter( *it, config ) );
         return reporter;
     }
     Ptr<IStreamingReporter> addListeners( Ptr<IConfig const> const& config, Ptr<IStreamingReporter> reporters ) {
@@ -51,15 +51,15 @@ namespace Catch {
             reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) );
         return reporters;
     }
-    
-    
+
+
     Totals runTests( Ptr<Config> const& config ) {
 
         Ptr<IConfig const> iconfig = config.get();
-        
+
         Ptr<IStreamingReporter> reporter = makeReporter( config );
         reporter = addListeners( iconfig, reporter );
-        
+
         RunContext context( iconfig, reporter );
 
         Totals totals;
@@ -83,13 +83,13 @@ namespace Catch {
         context.testGroupEnded( iconfig->name(), totals, 1, 1 );
         return totals;
     }
-    
+
     void applyFilenamesAsTags( IConfig const& config ) {
         std::vector<TestCase> const& tests = getAllTestCasesSorted( config );
         for(std::size_t i = 0; i < tests.size(); ++i ) {
             TestCase& test = const_cast<TestCase&>( tests[i] );
             std::set<std::string> tags = test.tags;
-            
+
             std::string filename = test.lineInfo.file;
             std::string::size_type lastSlash = filename.find_last_of( "\\/" );
             if( lastSlash != std::string::npos )
@@ -98,7 +98,7 @@ namespace Catch {
             std::string::size_type lastDot = filename.find_last_of( "." );
             if( lastDot != std::string::npos )
                 filename = filename.substr( 0, lastDot );
-            
+
             tags.insert( "#" + filename );
             setTags( test, tags );
         }
@@ -131,10 +131,10 @@ namespace Catch {
             Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
         }
 
-        int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
+        int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
             try {
                 m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
-                m_unusedTokens = m_cli.parseInto( argc, argv, m_configData );
+                m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData );
                 if( m_configData.showHelp )
                     showHelp( m_configData.processName );
                 m_config.reset();
@@ -158,7 +158,7 @@ namespace Catch {
             m_config.reset();
         }
 
-        int run( int argc, char* const argv[] ) {
+        int run( int argc, char const* const* const argv ) {
 
             int returnCode = applyCommandLine( argc, argv );
             if( returnCode == 0 )
@@ -173,12 +173,12 @@ namespace Catch {
             try
             {
                 config(); // Force config to be constructed
-                
+
                 seedRng( *m_config );
 
                 if( m_configData.filenamesAsTags )
                     applyFilenamesAsTags( *m_config );
-                
+
                 // Handle list request
                 if( Option<std::size_t> listed = list( config() ) )
                     return static_cast<int>( *listed );

include/catch_with_main.hpp

@@ -8,8 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED
 
-#include "catch_runner.hpp"
+#define CATCH_CONFIG_MAIN
 #include "catch.hpp"
-#include "internal/catch_default_main.hpp"
 
 #endif // TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED

include/external/clara.h

@@ -6,6 +6,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
+// Version 0.0.2.4
+
 // Only use header guard if we are not using an outer namespace
 #if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE)
 
@@ -38,6 +40,7 @@
 #include <string>
 #include <vector>
 #include <sstream>
+#include <algorithm>
 
 // Use optional outer namespace
 #ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
@@ -172,16 +175,179 @@ namespace Tbc {
 #endif // TBC_TEXT_FORMAT_H_INCLUDED
 
 // ----------- end of #include from tbc_text_format.h -----------
-// ........... back in /Users/philnash/Dev/OSS/Clara/srcs/clara.h
+// ........... back in clara.h
 
 #undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
 
 
+// ----------- #included from clara_compilers.h -----------
+
+/*
+ *  Created by Phil on 10/02/2016.
+ *  Copyright 2016 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_CLARA_COMPILERS_H_INCLUDED
+#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
+
+// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
+// The following features are defined:
+//
+// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported?
+// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
+// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
+// CLARA_CONFIG_CPP11_OVERRIDE : is override supported?
+// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
+
+// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
+
+// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported?
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11
+
+#ifdef __clang__
+
+#if __has_feature(cxx_nullptr)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+#if __has_feature(cxx_noexcept)
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#endif
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// GCC
+#ifdef __GNUC__
+
+#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+// - otherwise more recent versions define __cplusplus >= 201103L
+// and will get picked up below
+
+#endif // __GNUC__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+#if (_MSC_VER >= 1600)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+
+#endif // _MSC_VER
+
+
+////////////////////////////////////////////////////////////////////////////////
+// C++ language feature support
+
+// catch all support for C++11
+#if defined(__cplusplus) && __cplusplus >= 201103L
+
+#define CLARA_CPP11_OR_GREATER
+
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#endif
+
+#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE)
+#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE
+#endif
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
+#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+
+#endif // __cplusplus >= 201103L
+
+// Now set the actual defines based on the above + anything the user has configured
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_NULLPTR
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_NOEXCEPT
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_OVERRIDE
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+
+// noexcept support:
+#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT)
+#define CLARA_NOEXCEPT noexcept
+#  define CLARA_NOEXCEPT_IS(x) noexcept(x)
+#else
+#define CLARA_NOEXCEPT throw()
+#  define CLARA_NOEXCEPT_IS(x)
+#endif
+
+// nullptr support
+#ifdef CLARA_CONFIG_CPP11_NULLPTR
+#define CLARA_NULL nullptr
+#else
+#define CLARA_NULL NULL
+#endif
+
+// override support
+#ifdef CLARA_CONFIG_CPP11_OVERRIDE
+#define CLARA_OVERRIDE override
+#else
+#define CLARA_OVERRIDE
+#endif
+
+// unique_ptr support
+#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR
+#   define CLARA_AUTO_PTR( T ) std::unique_ptr<T>
+#else
+#   define CLARA_AUTO_PTR( T ) std::auto_ptr<T>
+#endif
+
+#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
+
+
+// ----------- end of #include from clara_compilers.h -----------
+// ........... back in clara.h
+
+
 #include <map>
-#include <algorithm>
 #include <stdexcept>
 #include <memory>
 
+#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
+#define CLARA_PLATFORM_WINDOWS
+#endif
+
+
 // Use optional outer namespace
 #ifdef STITCH_CLARA_OPEN_NAMESPACE
 STITCH_CLARA_OPEN_NAMESPACE
@@ -240,23 +406,16 @@ namespace Clara {
             else
                 throw std::runtime_error( "Expected a boolean value but did not recognise:\n  '" + _source + "'" );
         }
-        inline void convertInto( bool _source, bool& _dest ) {
-            _dest = _source;
-        }
-        template<typename T>
-        inline void convertInto( bool, T& ) {
-            throw std::runtime_error( "Invalid conversion" );
-        }
+
 
         template<typename ConfigT>
         struct IArgFunction {
             virtual ~IArgFunction() {}
-#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS
             IArgFunction()                      = default;
             IArgFunction( IArgFunction const& ) = default;
-#  endif
+#endif
             virtual void set( ConfigT& config, std::string const& value ) const = 0;
-            virtual void setFlag( ConfigT& config ) const = 0;
             virtual bool takesArg() const = 0;
             virtual IArgFunction* clone() const = 0;
         };
@@ -264,11 +423,11 @@ namespace Clara {
         template<typename ConfigT>
         class BoundArgFunction {
         public:
-            BoundArgFunction() : functionObj( CATCH_NULL ) {}
+            BoundArgFunction() : functionObj( CLARA_NULL ) {}
             BoundArgFunction( IArgFunction<ConfigT>* _functionObj ) : functionObj( _functionObj ) {}
-            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CATCH_NULL ) {}
+            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {}
             BoundArgFunction& operator = ( BoundArgFunction const& other ) {
-                IArgFunction<ConfigT>* newFunctionObj = other.functionObj ? other.functionObj->clone() : CATCH_NULL;
+                IArgFunction<ConfigT>* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL;
                 delete functionObj;
                 functionObj = newFunctionObj;
                 return *this;
@@ -278,13 +437,10 @@ namespace Clara {
             void set( ConfigT& config, std::string const& value ) const {
                 functionObj->set( config, value );
             }
-            void setFlag( ConfigT& config ) const {
-                functionObj->setFlag( config );
-            }
             bool takesArg() const { return functionObj->takesArg(); }
 
             bool isSet() const {
-                return functionObj != CATCH_NULL;
+                return functionObj != CLARA_NULL;
             }
         private:
             IArgFunction<ConfigT>* functionObj;
@@ -294,7 +450,6 @@ namespace Clara {
         template<typename C>
         struct NullBinder : IArgFunction<C>{
             virtual void set( C&, std::string const& ) const {}
-            virtual void setFlag( C& ) const {}
             virtual bool takesArg() const { return true; }
             virtual IArgFunction<C>* clone() const { return new NullBinder( *this ); }
         };
@@ -305,9 +460,6 @@ namespace Clara {
             virtual void set( C& p, std::string const& stringValue ) const {
                 convertInto( stringValue, p.*member );
             }
-            virtual void setFlag( C& p ) const {
-                convertInto( true, p.*member );
-            }
             virtual bool takesArg() const { return !IsBool<M>::value; }
             virtual IArgFunction<C>* clone() const { return new BoundDataMember( *this ); }
             M C::* member;
@@ -320,11 +472,6 @@ namespace Clara {
                 convertInto( stringValue, value );
                 (p.*member)( value );
             }
-            virtual void setFlag( C& p ) const {
-                typename RemoveConstRef<M>::type value;
-                convertInto( true, value );
-                (p.*member)( value );
-            }
             virtual bool takesArg() const { return !IsBool<M>::value; }
             virtual IArgFunction<C>* clone() const { return new BoundUnaryMethod( *this ); }
             void (C::*member)( M );
@@ -338,9 +485,6 @@ namespace Clara {
                 if( value )
                     (p.*member)();
             }
-            virtual void setFlag( C& p ) const {
-                (p.*member)();
-            }
             virtual bool takesArg() const { return false; }
             virtual IArgFunction<C>* clone() const { return new BoundNullaryMethod( *this ); }
             void (C::*member)();
@@ -355,9 +499,6 @@ namespace Clara {
                 if( value )
                     function( obj );
             }
-            virtual void setFlag( C& p ) const {
-                function( p );
-            }
             virtual bool takesArg() const { return false; }
             virtual IArgFunction<C>* clone() const { return new BoundUnaryFunction( *this ); }
             void (*function)( C& );
@@ -371,11 +512,6 @@ namespace Clara {
                 convertInto( stringValue, value );
                 function( obj, value );
             }
-            virtual void setFlag( C& obj ) const {
-                typename RemoveConstRef<T>::type value;
-                convertInto( true, value );
-                function( obj, value );
-            }
             virtual bool takesArg() const { return !IsBool<T>::value; }
             virtual IArgFunction<C>* clone() const { return new BoundBinaryFunction( *this ); }
             void (*function)( C&, T );
@@ -383,8 +519,20 @@ namespace Clara {
 
     } // namespace Detail
 
-    struct Parser {
-        Parser() : separators( " \t=:" ) {}
+    inline std::vector<std::string> argsToVector( int argc, char const* const* const argv ) {
+        std::vector<std::string> args( static_cast<std::size_t>( argc ) );
+        for( std::size_t i = 0; i < static_cast<std::size_t>( argc ); ++i )
+            args[i] = argv[i];
+
+        return args;
+    }
+
+    class Parser {
+        enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional };
+        Mode mode;
+        std::size_t from;
+        bool inQuotes;
+    public:
 
         struct Token {
             enum Type { Positional, ShortOpt, LongOpt };
@@ -393,38 +541,75 @@ namespace Clara {
             std::string data;
         };
 
-        void parseIntoTokens( int argc, char const * const * argv, std::vector<Parser::Token>& tokens ) const {
+        Parser() : mode( None ), from( 0 ), inQuotes( false ){}
+
+        void parseIntoTokens( std::vector<std::string> const& args, std::vector<Token>& tokens ) {
             const std::string doubleDash = "--";
-            for( int i = 1; i < argc && argv[i] != doubleDash; ++i )
-                parseIntoTokens( argv[i] , tokens);
+            for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i )
+                parseIntoTokens( args[i], tokens);
         }
-        void parseIntoTokens( std::string arg, std::vector<Parser::Token>& tokens ) const {
-            while( !arg.empty() ) {
-                Parser::Token token( Parser::Token::Positional, arg );
-                arg = "";
-                if( token.data[0] == '-' ) {
-                    if( token.data.size() > 1 && token.data[1] == '-' ) {
-                        token = Parser::Token( Parser::Token::LongOpt, token.data.substr( 2 ) );
-                    }
-                    else {
-                        token = Parser::Token( Parser::Token::ShortOpt, token.data.substr( 1 ) );
-                        if( token.data.size() > 1 && separators.find( token.data[1] ) == std::string::npos ) {
-                            arg = "-" + token.data.substr( 1 );
-                            token.data = token.data.substr( 0, 1 );
-                        }
-                    }
-                }
-                if( token.type != Parser::Token::Positional ) {
-                    std::size_t pos = token.data.find_first_of( separators );
-                    if( pos != std::string::npos ) {
-                        arg = token.data.substr( pos+1 );
-                        token.data = token.data.substr( 0, pos );
-                    }
-                }
-                tokens.push_back( token );
+
+        void parseIntoTokens( std::string const& arg, std::vector<Token>& tokens ) {
+            for( std::size_t i = 0; i <= arg.size(); ++i ) {
+                char c = arg[i];
+                if( c == '"' )
+                    inQuotes = !inQuotes;
+                mode = handleMode( i, c, arg, tokens );
             }
         }
-        std::string separators;
+        Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            switch( mode ) {
+                case None: return handleNone( i, c );
+                case MaybeShortOpt: return handleMaybeShortOpt( i, c );
+                case ShortOpt:
+                case LongOpt:
+                case SlashOpt: return handleOpt( i, c, arg, tokens );
+                case Positional: return handlePositional( i, c, arg, tokens );
+                default: throw std::logic_error( "Unknown mode" );
+            }
+        }
+
+        Mode handleNone( std::size_t i, char c ) {
+            if( inQuotes ) {
+                from = i;
+                return Positional;
+            }
+            switch( c ) {
+                case '-': return MaybeShortOpt;
+#ifdef CLARA_PLATFORM_WINDOWS
+                case '/': from = i+1; return SlashOpt;
+#endif
+                default: from = i; return Positional;
+            }
+        }
+        Mode handleMaybeShortOpt( std::size_t i, char c ) {
+            switch( c ) {
+                case '-': from = i+1; return LongOpt;
+                default: from = i; return ShortOpt;
+            }
+        }
+        Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            if( std::string( ":=\0", 5 ).find( c ) == std::string::npos )
+                return mode;
+
+            std::string optName = arg.substr( from, i-from );
+            if( mode == ShortOpt )
+                for( std::size_t j = 0; j < optName.size(); ++j )
+                    tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) );
+            else if( mode == SlashOpt && optName.size() == 1 )
+                tokens.push_back( Token( Token::ShortOpt, optName ) );
+            else
+                tokens.push_back( Token( Token::LongOpt, optName ) );
+            return None;
+        }
+        Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            if( inQuotes || std::string( "\0", 3 ).find( c ) == std::string::npos )
+                return mode;
+
+            std::string data = arg.substr( from, i-from );
+            tokens.push_back( Token( Token::Positional, data ) );
+            return None;
+        }
     };
 
     template<typename ConfigT>
@@ -503,7 +688,7 @@ namespace Clara {
             }
         };
 
-        typedef CATCH_AUTO_PTR( Arg ) ArgAutoPtr;
+        typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr;
 
         friend void addOptName( Arg& arg, std::string const& optName )
         {
@@ -580,8 +765,8 @@ namespace Clara {
                 m_arg->description = description;
                 return *this;
             }
-            ArgBuilder& detail( std::string const& _detail ) {
-                m_arg->detail = _detail;
+            ArgBuilder& detail( std::string const& detail ) {
+                m_arg->detail = detail;
                 return *this;
             }
 
@@ -665,14 +850,14 @@ namespace Clara {
                 maxWidth = (std::max)( maxWidth, it->commands().size() );
 
             for( it = itBegin; it != itEnd; ++it ) {
-                Detail::Text usageText( it->commands(), Detail::TextAttributes()
+                Detail::Text usage( it->commands(), Detail::TextAttributes()
                                                         .setWidth( maxWidth+indent )
                                                         .setIndent( indent ) );
                 Detail::Text desc( it->description, Detail::TextAttributes()
                                                         .setWidth( width - maxWidth - 3 ) );
 
-                for( std::size_t i = 0; i < (std::max)( usageText.size(), desc.size() ); ++i ) {
-                    std::string usageCol = i < usageText.size() ? usageText[i] : "";
+                for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) {
+                    std::string usageCol = i < usage.size() ? usage[i] : "";
                     os << usageCol;
 
                     if( i < desc.size() && !desc[i].empty() )
@@ -729,21 +914,21 @@ namespace Clara {
             return oss.str();
         }
 
-        ConfigT parse( int argc, char const * const * argv ) const {
+        ConfigT parse( std::vector<std::string> const& args ) const {
             ConfigT config;
-            parseInto( argc, argv, config );
+            parseInto( args, config );
             return config;
         }
 
-        std::vector<Parser::Token> parseInto( int argc, char const * const * argv, ConfigT& config ) const {
-            std::string processName = argv[0];
+        std::vector<Parser::Token> parseInto( std::vector<std::string> const& args, ConfigT& config ) const {
+            std::string processName = args[0];
             std::size_t lastSlash = processName.find_last_of( "/\\" );
             if( lastSlash != std::string::npos )
                 processName = processName.substr( lastSlash+1 );
             m_boundProcessName.set( config, processName );
             std::vector<Parser::Token> tokens;
             Parser parser;
-            parser.parseIntoTokens( argc, argv, tokens );
+            parser.parseIntoTokens( args, tokens );
             return populate( tokens, config );
         }
 
@@ -774,7 +959,7 @@ namespace Clara {
                                     arg.boundField.set( config, tokens[++i].data );
                             }
                             else {
-                                arg.boundField.setFlag( config );
+                                arg.boundField.set( config, "true" );
                             }
                             break;
                         }

include/internal/catch_capture.hpp

@@ -33,13 +33,14 @@
     do { \
         Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
         try { \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
             ( __catchResult <= expr ).endExpression(); \
         } \
         catch( ... ) { \
             __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \
         } \
         INTERNAL_CATCH_REACT( __catchResult ) \
-    } while( Catch::isTrue( false && (expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
+    } while( Catch::isTrue( false && !!(expr) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
 
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_IF( expr, resultDisposition, macroName ) \
@@ -129,14 +130,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CHECK_THAT( arg, matcher, resultDisposition, macroName ) \
     do { \
-        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg " " #matcher, resultDisposition ); \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \
         try { \
-            std::string matcherAsString = ::Catch::Matchers::matcher.toString(); \
+            std::string matcherAsString = (matcher).toString(); \
             __catchResult \
                 .setLhs( Catch::toString( arg ) ) \
                 .setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
                 .setOp( "matches" ) \
-                .setResultType( ::Catch::Matchers::matcher.match( arg ) ); \
+                .setResultType( (matcher).match( arg ) ); \
             __catchResult.captureExpression(); \
         } catch( ... ) { \
             __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \

include/internal/catch_commandline.hpp

@@ -62,6 +62,21 @@ namespace Catch {
             ? ShowDurations::Always
             : ShowDurations::Never;
     }
+    inline void setUseColour( ConfigData& config, std::string const& value ) {
+        std::string mode = toLower( value );
+        
+        if( mode == "yes" )
+            config.useColour = UseColour::Yes;
+        else if( mode == "no" )
+            config.useColour = UseColour::No;
+        else if( mode == "auto" )
+            config.useColour = UseColour::Auto;
+        else
+            throw std::runtime_error( "colour mode must be one of: auto, yes or no" );
+    }
+    inline void forceColour( ConfigData& config ) {
+        config.useColour = UseColour::Yes;
+    }
     inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) {
         std::ifstream f( _filename.c_str() );
         if( !f.is_open() )
@@ -148,7 +163,7 @@ namespace Catch {
 
         cli["-d"]["--durations"]
             .describe( "show test durations" )
-            .bind( &setShowDurations, "yes/no" );
+            .bind( &setShowDurations, "yes|no" );
 
         cli["-f"]["--input-file"]
             .describe( "load test names to run from a file" )
@@ -163,7 +178,7 @@ namespace Catch {
             .describe( "list all/matching test cases names only" )
             .bind( &ConfigData::listTestNamesOnly );
 
-        cli["--list-reporters"] 
+        cli["--list-reporters"]
             .describe( "list all reporters" )
             .bind( &ConfigData::listReporters );
 
@@ -176,9 +191,13 @@ namespace Catch {
             .bind( &setRngSeed, "'time'|number" );
 
         cli["--force-colour"]
-            .describe( "force colourised output" )
-            .bind( &ConfigData::forceColour );
+            .describe( "force colourised output (deprecated)" )
+            .bind( &forceColour );
         
+        cli["--use-colour"]
+            .describe( "should output be colourised" )
+            .bind( &setUseColour, "yes|no" );
+
         return cli;
     }
 

include/internal/catch_common.h

@@ -10,7 +10,11 @@
 
 #define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
 #define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
 
 #define INTERNAL_CATCH_STRINGIFY2( expr ) #expr
 #define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )
@@ -22,14 +26,14 @@
 #include "catch_compiler_capabilities.h"
 
 namespace Catch {
-    
+
     struct IConfig;
 
     struct CaseSensitive { enum Choice {
         Yes,
         No
     }; };
-    
+
     class NonCopyable {
 #ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
         NonCopyable( NonCopyable const& )              = delete;
@@ -118,7 +122,7 @@ namespace Catch {
 
     void seedRng( IConfig const& config );
     unsigned int rngSeed();
-    
+
     // Use this in variadic streaming macros to allow
     //    >> +StreamEndStop
     // as well as

include/internal/catch_common.hpp

@@ -36,7 +36,7 @@ namespace Catch {
 
         return start != std::string::npos ? str.substr( start, 1+end-start ) : "";
     }
-    
+
     bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
         bool replaced = false;
         std::size_t i = str.find( replaceThis );
@@ -50,7 +50,7 @@ namespace Catch {
         }
         return replaced;
     }
-    
+
     pluralise::pluralise( std::size_t count, std::string const& label )
     :   m_count( count ),
         m_label( label )

include/internal/catch_compiler_capabilities.h

@@ -23,7 +23,7 @@
 // CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
 
 // CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported?
-
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
 // ****************
 // Note to maintainers: if new toggles are added please document them
 // in configuration.md, too
@@ -36,6 +36,10 @@
 
 // All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11
 
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#  define CATCH_CPP11_OR_GREATER
+#endif
+
 #ifdef __clang__
 
 #  if __has_feature(cxx_nullptr)
@@ -46,6 +50,10 @@
 #    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
 #  endif
 
+#   if defined(CATCH_CPP11_OR_GREATER)
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+#   endif
+
 #endif // __clang__
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -73,9 +81,13 @@
 // GCC
 #ifdef __GNUC__
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#   define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
-#endif
+#   if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#       define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   endif
+
+#   if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) && defined(CATCH_CPP11_OR_GREATER)
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
+#   endif
 
 // - otherwise more recent versions define __cplusplus >= 201103L
 // and will get picked up below
@@ -111,13 +123,20 @@
 
 #endif
 
+// Use __COUNTER__ if the compiler supports it
+#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
+    ( defined __GNUC__  && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 ) || \
+    ( defined __clang__ && __clang_major__ >= 3 )
+
+#define CATCH_INTERNAL_CONFIG_COUNTER
+
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // C++ language feature support
 
 // catch all support for C++11
-#if defined(__cplusplus) && __cplusplus >= 201103L
-
-#  define CATCH_CPP11_OR_GREATER
+#if defined(CATCH_CPP11_OR_GREATER)
 
 #  if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR)
 #    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
@@ -185,7 +204,13 @@
 #if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11)
 #   define CATCH_CONFIG_CPP11_UNIQUE_PTR
 #endif
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
 
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
 
 // noexcept support:
 #if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT)

include/internal/catch_config.hpp

@@ -37,14 +37,14 @@ namespace Catch {
             noThrow( false ),
             showHelp( false ),
             showInvisibles( false ),
-            forceColour( false ),
             filenamesAsTags( false ),
             abortAfter( -1 ),
             rngSeed( 0 ),
             verbosity( Verbosity::Normal ),
             warnings( WarnAbout::Nothing ),
             showDurations( ShowDurations::DefaultForReporter ),
-            runOrder( RunTests::InDeclarationOrder )
+            runOrder( RunTests::InDeclarationOrder ),
+            useColour( UseColour::Auto )
         {}
 
         bool listTests;
@@ -57,7 +57,6 @@ namespace Catch {
         bool noThrow;
         bool showHelp;
         bool showInvisibles;
-        bool forceColour;
         bool filenamesAsTags;
 
         int abortAfter;
@@ -67,6 +66,7 @@ namespace Catch {
         WarnAbout::What warnings;
         ShowDurations::OrNot showDurations;
         RunTests::InWhatOrder runOrder;
+        UseColour::YesOrNo useColour;
 
         std::string outputFilename;
         std::string name;
@@ -133,10 +133,10 @@ namespace Catch {
         virtual ShowDurations::OrNot showDurations() const { return m_data.showDurations; }
         virtual RunTests::InWhatOrder runOrder() const  { return m_data.runOrder; }
         virtual unsigned int rngSeed() const    { return m_data.rngSeed; }
-        virtual bool forceColour() const { return m_data.forceColour; }
+        virtual UseColour::YesOrNo useColour() const { return m_data.useColour; }
 
     private:
-        
+
         IStream const* openStream() {
             if( m_data.outputFilename.empty() )
                 return new CoutStream();

include/internal/catch_console_colour_impl.hpp

@@ -95,7 +95,18 @@ namespace {
 
     IColourImpl* platformColourInstance() {
         static Win32ColourImpl s_instance;
-        return &s_instance;
+
+        Ptr<IConfig const> config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = !isDebuggerActive()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
     }
 
 } // end anon namespace
@@ -146,7 +157,14 @@ namespace {
 
     IColourImpl* platformColourInstance() {
         Ptr<IConfig const> config = getCurrentContext().getConfig();
-        return (config && config->forceColour()) || isatty(STDOUT_FILENO)
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) )
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
             ? PosixColourImpl::instance()
             : NoColourImpl::instance();
     }
@@ -171,9 +189,7 @@ namespace Catch {
     Colour::~Colour(){ if( !m_moved ) use( None ); }
 
     void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = isDebuggerActive()
-            ? NoColourImpl::instance()
-            : platformColourInstance();
+        static IColourImpl* impl = platformColourInstance();
         impl->use( _colourCode );
     }
 

include/internal/catch_default_main.hpp

@@ -11,7 +11,7 @@
 #ifndef __OBJC__
 
 // Standard C/C++ main entry point
-int main (int argc, char * const argv[]) {
+int main (int argc, char * argv[]) {
     return Catch::Session().run( argc, argv );
 }
 

include/internal/catch_evaluate.hpp

@@ -52,37 +52,37 @@ namespace Internal {
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsEqualTo> {
         static bool evaluate( T1 const& lhs, T2 const& rhs) {
-            return opCast( lhs ) ==  opCast( rhs );
+            return bool( opCast( lhs ) ==  opCast( rhs ) );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsNotEqualTo> {
         static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return opCast( lhs ) != opCast( rhs );
+            return bool( opCast( lhs ) != opCast( rhs ) );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsLessThan> {
         static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return opCast( lhs ) < opCast( rhs );
+            return bool( opCast( lhs ) < opCast( rhs ) );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsGreaterThan> {
         static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return opCast( lhs ) > opCast( rhs );
+            return bool( opCast( lhs ) > opCast( rhs ) );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
         static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return opCast( lhs ) >= opCast( rhs );
+            return bool( opCast( lhs ) >= opCast( rhs ) );
         }
     };
     template<typename T1, typename T2>
     struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
         static bool evaluate( T1 const& lhs, T2 const& rhs ) {
-            return opCast( lhs ) <= opCast( rhs );
+            return bool( opCast( lhs ) <= opCast( rhs ) );
         }
     };
 
@@ -174,7 +174,7 @@ namespace Internal {
     template<Operator Op> bool compare( long long lhs, unsigned char rhs ) {
         return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
     }
-    
+
     // unsigned long long to X
     template<Operator Op> bool compare( unsigned long long lhs, int rhs ) {
         return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
@@ -188,7 +188,7 @@ namespace Internal {
     template<Operator Op> bool compare( unsigned long long lhs, char rhs ) {
         return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
     }
-    
+
     // pointer to long long (when comparing against NULL)
     template<Operator Op, typename T> bool compare( long long lhs, T* rhs ) {
         return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
@@ -197,7 +197,7 @@ namespace Internal {
         return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
     }
 #endif // CATCH_CONFIG_CPP11_LONG_LONG
-    
+
 #ifdef CATCH_CONFIG_CPP11_NULLPTR
     // pointer to nullptr_t (when comparing against nullptr)
     template<Operator Op, typename T> bool compare( std::nullptr_t, T* rhs ) {

include/internal/catch_exception_translator_registry.hpp

@@ -32,13 +32,13 @@ namespace Catch {
 #ifdef __OBJC__
                 // In Objective-C try objective-c exceptions first
                 @try {
-                    throw;
+                    return tryTranslators();
                 }
                 @catch (NSException *exception) {
                     return Catch::toString( [exception description] );
                 }
 #else
-                throw;
+                return tryTranslators();
 #endif
             }
             catch( TestFailureException& ) {
@@ -54,20 +54,15 @@ namespace Catch {
                 return msg;
             }
             catch(...) {
-                return tryTranslators( m_translators.begin() );
+                return "Unknown exception";
             }
         }
 
-        std::string tryTranslators( std::vector<const IExceptionTranslator*>::const_iterator it ) const {
-            if( it == m_translators.end() )
-                return "Unknown exception";
-
-            try {
-                return (*it)->translate();
-            }
-            catch(...) {
-                return tryTranslators( it+1 );
-            }
+        std::string tryTranslators() const {
+            if( m_translators.empty() )
+                throw;
+            else
+                return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
         }
 
     private:

include/internal/catch_impl.hpp

@@ -49,6 +49,9 @@ namespace Catch {
     NonCopyable::~NonCopyable() {}
     IShared::~IShared() {}
     IStream::~IStream() CATCH_NOEXCEPT {}
+    FileStream::~FileStream() CATCH_NOEXCEPT {}
+    CoutStream::~CoutStream() CATCH_NOEXCEPT {}
+    DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {}
     StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {}
     IContext::~IContext() {}
     IResultCapture::~IResultCapture() {}
@@ -94,7 +97,7 @@ namespace Catch {
     Matchers::Impl::StdString::EndsWith::~EndsWith() {}
 
     void Config::dummy() {}
-    
+
     namespace TestCaseTracking {
         ITracker::~ITracker() {}
         TrackerBase::~TrackerBase() {}

include/internal/catch_interfaces_config.h

@@ -37,6 +37,11 @@ namespace Catch {
         InLexicographicalOrder,
         InRandomOrder
     }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };    
 
     class TestSpec;
 
@@ -56,7 +61,7 @@ namespace Catch {
         virtual TestSpec const& testSpec() const = 0;
         virtual RunTests::InWhatOrder runOrder() const = 0;
         virtual unsigned int rngSeed() const = 0;
-        virtual bool forceColour() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
     };
 }
 

include/internal/catch_interfaces_exception.h

@@ -9,15 +9,20 @@
 #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 
 #include <string>
+#include <vector>
+
 #include "catch_interfaces_registry_hub.h"
 
 namespace Catch {
 
     typedef std::string(*exceptionTranslateFunction)();
 
+    struct IExceptionTranslator;
+    typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
+
     struct IExceptionTranslator {
         virtual ~IExceptionTranslator();
-        virtual std::string translate() const = 0;
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
     };
 
     struct IExceptionTranslatorRegistry {
@@ -35,9 +40,12 @@ namespace Catch {
             : m_translateFunction( translateFunction )
             {}
 
-            virtual std::string translate() const {
+            virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE {
                 try {
-                    throw;
+                    if( it == itEnd )
+                        throw;
+                    else
+                        return (*it)->translate( it+1, itEnd );
                 }
                 catch( T& ex ) {
                     return m_translateFunction( ex );
@@ -58,9 +66,11 @@ namespace Catch {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) \
-    static std::string INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator )( signature ); \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ) ); }\
-    static std::string INTERNAL_CATCH_UNIQUE_NAME(  catch_internal_ExceptionTranslator )( signature )
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
 
 #endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED

include/internal/catch_interfaces_reporter.h

@@ -219,6 +219,7 @@ namespace Catch
         bool aborting;
     };
 
+    class MultipleReporters;
 
     struct IStreamingReporter : IShared {
         virtual ~IStreamingReporter();
@@ -240,13 +241,15 @@ namespace Catch
 
         // The return value indicates if the messages buffer should be cleared:
         virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-        
+
         virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
         virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
         virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
         virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-        
+
         virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+        
+        virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; }
     };
 
 
@@ -267,7 +270,7 @@ namespace Catch
     };
 
     Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter );
-    
+
 }
 
 #endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED

include/internal/catch_interfaces_testcase.h

@@ -34,7 +34,7 @@ namespace Catch {
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-    
+
 }
 
 #endif // TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED

include/internal/catch_matchers.hpp

@@ -12,6 +12,12 @@ namespace Catch {
 namespace Matchers {
     namespace Impl {
 
+    namespace Generic {
+        template<typename ExpressionT> class AllOf;
+        template<typename ExpressionT> class AnyOf;
+        template<typename ExpressionT> class Not;
+    }
+
     template<typename ExpressionT>
     struct Matcher : SharedImpl<IShared>
     {
@@ -21,6 +27,10 @@ namespace Matchers {
         virtual Ptr<Matcher> clone() const = 0;
         virtual bool match( ExpressionT const& expr ) const = 0;
         virtual std::string toString() const = 0;
+
+        Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const;
+        Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const;
+        Generic::Not<ExpressionT> operator ! () const;
     };
 
     template<typename DerivedT, typename ExpressionT>
@@ -33,8 +43,9 @@ namespace Matchers {
 
     namespace Generic {
         template<typename ExpressionT>
-        struct Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
-            Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
+        class Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
+        public:
+            explicit Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
             Not( Not const& other ) : m_matcher( other.m_matcher ) {}
 
             virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE {
@@ -44,7 +55,7 @@ namespace Matchers {
             virtual std::string toString() const CATCH_OVERRIDE {
                 return "not " + m_matcher->toString();
             }
-
+        private:
             Ptr< Matcher<ExpressionT> > m_matcher;
         };
 
@@ -78,6 +89,12 @@ namespace Matchers {
                 return oss.str();
             }
 
+            AllOf operator && ( Matcher<ExpressionT> const& other ) const {
+                AllOf allOfExpr( *this );
+                allOfExpr.add( other );
+                return allOfExpr;
+            }
+
         private:
             std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
         };
@@ -112,11 +129,40 @@ namespace Matchers {
                 return oss.str();
             }
 
+            AnyOf operator || ( Matcher<ExpressionT> const& other ) const {
+                AnyOf anyOfExpr( *this );
+                anyOfExpr.add( other );
+                return anyOfExpr;
+            }
+
         private:
             std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
         };
+
+    } // namespace Generic
+
+    template<typename ExpressionT>
+    Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const {
+        Generic::AllOf<ExpressionT> allOfExpr;
+        allOfExpr.add( *this );
+        allOfExpr.add( other );
+        return allOfExpr;
     }
 
+    template<typename ExpressionT>
+    Generic::AnyOf<ExpressionT> Matcher<ExpressionT>::operator || ( Matcher<ExpressionT> const& other ) const {
+        Generic::AnyOf<ExpressionT> anyOfExpr;
+        anyOfExpr.add( *this );
+        anyOfExpr.add( other );
+        return anyOfExpr;
+    }
+
+    template<typename ExpressionT>
+    Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const {
+        return Generic::Not<ExpressionT>( *this );
+    }
+
+
     namespace StdString {
 
         inline std::string makeString( std::string const& str ) { return str; }
@@ -132,7 +178,7 @@ namespace Matchers {
                 return m_caseSensitivity == CaseSensitive::No
                     ? toLower( str )
                     : str;
-                
+
             }
             std::string toStringSuffix() const
             {
@@ -143,7 +189,7 @@ namespace Matchers {
             CaseSensitive::Choice m_caseSensitivity;
             std::string m_str;
         };
-    
+
         struct Equals : MatcherImpl<Equals, std::string> {
             Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
             :   m_data( str, caseSensitivity )
@@ -182,13 +228,13 @@ namespace Matchers {
         struct StartsWith : MatcherImpl<StartsWith, std::string> {
             StartsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
             : m_data( substr, caseSensitivity ){}
-            
+
             StartsWith( StartsWith const& other ) : m_data( other.m_data ){}
 
             virtual ~StartsWith();
 
             virtual bool match( std::string const& expr ) const {
-                return m_data.adjustString( expr ).find( m_data.m_str ) == 0;
+                return startsWith( m_data.adjustString( expr ), m_data.m_str );
             }
             virtual std::string toString() const {
                 return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
@@ -205,7 +251,7 @@ namespace Matchers {
             virtual ~EndsWith();
 
             virtual bool match( std::string const& expr ) const {
-                return m_data.adjustString( expr ).find( m_data.m_str ) == expr.size() - m_data.m_str.size();
+                return endsWith( m_data.adjustString( expr ), m_data.m_str );
             }
             virtual std::string toString() const {
                 return "ends with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();

include/internal/catch_reporter_registrars.hpp

@@ -64,12 +64,12 @@ namespace Catch {
             getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
         }
     };
-    
+
     template<typename T>
     class ListenerRegistrar {
-        
+
         class ListenerFactory : public SharedImpl<IReporterFactory> {
-            
+
             virtual IStreamingReporter* create( ReporterConfig const& config ) const {
                 return new T( config );
             }
@@ -77,9 +77,9 @@ namespace Catch {
                 return "";
             }
         };
-        
+
     public:
-        
+
         ListenerRegistrar() {
             getMutableRegistryHub().registerListener( new ListenerFactory() );
         }

include/internal/catch_result_builder.h

@@ -85,7 +85,7 @@ namespace Catch {
             std::string lhs, rhs, op;
         } m_exprComponents;
         CopyableStream m_stream;
-        
+
         bool m_shouldDebugBreak;
         bool m_shouldThrow;
     };

include/internal/catch_result_builder.hpp

@@ -77,12 +77,12 @@ namespace Catch {
     }
 
     void ResultBuilder::captureExpectedException( Matchers::Impl::Matcher<std::string> const& matcher ) {
-        
+
         assert( m_exprComponents.testFalse == false );
         AssertionResultData data = m_data;
         data.resultType = ResultWas::Ok;
         data.reconstructedExpression = m_assertionInfo.capturedExpression;
-        
+
         std::string actualMessage = Catch::translateActiveException();
         if( !matcher.match( actualMessage ) ) {
             data.resultType = ResultWas::ExpressionFailed;
@@ -99,7 +99,7 @@ namespace Catch {
     void ResultBuilder::handleResult( AssertionResult const& result )
     {
         getResultCapture().assertionEnded( result );
-        
+
         if( !result.isOk() ) {
             if( getCurrentContext().getConfig()->shouldDebugBreak() )
                 m_shouldDebugBreak = true;

include/internal/catch_result_type.h

@@ -55,7 +55,7 @@ namespace Catch {
     inline bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
     inline bool isFalseTest( int flags )                { return ( flags & ResultDisposition::FalseTest ) != 0; }
     inline bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-    
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED

include/internal/catch_run_context.hpp

@@ -94,7 +94,7 @@ namespace Catch {
             m_reporter->testCaseStarting( testInfo );
 
             m_activeTestCase = &testCase;
-            
+
 
             do {
                 m_trackerContext.startRun();
@@ -109,6 +109,11 @@ namespace Catch {
             while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() );
 
             Totals deltaTotals = m_totals.delta( prevTotals );
+            if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) {
+                deltaTotals.assertions.failed++;
+                deltaTotals.testCases.passed--;
+                deltaTotals.testCases.failed++;
+            }
             m_totals.testCases += deltaTotals.testCases;
             m_reporter->testCaseEnded( TestCaseStats(   testInfo,
                                                         deltaTotals,
@@ -157,7 +162,7 @@ namespace Catch {
             if( !sectionTracker.isOpen() )
                 return false;
             m_activeSections.push_back( &sectionTracker );
-            
+
             m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
 
             m_reporter->sectionStarting( sectionInfo );
@@ -169,7 +174,7 @@ namespace Catch {
         bool testForMissingAssertions( Counts& assertions ) {
             if( assertions.total() != 0 )
                 return false;
-            if( m_config->warnAboutMissingAssertions() )
+            if( !m_config->warnAboutMissingAssertions() )
                 return false;
             if( m_trackerContext.currentTracker().hasChildren() )
                 return false;
@@ -177,16 +182,16 @@ namespace Catch {
             assertions.failed++;
             return true;
         }
-        
+
         virtual void sectionEnded( SectionEndInfo const& endInfo ) {
             Counts assertions = m_totals.assertions - endInfo.prevAssertions;
             bool missingAssertions = testForMissingAssertions( assertions );
-            
+
             if( !m_activeSections.empty() ) {
                 m_activeSections.back()->close();
                 m_activeSections.pop_back();
             }
-            
+
             m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) );
             m_messages.clear();
         }
@@ -197,10 +202,10 @@ namespace Catch {
             else
                 m_activeSections.back()->close();
             m_activeSections.pop_back();
-            
+
             m_unfinishedSections.push_back( endInfo );
         }
-        
+
         virtual void pushScopedMessage( MessageInfo const& message ) {
             m_messages.push_back( message );
         }
@@ -268,7 +273,7 @@ namespace Catch {
                 m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
 
                 seedRng( *m_config );
-                
+
                 Timer timer;
                 timer.start();
                 if( m_reporter->getPreferences().shouldRedirectStdOut ) {
@@ -318,7 +323,7 @@ namespace Catch {
                                     m_lastAssertionInfo.capturedExpression.c_str(),
                                     m_lastAssertionInfo.resultDisposition );
         }
-        
+
         void handleUnfinishedSections() {
             // If sections ended prematurely due to an exception we stored their
             // infos here so we can tear them down outside the unwind process.

include/internal/catch_section_info.h

@@ -23,17 +23,17 @@ namespace Catch {
         std::string description;
         SourceLineInfo lineInfo;
     };
-    
+
     struct SectionEndInfo {
         SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds )
         : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds )
         {}
-        
+
         SectionInfo sectionInfo;
         Counts prevAssertions;
         double durationInSeconds;
     };
-    
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED

include/internal/catch_stream.h

@@ -21,7 +21,7 @@ namespace Catch {
     std::ostream& cout();
     std::ostream& cerr();
 
-    
+
     struct IStream {
         virtual ~IStream() CATCH_NOEXCEPT;
         virtual std::ostream& stream() const = 0;
@@ -31,26 +31,29 @@ namespace Catch {
         mutable std::ofstream m_ofs;
     public:
         FileStream( std::string const& filename );
+        virtual ~FileStream() CATCH_NOEXCEPT;
     public: // IStream
         virtual std::ostream& stream() const CATCH_OVERRIDE;
     };
-    
+
 
     class CoutStream : public IStream {
         mutable std::ostream m_os;
     public:
         CoutStream();
+        virtual ~CoutStream() CATCH_NOEXCEPT;
 
     public: // IStream
         virtual std::ostream& stream() const CATCH_OVERRIDE;
     };
 
-    
+
     class DebugOutStream : public IStream {
         std::auto_ptr<StreamBufBase> m_streamBuf;
         mutable std::ostream m_os;
     public:
         DebugOutStream();
+        virtual ~DebugOutStream() CATCH_NOEXCEPT;
 
     public: // IStream
         virtual std::ostream& stream() const CATCH_OVERRIDE;

include/internal/catch_stream.hpp

@@ -65,27 +65,27 @@ namespace Catch {
             throw std::domain_error( oss.str() );
         }
     }
-    
+
     std::ostream& FileStream::stream() const {
         return m_ofs;
     }
-    
+
     struct OutputDebugWriter {
-        
+
         void operator()( std::string const&str ) {
             writeToDebugConsole( str );
         }
     };
-    
+
     DebugOutStream::DebugOutStream()
     :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
         m_os( m_streamBuf.get() )
     {}
-    
+
     std::ostream& DebugOutStream::stream() const {
         return m_os;
     }
-    
+
     // Store the streambuf from cout up-front because
     // cout may get redirected when running tests
     CoutStream::CoutStream()
@@ -95,9 +95,8 @@ namespace Catch {
     std::ostream& CoutStream::stream() const {
         return m_os;
     }
-    
-    
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
     std::ostream& cout() {
         return std::cout;
     }

include/internal/catch_test_case_info.h

@@ -31,7 +31,7 @@ namespace Catch {
             MayFail = 1 << 3,
             Throws = 1 << 4
         };
-        
+
         TestCaseInfo(   std::string const& _name,
                         std::string const& _className,
                         std::string const& _description,
@@ -41,7 +41,7 @@ namespace Catch {
         TestCaseInfo( TestCaseInfo const& other );
 
         friend void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags );
-        
+
         bool isHidden() const;
         bool throws() const;
         bool okToFail() const;

include/internal/catch_test_case_info.hpp

@@ -88,7 +88,7 @@ namespace Catch {
             tags.insert( "hide" );
             tags.insert( "." );
         }
-        
+
         TestCaseInfo info( _name, _className, desc, tags, _lineInfo );
         return TestCase( _testCase, info );
     }
@@ -97,7 +97,7 @@ namespace Catch {
     {
         testCaseInfo.tags = tags;
         testCaseInfo.lcaseTags.clear();
-        
+
         std::ostringstream oss;
         for( std::set<std::string>::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) {
             oss << "[" << *it << "]";
@@ -107,7 +107,7 @@ namespace Catch {
         }
         testCaseInfo.tagsAsString = oss.str();
     }
-    
+
     TestCaseInfo::TestCaseInfo( std::string const& _name,
                                 std::string const& _className,
                                 std::string const& _description,

include/internal/catch_test_case_registry_impl.hpp

@@ -27,11 +27,11 @@ namespace Catch {
     struct RandomNumberGenerator {
         int operator()( int n ) const { return std::rand() % n; }
     };
-    
+
     inline std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        
+
         std::vector<TestCase> sorted = unsortedTestCases;
-        
+
         switch( config.runOrder() ) {
             case RunTests::InLexicographicalOrder:
                 std::sort( sorted.begin(), sorted.end(), LexSort() );
@@ -39,7 +39,7 @@ namespace Catch {
             case RunTests::InRandomOrder:
                 {
                     seedRng( config );
-                    
+
                     RandomNumberGenerator rng;
                     std::random_shuffle( sorted.begin(), sorted.end(), rng );
                 }
@@ -60,17 +60,19 @@ namespace Catch {
             it != itEnd;
             ++it ) {
             std::pair<std::set<TestCase>::const_iterator, bool> prev = seenFunctions.insert( *it );
-            if( !prev.second ){
-                Catch::cerr()
-                << Colour( Colour::Red )
-                << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n"
-                << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl;
-                exit(1);
+            if( !prev.second ) {
+                std::ostringstream ss;
+
+                ss  << Colour( Colour::Red )
+                    << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl;
+
+                throw std::runtime_error(ss.str());
             }
         }
     }
-    
+
     std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
         std::vector<TestCase> filtered;
         filtered.reserve( testCases.size() );
@@ -87,7 +89,10 @@ namespace Catch {
 
     class TestRegistry : public ITestCaseRegistry {
     public:
-        TestRegistry() : m_unnamedCount( 0 ) {}
+        TestRegistry()
+        :   m_currentSortOrder( RunTests::InDeclarationOrder ),
+            m_unnamedCount( 0 )
+        {}
         virtual ~TestRegistry();
 
         virtual void registerTest( TestCase const& testCase ) {
@@ -152,29 +157,38 @@ namespace Catch {
         return className;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    void registerTestCase
+        (   ITestCase* testCase,
+            char const* classOrQualifiedMethodName,
+            NameAndDesc const& nameAndDesc,
+            SourceLineInfo const& lineInfo ) {
 
-    AutoReg::AutoReg(   TestFunction function,
-                        SourceLineInfo const& lineInfo,
-                        NameAndDesc const& nameAndDesc ) {
+        getMutableRegistryHub().registerTest
+            ( makeTestCase
+                (   testCase,
+                    extractClassName( classOrQualifiedMethodName ),
+                    nameAndDesc.name,
+                    nameAndDesc.description,
+                    lineInfo ) );
+    }
+    void registerTestCaseFunction
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc ) {
         registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
     }
 
-    AutoReg::~AutoReg() {}
+    ///////////////////////////////////////////////////////////////////////////
 
-    void AutoReg::registerTestCase( ITestCase* testCase,
-                                    char const* classOrQualifiedMethodName,
-                                    NameAndDesc const& nameAndDesc,
-                                    SourceLineInfo const& lineInfo ) {
-
-        getMutableRegistryHub().registerTest
-            ( makeTestCase( testCase,
-                            extractClassName( classOrQualifiedMethodName ),
-                            nameAndDesc.name,
-                            nameAndDesc.description,
-                            lineInfo ) );
+    AutoReg::AutoReg
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc ) {
+        registerTestCaseFunction( function, lineInfo, nameAndDesc );
     }
 
+    AutoReg::~AutoReg() {}
+
 } // end namespace Catch
 
 

include/internal/catch_test_case_tracker.hpp

@@ -21,61 +21,65 @@ namespace TestCaseTracking {
 
     struct ITracker : SharedImpl<> {
         virtual ~ITracker();
-        
+
         // static queries
         virtual std::string name() const = 0;
-        
+
         // dynamic queries
         virtual bool isComplete() const = 0; // Successfully completed or failed
         virtual bool isSuccessfullyCompleted() const = 0;
         virtual bool isOpen() const = 0; // Started but not complete
         virtual bool hasChildren() const = 0;
-        
+
         virtual ITracker& parent() = 0;
-        
+
         // actions
         virtual void close() = 0; // Successfully complete
         virtual void fail() = 0;
         virtual void markAsNeedingAnotherRun() = 0;
-        
+
         virtual void addChild( Ptr<ITracker> const& child ) = 0;
         virtual ITracker* findChild( std::string const& name ) = 0;
         virtual void openChild() = 0;
-    };
-    
-    class TrackerContext {
         
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isIndexTracker() const = 0;
+    };
+
+    class TrackerContext {
+
         enum RunState {
             NotStarted,
             Executing,
             CompletedCycle
         };
-        
+
         Ptr<ITracker> m_rootTracker;
         ITracker* m_currentTracker;
         RunState m_runState;
-        
+
     public:
-        
+
         static TrackerContext& instance() {
             static TrackerContext s_instance;
             return s_instance;
         }
-        
+
         TrackerContext()
         :   m_currentTracker( CATCH_NULL ),
             m_runState( NotStarted )
         {}
-        
-        
+
+
         ITracker& startRun();
-        
+
         void endRun() {
             m_rootTracker.reset();
             m_currentTracker = CATCH_NULL;
             m_runState = NotStarted;
         }
-        
+
         void startCycle() {
             m_currentTracker = m_rootTracker.get();
             m_runState = Executing;
@@ -83,7 +87,7 @@ namespace TestCaseTracking {
         void completeCycle() {
             m_runState = CompletedCycle;
         }
-        
+
         bool completedCycle() const {
             return m_runState == CompletedCycle;
         }
@@ -94,7 +98,7 @@ namespace TestCaseTracking {
             m_currentTracker = tracker;
         }
     };
-    
+
     class TrackerBase : public ITracker {
     protected:
         enum CycleState {
@@ -127,7 +131,7 @@ namespace TestCaseTracking {
             m_runState( NotStarted )
         {}
         virtual ~TrackerBase();
-        
+
         virtual std::string name() const CATCH_OVERRIDE {
             return m_name;
         }
@@ -143,12 +147,12 @@ namespace TestCaseTracking {
         virtual bool hasChildren() const CATCH_OVERRIDE {
             return !m_children.empty();
         }
-        
-        
+
+
         virtual void addChild( Ptr<ITracker> const& child ) CATCH_OVERRIDE {
             m_children.push_back( child );
         }
-        
+
         virtual ITracker* findChild( std::string const& name ) CATCH_OVERRIDE {
             Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( name ) );
             return( it != m_children.end() )
@@ -159,7 +163,7 @@ namespace TestCaseTracking {
             assert( m_parent ); // Should always be non-null except for root
             return *m_parent;
         }
-        
+
         virtual void openChild() CATCH_OVERRIDE {
             if( m_runState != ExecutingChildren ) {
                 m_runState = ExecutingChildren;
@@ -167,28 +171,32 @@ namespace TestCaseTracking {
                     m_parent->openChild();
             }
         }
+
+        virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; }
+        virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; }
+        
         void open() {
             m_runState = Executing;
             moveToThis();
             if( m_parent )
                 m_parent->openChild();
         }
-        
+
         virtual void close() CATCH_OVERRIDE {
-            
+
             // Close any still open children (e.g. generators)
             while( &m_ctx.currentTracker() != this )
                 m_ctx.currentTracker().close();
-            
+
             switch( m_runState ) {
                 case NotStarted:
                 case CompletedSuccessfully:
                 case Failed:
                     throw std::logic_error( "Illogical state" );
-                    
+
                 case NeedsAnotherRun:
                     break;;
-                    
+
                 case Executing:
                     m_runState = CompletedSuccessfully;
                     break;
@@ -196,7 +204,7 @@ namespace TestCaseTracking {
                     if( m_children.empty() || m_children.back()->isComplete() )
                         m_runState = CompletedSuccessfully;
                     break;
-                    
+
                 default:
                     throw std::logic_error( "Unexpected state" );
             }
@@ -222,34 +230,37 @@ namespace TestCaseTracking {
             m_ctx.setCurrentTracker( this );
         }
     };
-    
+
     class SectionTracker : public TrackerBase {
     public:
         SectionTracker( std::string const& name, TrackerContext& ctx, ITracker* parent )
         :   TrackerBase( name, ctx, parent )
         {}
         virtual ~SectionTracker();
+
+        virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; }
         
         static SectionTracker& acquire( TrackerContext& ctx, std::string const& name ) {
             SectionTracker* section = CATCH_NULL;
-            
+
             ITracker& currentTracker = ctx.currentTracker();
             if( ITracker* childTracker = currentTracker.findChild( name ) ) {
-                section = dynamic_cast<SectionTracker*>( childTracker );
-                assert( section );
+                assert( childTracker );
+                assert( childTracker->isSectionTracker() );
+                section = static_cast<SectionTracker*>( childTracker );
             }
             else {
                 section = new SectionTracker( name, ctx, &currentTracker );
                 currentTracker.addChild( section );
             }
             if( !ctx.completedCycle() && !section->isComplete() ) {
-                
+
                 section->open();
             }
             return *section;
         }
     };
-    
+
     class IndexTracker : public TrackerBase {
         int m_size;
         int m_index;
@@ -260,52 +271,55 @@ namespace TestCaseTracking {
             m_index( -1 )
         {}
         virtual ~IndexTracker();
+
+        virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; }
         
         static IndexTracker& acquire( TrackerContext& ctx, std::string const& name, int size ) {
             IndexTracker* tracker = CATCH_NULL;
-            
+
             ITracker& currentTracker = ctx.currentTracker();
             if( ITracker* childTracker = currentTracker.findChild( name ) ) {
-                tracker = dynamic_cast<IndexTracker*>( childTracker );
-                assert( tracker );
+                assert( childTracker );
+                assert( childTracker->isIndexTracker() );
+                tracker = static_cast<IndexTracker*>( childTracker );
             }
             else {
                 tracker = new IndexTracker( name, ctx, &currentTracker, size );
                 currentTracker.addChild( tracker );
             }
-            
+
             if( !ctx.completedCycle() && !tracker->isComplete() ) {
                 if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
                     tracker->moveNext();
                 tracker->open();
             }
-            
+
             return *tracker;
         }
-        
+
         int index() const { return m_index; }
-        
+
         void moveNext() {
             m_index++;
             m_children.clear();
         }
-        
+
         virtual void close() CATCH_OVERRIDE {
             TrackerBase::close();
             if( m_runState == CompletedSuccessfully && m_index < m_size-1 )
                 m_runState = Executing;
         }
     };
-    
+
     inline ITracker& TrackerContext::startRun() {
         m_rootTracker = new SectionTracker( "{root}", *this, CATCH_NULL );
         m_currentTracker = CATCH_NULL;
         m_runState = Executing;
         return *m_rootTracker;
     }
-    
+
 } // namespace TestCaseTracking
-    
+
 using TestCaseTracking::ITracker;
 using TestCaseTracking::TrackerContext;
 using TestCaseTracking::SectionTracker;

include/internal/catch_test_registry.hpp

@@ -42,27 +42,32 @@ struct NameAndDesc {
     const char* description;
 };
 
+void registerTestCase
+    (   ITestCase* testCase,
+        char const* className,
+        NameAndDesc const& nameAndDesc,
+        SourceLineInfo const& lineInfo );
+
 struct AutoReg {
 
-    AutoReg(    TestFunction function,
-                SourceLineInfo const& lineInfo,
-                NameAndDesc const& nameAndDesc );
+    AutoReg
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc );
 
     template<typename C>
-    AutoReg(    void (C::*method)(),
-                char const* className,
-                NameAndDesc const& nameAndDesc,
-                SourceLineInfo const& lineInfo ) {
-        registerTestCase(   new MethodTestCase<C>( method ),
-                            className,
-                            nameAndDesc,
-                            lineInfo );
-    }
+    AutoReg
+        (   void (C::*method)(),
+            char const* className,
+            NameAndDesc const& nameAndDesc,
+            SourceLineInfo const& lineInfo ) {
 
-    void registerTestCase(  ITestCase* testCase,
-                            char const* className,
-                            NameAndDesc const& nameAndDesc,
-                            SourceLineInfo const& lineInfo );
+        registerTestCase
+            (   new MethodTestCase<C>( method ),
+                className,
+                nameAndDesc,
+                lineInfo );
+    }
 
     ~AutoReg();
 
@@ -71,50 +76,70 @@ private:
     void operator= ( AutoReg const& );
 };
 
+void registerTestCaseFunction
+    (   TestFunction function,
+        SourceLineInfo const& lineInfo,
+        NameAndDesc const& nameAndDesc );
+
 } // end namespace Catch
 
 #ifdef CATCH_CONFIG_VARIADIC_MACROS
     ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\
+        static void TestName()
     #define INTERNAL_CATCH_TESTCASE( ... ) \
-        static void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )(); \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME(  ____C_A_T_C_H____T_E_S_T____ ), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\
-        static void INTERNAL_CATCH_UNIQUE_NAME(  ____C_A_T_C_H____T_E_S_T____ )()
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
         namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); }
 
     ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... )\
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
         namespace{ \
-            struct INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) : ClassName{ \
+            struct TestName : ClassName{ \
                 void test(); \
             }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \
         } \
-        void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test()
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) );
 
 #else
     ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \
+        static void TestName(); \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\
+        static void TestName()
     #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \
-        static void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )(); \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME(  ____C_A_T_C_H____T_E_S_T____ ), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\
-        static void INTERNAL_CATCH_UNIQUE_NAME(  ____C_A_T_C_H____T_E_S_T____ )()
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \
         namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); }
 
     ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\
         namespace{ \
-            struct INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) : ClassName{ \
+            struct TestCaseName : ClassName{ \
                 void test(); \
             }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \
         } \
-        void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test()
+        void TestCaseName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc )
 
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) );
 #endif
 
 #endif // TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED

include/internal/catch_test_spec.hpp

@@ -20,7 +20,7 @@
 #include <vector>
 
 namespace Catch {
-    
+
     class TestSpec {
         struct Pattern : SharedImpl<> {
             virtual ~Pattern();
@@ -38,7 +38,7 @@ namespace Catch {
         private:
             WildcardPattern m_wildcardPattern;
         };
-        
+
         class TagPattern : public Pattern {
         public:
             TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
@@ -49,7 +49,7 @@ namespace Catch {
         private:
             std::string m_tag;
         };
-        
+
         class ExcludedPattern : public Pattern {
         public:
             ExcludedPattern( Ptr<Pattern> const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}

include/internal/catch_tostring.h

@@ -67,7 +67,7 @@ std::string toString( std::nullptr_t );
     std::string toString( NSObject* const& nsObject );
 #endif
 
-  
+
 namespace Detail {
 
     extern const std::string unprintableString;
@@ -78,7 +78,7 @@ namespace Detail {
 
     struct TrueType { char sizer[1]; };
     struct FalseType { char sizer[2]; };
-    
+
     TrueType& testStreamable( std::ostream& );
     FalseType testStreamable( FalseType );
 

include/internal/catch_tostring.hpp

@@ -16,7 +16,7 @@ namespace Catch {
 namespace Detail {
 
     const std::string unprintableString = "{?}";
-    
+
     namespace {
         const int hexThreshold = 255;
 
@@ -175,7 +175,7 @@ std::string toString( unsigned long long value ) {
     return oss.str();
 }
 #endif
-    
+
 #ifdef CATCH_CONFIG_CPP11_NULLPTR
 std::string toString( std::nullptr_t ) {
     return "nullptr";

include/internal/catch_version.h

@@ -27,7 +27,7 @@ namespace Catch {
         unsigned int const buildNumber;
 
         friend std::ostream& operator << ( std::ostream& os, Version const& version );
-        
+
     private:
         void operator=( Version const& );
     };

include/internal/catch_version.hpp

@@ -37,7 +37,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 2, 1, "develop", 15 );
+    Version libraryVersion( 1, 5, 4, "", 0 );
 
 }
 

include/internal/catch_wildcard_pattern.hpp

@@ -19,9 +19,9 @@ namespace Catch
             WildcardAtEnd = 2,
             WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
         };
-        
+
     public:
-        
+
         WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity )
         :   m_caseSensitivity( caseSensitivity ),
             m_wildcard( NoWildcard ),
@@ -48,7 +48,7 @@ namespace Catch
                 case WildcardAtBothEnds:
                     return contains( adjustCase( str ), m_pattern );
             }
-            
+
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunreachable-code"

include/internal/catch_xmlwriter.hpp

@@ -22,23 +22,23 @@ namespace Catch {
     class XmlEncode {
     public:
         enum ForWhat { ForTextNodes, ForAttributes };
-        
+
         XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes )
         :   m_str( str ),
             m_forWhat( forWhat )
         {}
-        
+
         void encodeTo( std::ostream& os ) const {
 
             // Apostrophe escaping not necessary if we always use " to write attributes
             // (see: http://www.w3.org/TR/xml/#syntax)
-            
+
             for( std::size_t i = 0; i < m_str.size(); ++ i ) {
                 char c = m_str[i];
                 switch( c ) {
                     case '<':   os << "&lt;"; break;
                     case '&':   os << "&amp;"; break;
-                    
+
                     case '>':
                         // See: http://www.w3.org/TR/xml/#syntax
                         if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' )
@@ -46,14 +46,14 @@ namespace Catch {
                         else
                             os << c;
                         break;
-                        
+
                     case '\"':
                         if( m_forWhat == ForAttributes )
                             os << "&quot;";
                         else
                             os << c;
                         break;
-                        
+
                     default:
                         // Escape control chars - based on contribution by @espenalb in PR #465
                         if ( ( c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' )
@@ -68,12 +68,12 @@ namespace Catch {
             xmlEncode.encodeTo( os );
             return os;
         }
-        
+
     private:
         std::string m_str;
         ForWhat m_forWhat;
     };
-    
+
     class XmlWriter {
     public:
 

include/reporters/catch_reporter_bases.hpp

@@ -166,7 +166,7 @@ namespace Catch {
 
         virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
 
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) {
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
             assert( !m_sectionStack.empty() );
             SectionNode& sectionNode = *m_sectionStack.back();
             sectionNode.assertions.push_back( assertionStats );
@@ -230,18 +230,18 @@ namespace Catch {
         return line;
     }
 
-    
+
     struct TestEventListenerBase : StreamingReporterBase {
         TestEventListenerBase( ReporterConfig const& _config )
         :   StreamingReporterBase( _config )
         {}
-        
+
         virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
-        virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE {
+        virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE {
             return false;
         }
     };
-    
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED

include/reporters/catch_reporter_console.hpp

@@ -349,7 +349,7 @@ namespace Catch {
             if( totals.testCases.total() == 0 ) {
                 stream << Colour( Colour::Warning ) << "No tests ran\n";
             }
-            else if( totals.assertions.total() > 0 && totals.assertions.allPassed() ) {
+            else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) {
                 stream << Colour( Colour::ResultSuccess ) << "All tests passed";
                 stream << " ("
                         << pluralise( totals.assertions.passed, "assertion" ) << " in "

include/reporters/catch_reporter_junit.hpp

@@ -104,7 +104,7 @@ namespace Catch {
             SectionNode const& rootSection = *testCaseNode.children.front();
 
             std::string className = stats.testInfo.className;
-            
+
             if( className.empty() ) {
                 if( rootSection.childSections.empty() )
                     className = "global";
@@ -118,7 +118,7 @@ namespace Catch {
             std::string name = trim( sectionNode.stats.sectionInfo.name );
             if( !rootName.empty() )
                 name = rootName + "/" + name;
-            
+
             if( !sectionNode.assertions.empty() ||
                 !sectionNode.stdOut.empty() ||
                 !sectionNode.stdErr.empty() ) {
@@ -187,7 +187,7 @@ namespace Catch {
                         elementName = "internalError";
                         break;
                 }
-            
+
                 XmlWriter::ScopedElement e = xml.scopedElement( elementName );
 
                 xml.writeAttribute( "message", result.getExpandedExpression() );
@@ -216,7 +216,7 @@ namespace Catch {
         unsigned int unexpectedExceptions;
     };
 
-    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )    
+    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
 
 } // end namespace Catch
 

include/reporters/catch_reporter_multi.hpp

@@ -15,18 +15,18 @@ namespace Catch {
 class MultipleReporters : public SharedImpl<IStreamingReporter> {
     typedef std::vector<Ptr<IStreamingReporter> > Reporters;
     Reporters m_reporters;
-    
+
 public:
     void add( Ptr<IStreamingReporter> const& reporter ) {
         m_reporters.push_back( reporter );
     }
-    
+
 public: // IStreamingReporter
-    
+
     virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
         return m_reporters[0]->getPreferences();
     }
-    
+
     virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
         for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
                 it != itEnd;
@@ -34,7 +34,7 @@ public: // IStreamingReporter
             (*it)->noMatchingTestCases( spec );
     }
 
-    
+
     virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE {
         for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
                 it != itEnd;
@@ -49,7 +49,7 @@ public: // IStreamingReporter
             (*it)->testGroupStarting( groupInfo );
     }
 
-    
+
     virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
         for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
                 it != itEnd;
@@ -64,7 +64,7 @@ public: // IStreamingReporter
             (*it)->sectionStarting( sectionInfo );
     }
 
-    
+
     virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE {
         for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
                 it != itEnd;
@@ -72,7 +72,7 @@ public: // IStreamingReporter
             (*it)->assertionStarting( assertionInfo );
     }
 
-    
+
     // The return value indicates if the messages buffer should be cleared:
     virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
         bool clearBuffer = false;
@@ -111,20 +111,25 @@ public: // IStreamingReporter
             (*it)->testRunEnded( testRunStats );
     }
 
-    
+
     virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
         for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
                 it != itEnd;
                 ++it )
             (*it)->skipTest( testInfo );
     }
+    
+    virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE {
+        return this;
+    }
+    
 };
 
 Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter ) {
     Ptr<IStreamingReporter> resultingReporter;
-    
+
     if( existingReporter ) {
-        MultipleReporters* multi = dynamic_cast<MultipleReporters*>( existingReporter.get() );
+        MultipleReporters* multi = existingReporter->tryAsMulti();
         if( !multi ) {
             multi = new MultipleReporters;
             resultingReporter = Ptr<IStreamingReporter>( multi );
@@ -137,11 +142,11 @@ Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingRepo
     }
     else
         resultingReporter = additionalReporter;
-    
+
     return resultingReporter;
 }
-    
-    
+
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED

include/reporters/catch_reporter_teamcity.hpp

@@ -24,7 +24,7 @@
 #endif
 
 namespace Catch {
-    
+
     struct TeamCityReporter : StreamingReporterBase {
         TeamCityReporter( ReporterConfig const& _config )
         :   StreamingReporterBase( _config ),
@@ -32,7 +32,7 @@ namespace Catch {
         {
             m_reporterPrefs.shouldRedirectStdOut = true;
         }
-        
+
         static std::string escape( std::string const& str ) {
             std::string escaped = str;
             replaceInPlace( escaped, "|", "||" );
@@ -58,9 +58,9 @@ namespace Catch {
                 stream << " message='test skipped because it didn|'t match the test spec'";
             stream << "]\n";
         }
-        
+
         virtual void noMatchingTestCases( std::string const& /* spec */ ) CATCH_OVERRIDE {}
-        
+
         virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
             StreamingReporterBase::testGroupStarting( groupInfo );
             stream << "##teamcity[testSuiteStarted name='"
@@ -72,21 +72,21 @@ namespace Catch {
                 << escape( testGroupStats.groupInfo.name ) << "']\n";
         }
 
-        
+
         virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {
         }
-        
+
         virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
             AssertionResult const& result = assertionStats.assertionResult;
             if( !result.isOk() ) {
-                
+
                 std::ostringstream msg;
                 if( !m_headerPrintedForThisSection )
                     printSectionHeader( msg );
                 m_headerPrintedForThisSection = true;
-                
+
                 msg << result.getSourceInfo() << "\n";
-                
+
                 switch( result.getResultType() ) {
                     case ResultWas::ExpressionFailed:
                         msg << "expression failed";
@@ -125,15 +125,15 @@ namespace Catch {
                     it != itEnd;
                     ++it )
                     msg << "\n  \"" << it->message << "\"";
-                
-                
+
+
                 if( result.hasExpression() ) {
                     msg <<
                         "\n  " << result.getExpressionInMacro() << "\n"
                         "with expansion:\n" <<
                         "  " << result.getExpandedExpression() << "\n";
                 }
-                
+
                 stream << "##teamcity[testFailed"
                     << " name='" << escape( currentTestCaseInfo->name )<< "'"
                     << " message='" << escape( msg.str() ) << "'"
@@ -141,7 +141,7 @@ namespace Catch {
             }
             return true;
         }
-        
+
         virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
             m_headerPrintedForThisSection = false;
             StreamingReporterBase::sectionStarting( sectionInfo );
@@ -152,7 +152,7 @@ namespace Catch {
             stream << "##teamcity[testStarted name='"
                 << escape( testInfo.name ) << "']\n";
         }
-        
+
         virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
             StreamingReporterBase::testCaseEnded( testCaseStats );
             if( !testCaseStats.stdOut.empty() )
@@ -181,9 +181,9 @@ namespace Catch {
                     printHeaderString( os, it->name );
                 os << getLineOfChars<'-'>() << "\n";
             }
-            
+
             SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
-            
+
             if( !lineInfo.empty() )
                 os << lineInfo << "\n";
             os << getLineOfChars<'.'>() << "\n\n";
@@ -203,15 +203,15 @@ namespace Catch {
         }
     private:
         bool m_headerPrintedForThisSection;
-        
+
     };
-    
+
 #ifdef CATCH_IMPL
     TeamCityReporter::~TeamCityReporter() {}
 #endif
-    
+
     INTERNAL_CATCH_REGISTER_REPORTER( "teamcity", TeamCityReporter )
-    
+
 } // end namespace Catch
 
 #ifdef __clang__

include/reporters/catch_reporter_xml.hpp

@@ -26,7 +26,7 @@ namespace Catch {
         }
 
         virtual ~XmlReporter() CATCH_OVERRIDE;
-        
+
         static std::string getDescription() {
             return "Reports test results as an XML document";
         }
@@ -72,7 +72,7 @@ namespace Catch {
 
         virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
             const AssertionResult& assertionResult = assertionStats.assertionResult;
-                
+
             // Print any info messages in <Info> tags.
             if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
                 for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
@@ -134,10 +134,10 @@ namespace Catch {
                 default:
                     break;
             }
-            
+
             if( assertionResult.hasExpression() )
                 m_xml.endElement();
-                
+
             return true;
         }
 
@@ -176,7 +176,7 @@ namespace Catch {
                 .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
             m_xml.endElement();
         }
-        
+
         virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
             StreamingReporterBase::testRunEnded( testRunStats );
             m_xml.scopedElement( "OverallResults" )

projects/CMake/CMakeLists.txt

@@ -22,7 +22,7 @@ set(SOURCES
     ${SELF_TEST_DIR}/GeneratorTests.cpp
     ${SELF_TEST_DIR}/MessageTests.cpp
     ${SELF_TEST_DIR}/MiscTests.cpp
-    ${SELF_TEST_DIR}/SectionTrackerTests.cpp
+    ${SELF_TEST_DIR}/PartTrackerTests.cpp
     ${SELF_TEST_DIR}/TestMain.cpp
     ${SELF_TEST_DIR}/TrickyTests.cpp
     ${SELF_TEST_DIR}/VariadicMacrosTests.cpp

projects/SelfTest/ApproxTests.cpp

@@ -16,7 +16,7 @@ TEST_CASE
 )
 {
     double d = 1.23;
-    
+
     REQUIRE( d == Approx( 1.23 ) );
     REQUIRE( d != Approx( 1.22 ) );
     REQUIRE( d != Approx( 1.24 ) );
@@ -34,7 +34,7 @@ TEST_CASE
  )
 {
     double d = 1.23;
-    
+
     REQUIRE( d != Approx( 1.231 ) );
     REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) );
 }
@@ -71,7 +71,7 @@ TEST_CASE
     const double dZero = 0;
     const double dSmall = 0.00001;
     const double dMedium = 1.234;
-    
+
     REQUIRE( 1.0f == Approx( 1 ) );
     REQUIRE( 0 == Approx( dZero) );
     REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) );
@@ -87,14 +87,14 @@ TEST_CASE
 )
 {
     double d = 1.23;
-    
+
     Approx approx = Approx::custom().epsilon( 0.005 );
-    
+
     REQUIRE( d == approx( 1.23 ) );
     REQUIRE( d == approx( 1.22 ) );
     REQUIRE( d == approx( 1.24 ) );
     REQUIRE( d != approx( 1.25 ) );
-    
+
     REQUIRE( approx( d ) == 1.23 );
     REQUIRE( approx( d ) == 1.22 );
     REQUIRE( approx( d ) == 1.24 );

projects/SelfTest/BDDTests.cpp

@@ -30,13 +30,13 @@ SCENARIO( "Vector resizing affects size and capacity", "[vector][bdd][size][capa
     GIVEN( "an empty vector" ) {
         std::vector<int> v;
         REQUIRE( v.size() == 0 );
-        
+
         WHEN( "it is made larger" ) {
             v.resize( 10 );
             THEN( "the size and capacity go up" ) {
                 REQUIRE( v.size() == 10 );
                 REQUIRE( v.capacity() >= 10 );
-                
+
                 AND_WHEN( "it is made smaller again" ) {
                     v.resize( 5 );
                     THEN( "the size goes down but the capacity stays the same" ) {
@@ -46,7 +46,7 @@ SCENARIO( "Vector resizing affects size and capacity", "[vector][bdd][size][capa
                 }
             }
         }
-        
+
         WHEN( "we reserve more space" ) {
             v.reserve( 10 );
             THEN( "The capacity is increased but the size remains the same" ) {
@@ -76,19 +76,19 @@ struct Fixture
     : d_counter(0)
     {
     }
-    
+
     int counter()
     {
         return d_counter++;
     }
-    
+
     int d_counter;
 };
-    
+
 }
 
 SCENARIO_METHOD(Fixture,
-	"BDD tests requiring Fixtures to provide commonly-accessed data or methods", 
+	"BDD tests requiring Fixtures to provide commonly-accessed data or methods",
 	"[bdd][fixtures]") {
     const int before(counter());
 	GIVEN("No operations precede me") {

projects/SelfTest/Baselines/console.std.approved.txt

@@ -356,7 +356,7 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-Unexpected custom exceptions can be translated
+Non-std exceptions can be translated
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
@@ -365,6 +365,16 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
+
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for nothrow
 -------------------------------------------------------------------------------
@@ -494,27 +504,7 @@ explicitly with message:
   Message from section two
 
 Message from section one
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'one'
-
 Message from section two
--------------------------------------------------------------------------------
-Standard output from all sections is reported
-  two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'two'
-
 -------------------------------------------------------------------------------
 SCOPED_INFO is reset for each loop
 -------------------------------------------------------------------------------
@@ -690,7 +680,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() Contains( "not there" ) )
+  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
 
@@ -701,7 +691,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
+  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
 
@@ -712,7 +702,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
+  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
 
@@ -723,10 +713,33 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() Equals( "something else" ) )
+  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
 
+-------------------------------------------------------------------------------
+Matchers can be composed with both && and || - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "random" )
+
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
+with expansion:
+  "this string contains 'abc' as a substring" not contains: "substring"
+
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
@@ -817,6 +830,6 @@ with expansion:
   "first" == "second"
 
 ===============================================================================
-test cases: 159 | 118 passed | 40 failed |  1 failed as expected
-assertions: 907 | 812 passed | 82 failed | 13 failed as expected
+test cases: 168 | 124 passed | 42 failed |  2 failed as expected
+assertions: 920 | 824 passed | 78 failed | 18 failed as expected
 

projects/SelfTest/Baselines/console.sw.approved.txt

@@ -1217,7 +1217,7 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-Unexpected custom exceptions can be translated
+Non-std exceptions can be translated
 -------------------------------------------------------------------------------
 ExceptionTests.cpp:<line number>
 ...............................................................................
@@ -1226,6 +1226,16 @@ ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
+-------------------------------------------------------------------------------
+Custom std-exceptions can be custom translated
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:<line number>
+...............................................................................
+
+ExceptionTests.cpp:<line number>: FAILED:
+due to unexpected exception with message:
+  custom std exception
+
 -------------------------------------------------------------------------------
 Custom exceptions can be translated when testing for nothrow
 -------------------------------------------------------------------------------
@@ -2770,7 +2780,27 @@ explicitly with message:
   Message from section two
 
 Message from section one
+-------------------------------------------------------------------------------
+Standard output from all sections is reported
+  one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'one'
+
 Message from section two
+-------------------------------------------------------------------------------
+Standard output from all sections is reported
+  two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'two'
+
 -------------------------------------------------------------------------------
 SCOPED_INFO is reset for each loop
 -------------------------------------------------------------------------------
@@ -3274,25 +3304,25 @@ MiscTests.cpp:<line number>
 
 MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
+  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" ) )
+  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" ) )
+  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" ) )
+  CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "substring"
 
@@ -3303,7 +3333,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() Contains( "not there" ) )
+  CHECK_THAT( testStringForMatching(), Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
 
@@ -3314,7 +3344,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
+  CHECK_THAT( testStringForMatching(), StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
 
@@ -3325,7 +3355,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
+  CHECK_THAT( testStringForMatching(), EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
 
@@ -3336,7 +3366,7 @@ MiscTests.cpp:<line number>
 ...............................................................................
 
 MiscTests.cpp:<line number>: FAILED:
-  CHECK_THAT( testStringForMatching() Equals( "something else" ) )
+  CHECK_THAT( testStringForMatching(), Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
 
@@ -3348,7 +3378,7 @@ MiscTests.cpp:<line number>
 
 MiscTests.cpp:<line number>:
 PASSED:
-  REQUIRE_THAT( "" Equals(nullptr) )
+  REQUIRE_THAT( "", Equals(nullptr) )
 with expansion:
   "" equals: ""
 
@@ -3360,7 +3390,7 @@ MiscTests.cpp:<line number>
 
 MiscTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
+  CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
 with expansion:
   "this string contains 'abc' as a substring" ( contains: "string" and
   contains: "abc" )
@@ -3373,14 +3403,14 @@ MiscTests.cpp:<line number>
 
 MiscTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
+  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" ) ) )
+  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" )
@@ -3393,11 +3423,92 @@ MiscTests.cpp:<line number>
 
 MiscTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) )
+  CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "this string contains
   'abc' as a substring"
 
+-------------------------------------------------------------------------------
+Matchers can be (AllOf) composed with the && operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string" and
+  contains: "abc" and contains: "substring" and contains: "contains" )
+
+-------------------------------------------------------------------------------
+Matchers can be (AnyOf) composed with the || operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( contains: "string" or contains:
+  "different" or contains: "random" )
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) )
+with expansion:
+  "some completely different text that contains one common word" ( contains:
+  "string" or contains: "different" or contains: "random" )
+
+-------------------------------------------------------------------------------
+Matchers can be composed with both && and ||
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "substring" )
+
+-------------------------------------------------------------------------------
+Matchers can be composed with both && and || - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) )
+with expansion:
+  "this string contains 'abc' as a substring" ( ( contains: "string" or
+  contains: "different" ) and contains: "random" )
+
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+  CHECK_THAT( testStringForMatching(), !Contains( "different" ) )
+with expansion:
+  "this string contains 'abc' as a substring" not contains: "different"
+
+-------------------------------------------------------------------------------
+Matchers can be negated (Not) with the ! operator - failing
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>: FAILED:
+  CHECK_THAT( testStringForMatching(), !Contains( "substring" ) )
+with expansion:
+  "this string contains 'abc' as a substring" not contains: "substring"
+
 -------------------------------------------------------------------------------
 Factorials are computed
 -------------------------------------------------------------------------------
@@ -3840,6 +3951,17 @@ with expansion:
   ==
   9223372036854775807 (0x<hex digits>)
 
+-------------------------------------------------------------------------------
+This test 'should' fail but doesn't
+-------------------------------------------------------------------------------
+MiscTests.cpp:<line number>
+...............................................................................
+
+MiscTests.cpp:<line number>:
+PASSED:
+with message:
+  oops!
+
 -------------------------------------------------------------------------------
 Process can be configured on command line
   default - no arguments
@@ -4113,7 +4235,7 @@ TestMain.cpp:<line number>
 
 TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) )
 with expansion:
   "Value after -x or --abortAfter must be greater than zero
   - while parsing: (-x, --abortx <no. failures>)" contains: "greater than zero"
@@ -4128,7 +4250,7 @@ TestMain.cpp:<line number>
 
 TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) )
+  REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) )
 with expansion:
   "Unable to convert oops to destination type
   - while parsing: (-x, --abortx <no. failures>)" contains: "-x"
@@ -4237,8 +4359,8 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Process can be configured on command line
-  force-colour
-  --force-colour
+  use-colour
+  without option
 -------------------------------------------------------------------------------
 TestMain.cpp:<line number>
 ...............................................................................
@@ -4249,14 +4371,14 @@ PASSED:
 
 TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( config.forceColour )
+  REQUIRE( config.useColour == UseColour::Auto )
 with expansion:
-  true
+  0 == 0
 
 -------------------------------------------------------------------------------
 Process can be configured on command line
-  force-colour
-  without --force-colour
+  use-colour
+  auto
 -------------------------------------------------------------------------------
 TestMain.cpp:<line number>
 ...............................................................................
@@ -4267,9 +4389,57 @@ PASSED:
 
 TestMain.cpp:<line number>:
 PASSED:
-  REQUIRE( !config.forceColour )
+  REQUIRE( config.useColour == UseColour::Auto )
 with expansion:
-  true
+  0 == 0
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  yes
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::Yes )
+with expansion:
+  1 == 1
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  no
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  CHECK_NOTHROW( parseIntoConfig( argv, config ) )
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE( config.useColour == UseColour::No )
+with expansion:
+  2 == 2
+
+-------------------------------------------------------------------------------
+Process can be configured on command line
+  use-colour
+  error
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+  REQUIRE_THROWS_WITH( parseIntoConfig( argv, config ), Contains( "colour mode must be one of" ) )
 
 -------------------------------------------------------------------------------
 Long strings can be wrapped
@@ -4889,7 +5059,7 @@ TestMain.cpp:<line number>
 
 TestMain.cpp:<line number>:
 PASSED:
-  CHECK_THAT( t.toString() EndsWith( "... message truncated due to excessive size" ) )
+  CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) )
 with expansion:
   "***************************************************************************-
   ***-
@@ -5893,6 +6063,17 @@ with expansion:
   ************************
 ... message truncated due to excessive size
 
+-------------------------------------------------------------------------------
+ManuallyRegistered
+-------------------------------------------------------------------------------
+TestMain.cpp:<line number>
+...............................................................................
+
+TestMain.cpp:<line number>:
+PASSED:
+with message:
+  was called
+
 -------------------------------------------------------------------------------
 Parsing a std::pair
 -------------------------------------------------------------------------------
@@ -8661,7 +8842,7 @@ TagAliasTests.cpp:<line number>
 
 TagAliasTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what Contains( "[@zzz]" ) )
+  CHECK_THAT( what, Contains( "[@zzz]" ) )
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   First seen at file:2
@@ -8670,7 +8851,7 @@ with expansion:
 
 TagAliasTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what Contains( "file" ) )
+  CHECK_THAT( what, Contains( "file" ) )
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   First seen at file:2
@@ -8679,7 +8860,7 @@ with expansion:
 
 TagAliasTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what Contains( "2" ) )
+  CHECK_THAT( what, Contains( "2" ) )
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   First seen at file:2
@@ -8688,7 +8869,7 @@ with expansion:
 
 TagAliasTests.cpp:<line number>:
 PASSED:
-  CHECK_THAT( what Contains( "10" ) )
+  CHECK_THAT( what, Contains( "10" ) )
 with expansion:
   "error: tag alias, "[@zzz]" already registered.
   First seen at file:2
@@ -8923,6 +9104,6 @@ with expansion:
   1 > 0
 
 ===============================================================================
-test cases: 159 | 119 passed | 39 failed |  1 failed as expected
-assertions: 905 | 812 passed | 80 failed | 13 failed as expected
+test cases: 168 | 123 passed | 43 failed |  2 failed as expected
+assertions: 922 | 824 passed | 80 failed | 18 failed as expected
 

projects/SelfTest/Baselines/console.swa4.approved.txt

@@ -485,7 +485,131 @@ ConditionTests.cpp:<line number>: FAILED:
 with expansion:
   9.1f != Approx( 9.1000003815 )
 
-===============================================================================
-test cases: 19 | 15 passed | 3 failed | 1 failed as expected
-assertions: 62 | 56 passed | 4 failed | 2 failed as expected
+-------------------------------------------------------------------------------
+Ordering comparison checks that should succeed
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven < 8 )
+with expansion:
+  7 < 8
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > 6 )
+with expansion:
+  7 > 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > 0 )
+with expansion:
+  7 > 0
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven > -1 )
+with expansion:
+  7 > -1
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven >= 7 )
+with expansion:
+  7 >= 7
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven >= 6 )
+with expansion:
+  7 >= 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven <= 7 )
+with expansion:
+  7 <= 7
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven <= 8 )
+with expansion:
+  7 <= 8
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one > 9 )
+with expansion:
+  9.1f > 9
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 10 )
+with expansion:
+  9.1f < 10
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one < 9.2 )
+with expansion:
+  9.1f < 9.2
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello <= "hello" )
+with expansion:
+  "hello" <= "hello"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello >= "hello" )
+with expansion:
+  "hello" >= "hello"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello < "hellp" )
+with expansion:
+  "hello" < "hellp"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello < "zebra" )
+with expansion:
+  "hello" < "zebra"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello > "hellm" )
+with expansion:
+  "hello" > "hellm"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello > "a" )
+with expansion:
+  "hello" > "a"
+
+-------------------------------------------------------------------------------
+Ordering comparison checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven > 7 )
+with expansion:
+  7 > 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven < 7 )
+with expansion:
+  7 < 7
+
+===============================================================================
+test cases: 21 | 16 passed | 3 failed | 2 failed as expected
+assertions: 81 | 73 passed | 4 failed | 4 failed as expected
 

projects/SelfTest/Baselines/junit.sw.approved.txt

@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite name="CatchSelfTest" errors="12" failures="68" tests="905" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite name="CatchSelfTest" errors="13" failures="68" tests="923" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="toString(enum)" time="{duration}"/>
     <testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
     <testcase classname="global" name="toString(enum class)" time="{duration}"/>
@@ -226,9 +226,15 @@ expected exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
-    <testcase classname="global" name="Unexpected custom exceptions can be translated" time="{duration}">
+    <testcase classname="global" name="Non-std exceptions can be translated" time="{duration}">
       <error type="TEST_CASE">
 custom exception
+ExceptionTests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="global" name="Custom std-exceptions can be custom translated" time="{duration}">
+      <error type="TEST_CASE">
+custom std exception
 ExceptionTests.cpp:<line number>
       </error>
     </testcase>
@@ -438,6 +444,20 @@ MiscTests.cpp:<line number>
     <testcase classname="global" name="AllOf matcher" time="{duration}"/>
     <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
     <testcase classname="global" name="Equals" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be (AllOf) composed with the &amp;&amp; operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be (AnyOf) composed with the || operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and ||" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and || - failing" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; ( ( contains: &quot;string&quot; or contains: &quot;different&quot; ) and contains: &quot;random&quot; )" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
+    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be negated (Not) with the ! operator - failing" time="{duration}">
+      <failure message="&quot;this string contains 'abc' as a substring&quot; not contains: &quot;substring&quot;" type="CHECK_THAT">
+MiscTests.cpp:<line number>
+      </failure>
+    </testcase>
     <testcase classname="global" name="Factorials are computed" time="{duration}"/>
     <testcase classname="global" name="Nice descriptive name" time="{duration}"/>
     <testcase classname="vectors can be sized and resized" name="root" time="{duration}"/>
@@ -479,6 +499,7 @@ MiscTests.cpp:<line number>
     <testcase classname="XmlEncode" name="string with control char (1)" time="{duration}"/>
     <testcase classname="XmlEncode" name="string with control char (x7F)" time="{duration}"/>
     <testcase classname="global" name="long long" time="{duration}"/>
+    <testcase classname="global" name="This test 'should' fail but doesn't" time="{duration}"/>
     <testcase classname="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}"/>
@@ -498,8 +519,11 @@ MiscTests.cpp:<line number>
     <testcase classname="Process can be configured on command line" name="output filename/-o filename" time="{duration}"/>
     <testcase classname="Process can be configured on command line" name="output filename/--out" time="{duration}"/>
     <testcase classname="Process can be configured on command line" name="combinations/Single character flags can be combined" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="force-colour/--force-colour" time="{duration}"/>
-    <testcase classname="Process can be configured on command line" name="force-colour/without --force-colour" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/without option" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/auto" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/yes" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/no" time="{duration}"/>
+    <testcase classname="Process can be configured on command line" name="use-colour/error" time="{duration}"/>
     <testcase classname="Long strings can be wrapped" name="plain string/No wrapping" time="{duration}"/>
     <testcase classname="Long strings can be wrapped" name="plain string/Wrapped once" time="{duration}"/>
     <testcase classname="Long strings can be wrapped" name="plain string/Wrapped twice" time="{duration}"/>
@@ -527,6 +551,7 @@ hello
     </testcase>
     <testcase classname="global" name="Text can be formatted using the Text class" time="{duration}"/>
     <testcase classname="global" name="Long text is truncted" time="{duration}"/>
+    <testcase classname="global" name="ManuallyRegistered" time="{duration}"/>
     <testcase classname="global" name="Parsing a std::pair" time="{duration}"/>
     <testcase classname="global" name="Where there is more to the expression after the RHS" time="{duration}"/>
     <testcase classname="global" name="Where the LHS is not a simple value" time="{duration}"/>

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -665,7 +665,7 @@
           5 != 5
         </Expanded>
       </Expression>
-      <OverallResult success="false"/>
+      <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Ordering comparison checks that should succeed">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" >
@@ -1545,12 +1545,18 @@
     <TestCase name="When unchecked exceptions are thrown, but caught, they do not affect the test">
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Unexpected custom exceptions can be translated">
+    <TestCase name="Non-std exceptions can be translated">
       <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
         custom exception
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
+    <TestCase name="Custom std-exceptions can be custom translated">
+      <Exception filename="projects/SelfTest/ExceptionTests.cpp" >
+        custom std exception
+      </Exception>
+      <OverallResult success="false"/>
+    </TestCase>
     <TestCase name="Custom exceptions can be translated when testing for nothrow">
       <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" >
         <Original>
@@ -2949,12 +2955,12 @@
     </TestCase>
     <TestCase name="Standard output from all sections is reported">
       <Section name="one">
-        <OverallResults successes="0" failures="0" expectedFailures="0"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="two">
-        <OverallResults successes="0" failures="0" expectedFailures="0"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
-      <OverallResult success="true"/>
+      <OverallResult success="false"/>
     </TestCase>
     <TestCase name="SCOPED_INFO is reset for each loop">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
@@ -3462,7 +3468,7 @@
     <TestCase name="String matchers">
       <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() Contains( "string" )
+          testStringForMatching(), Contains( "string" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" contains: "string"
@@ -3470,7 +3476,7 @@
       </Expression>
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() Contains( "abc" )
+          testStringForMatching(), Contains( "abc" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" contains: "abc"
@@ -3478,7 +3484,7 @@
       </Expression>
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() StartsWith( "this" )
+          testStringForMatching(), StartsWith( "this" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" starts with: "this"
@@ -3486,7 +3492,7 @@
       </Expression>
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() EndsWith( "substring" )
+          testStringForMatching(), EndsWith( "substring" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" ends with: "substring"
@@ -3497,7 +3503,7 @@
     <TestCase name="Contains string matcher">
       <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() Contains( "not there" )
+          testStringForMatching(), Contains( "not there" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" contains: "not there"
@@ -3508,7 +3514,7 @@
     <TestCase name="StartsWith string matcher">
       <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() StartsWith( "string" )
+          testStringForMatching(), StartsWith( "string" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" starts with: "string"
@@ -3519,7 +3525,7 @@
     <TestCase name="EndsWith string matcher">
       <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() EndsWith( "this" )
+          testStringForMatching(), EndsWith( "this" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" ends with: "this"
@@ -3530,7 +3536,7 @@
     <TestCase name="Equals string matcher">
       <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() Equals( "something else" )
+          testStringForMatching(), Equals( "something else" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" equals: "something else"
@@ -3541,7 +3547,7 @@
     <TestCase name="Equals string matcher, with NULL">
       <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          "" Equals(nullptr)
+          "", Equals(nullptr)
         </Original>
         <Expanded>
           "" equals: ""
@@ -3552,7 +3558,7 @@
     <TestCase name="AllOf matcher">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
+          testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" )
@@ -3563,7 +3569,7 @@
     <TestCase name="AnyOf matcher">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
+          testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" )
@@ -3571,7 +3577,7 @@
       </Expression>
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
+          testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" )
@@ -3582,7 +3588,7 @@
     <TestCase name="Equals">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
-          testStringForMatching() Equals( "this string contains 'abc' as a substring" )
+          testStringForMatching(), Equals( "this string contains 'abc' as a substring" )
         </Original>
         <Expanded>
           "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring"
@@ -3590,6 +3596,80 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Matchers can be (AnyOf) composed with the || operator">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
+        </Expanded>
+      </Expression>
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" )
+        </Original>
+        <Expanded>
+          "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Matchers can be composed with both &amp;&amp; and ||">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" )
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing">
+      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
+    <TestCase name="Matchers can be negated (Not) with the ! operator">
+      <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), !Contains( "different" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" not contains: "different"
+        </Expanded>
+      </Expression>
+      <OverallResult success="true"/>
+    </TestCase>
+    <TestCase name="Matchers can be negated (Not) with the ! operator - failing">
+      <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
+        <Original>
+          testStringForMatching(), !Contains( "substring" )
+        </Original>
+        <Expanded>
+          "this string contains 'abc' as a substring" not contains: "substring"
+        </Expanded>
+      </Expression>
+      <OverallResult success="false"/>
+    </TestCase>
     <TestCase name="Factorials are computed">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
@@ -4005,6 +4085,9 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="This test 'should' fail but doesn't">
+      <OverallResult success="false"/>
+    </TestCase>
     <TestCase name="Process can be configured on command line">
       <Section name="default - no arguments">
         <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
@@ -4335,7 +4418,7 @@
         <Section name="-x must be greater than zero">
           <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
-              parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" )
+              parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" )
             </Original>
             <Expanded>
               "Value after -x or --abortAfter must be greater than zero
@@ -4350,7 +4433,7 @@
         <Section name="-x must be numeric">
           <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
-              parseIntoConfigAndReturnError( argv, config ) Contains( "-x" )
+              parseIntoConfigAndReturnError( argv, config ), Contains( "-x" )
             </Original>
             <Expanded>
               "Unable to convert oops to destination type
@@ -4487,8 +4570,8 @@
         </Section>
         <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="force-colour">
-        <Section name="--force-colour">
+      <Section name="use-colour">
+        <Section name="without option">
           <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
@@ -4499,18 +4582,18 @@
           </Expression>
           <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
-              config.forceColour
+              config.useColour == UseColour::Auto
             </Original>
             <Expanded>
-              true
+              0 == 0
             </Expanded>
           </Expression>
           <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
-      <Section name="force-colour">
-        <Section name="without --force-colour">
+      <Section name="use-colour">
+        <Section name="auto">
           <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
               parseIntoConfig( argv, config )
@@ -4521,16 +4604,74 @@
           </Expression>
           <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
             <Original>
-              !config.forceColour
+              config.useColour == UseColour::Auto
             </Original>
             <Expanded>
-              true
+              0 == 0
             </Expanded>
           </Expression>
           <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
         <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
+      <Section name="use-colour">
+        <Section name="yes">
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.useColour == UseColour::Yes
+            </Original>
+            <Expanded>
+              1 == 1
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="use-colour">
+        <Section name="no">
+          <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config )
+            </Expanded>
+          </Expression>
+          <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" >
+            <Original>
+              config.useColour == UseColour::No
+            </Original>
+            <Expanded>
+              2 == 2
+            </Expanded>
+          </Expression>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      </Section>
+      <Section name="use-colour">
+        <Section name="error">
+          <Expression success="true" type="REQUIRE_THROWS_WITH" filename="projects/SelfTest/TestMain.cpp" >
+            <Original>
+              parseIntoConfig( argv, config ), Contains( "colour mode must be one of" )
+            </Original>
+            <Expanded>
+              parseIntoConfig( argv, config ), Contains( "colour mode must be one of" )
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
+        </Section>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
+      </Section>
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="Long strings can be wrapped">
@@ -5196,7 +5337,7 @@ there"
     <TestCase name="Long text is truncted">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" >
         <Original>
-          t.toString() EndsWith( "... message truncated due to excessive size" )
+          t.toString(), EndsWith( "... message truncated due to excessive size" )
         </Original>
         <Expanded>
           "******************************************************************************-
@@ -6204,6 +6345,9 @@ there"
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="ManuallyRegistered">
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="Parsing a std::pair">
       <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" >
         <Original>
@@ -9171,7 +9315,7 @@ there"
       <Section name="The same tag alias can only be registered once">
         <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
           <Original>
-            what Contains( "[@zzz]" )
+            what, Contains( "[@zzz]" )
           </Original>
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
@@ -9181,7 +9325,7 @@ there"
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
           <Original>
-            what Contains( "file" )
+            what, Contains( "file" )
           </Original>
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
@@ -9191,7 +9335,7 @@ there"
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
           <Original>
-            what Contains( "2" )
+            what, Contains( "2" )
           </Original>
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
@@ -9201,7 +9345,7 @@ there"
         </Expression>
         <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" >
           <Original>
-            what Contains( "10" )
+            what, Contains( "10" )
           </Original>
           <Expanded>
             "error: tag alias, "[@zzz]" already registered.
@@ -9422,7 +9566,7 @@ there"
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="812" failures="80" expectedFailures="13"/>
+    <OverallResults successes="824" failures="81" expectedFailures="18"/>
   </Group>
-  <OverallResults successes="812" failures="80" expectedFailures="13"/>
+  <OverallResults successes="824" failures="80" expectedFailures="18"/>
 </Catch>

projects/SelfTest/ClassTests.cpp

@@ -13,18 +13,18 @@ namespace
     class TestClass
     {
         std::string s;
-        
+
     public:
         TestClass()
         : s( "hello" )
         {}
-        
+
         void succeedingCase()
-        {            
+        {
             REQUIRE( s == "hello" );
         }
         void failingCase()
-        {            
+        {
             REQUIRE( s == "world" );
         }
     };
@@ -38,20 +38,20 @@ METHOD_AS_TEST_CASE( TestClass::failingCase, "A METHOD_AS_TEST_CASE based test r
 struct Fixture
 {
     Fixture() : m_a( 1 ) {}
-    
+
     int m_a;
 };
 
 TEST_CASE_METHOD( Fixture, "A TEST_CASE_METHOD based test run that succeeds", "[class]" )
-{   
-    REQUIRE( m_a == 1 );        
+{
+    REQUIRE( m_a == 1 );
 }
 
 // We should be able to write our tests within a different namespace
 namespace Inner
 {
     TEST_CASE_METHOD( Fixture, "A TEST_CASE_METHOD based test run that fails", "[.][class][failing]" )
-    {   
-        REQUIRE( m_a == 2 );        
+    {
+        REQUIRE( m_a == 2 );
     }
 }

projects/SelfTest/ConditionTests.cpp

@@ -22,7 +22,7 @@ struct TestData {
         float_nine_point_one( 9.1f ),
         double_pi( 3.1415926535 )
     {}
-    
+
     int int_seven;
     std::string str_hello;
     float float_nine_point_one;
@@ -37,7 +37,7 @@ struct TestDef {
     TestDef& operator[]( const std::string& ) {
         return *this;
     }
-    
+
 };
 
 // The "failing" tests all use the CHECK macro, which continues if the specific test fails.
@@ -49,14 +49,14 @@ TEST_CASE( "Equality checks that should succeed", "" )
 
     TestDef td;
     td + "hello" + "hello";
-    
+
     TestData data;
-    
+
     REQUIRE( data.int_seven == 7 );
     REQUIRE( data.float_nine_point_one == Approx( 9.1f ) );
     REQUIRE( data.double_pi == Approx( 3.1415926535 ) );
     REQUIRE( data.str_hello == "hello" );
-    REQUIRE( "hello" == data.str_hello );    
+    REQUIRE( "hello" == data.str_hello );
     REQUIRE( data.str_hello.size() == 5 );
 
     double x = 1.1 + 0.1 + 0.1;
@@ -66,7 +66,7 @@ TEST_CASE( "Equality checks that should succeed", "" )
 TEST_CASE( "Equality checks that should fail", "[.][failing][!mayfail]" )
 {
     TestData data;
-    
+
     CHECK( data.int_seven == 6 );
     CHECK( data.int_seven == 8 );
     CHECK( data.int_seven == 0 );
@@ -87,7 +87,7 @@ TEST_CASE( "Equality checks that should fail", "[.][failing][!mayfail]" )
 TEST_CASE( "Inequality checks that should succeed", "" )
 {
     TestData data;
-    
+
     REQUIRE( data.int_seven != 6 );
     REQUIRE( data.int_seven != 8 );
     REQUIRE( data.float_nine_point_one != Approx( 9.11f ) );
@@ -101,10 +101,10 @@ TEST_CASE( "Inequality checks that should succeed", "" )
     REQUIRE( data.str_hello.size() != 6 );
 }
 
-TEST_CASE( "Inequality checks that should fail", "[.][failing]" )
+TEST_CASE( "Inequality checks that should fail", "[.][failing][!shouldfail]" )
 {
     TestData data;
-    
+
     CHECK( data.int_seven != 7 );
     CHECK( data.float_nine_point_one != Approx( 9.1f ) );
     CHECK( data.double_pi != Approx( 3.1415926535 ) );
@@ -116,7 +116,7 @@ TEST_CASE( "Inequality checks that should fail", "[.][failing]" )
 TEST_CASE( "Ordering comparison checks that should succeed", "" )
 {
     TestData data;
-    
+
     REQUIRE( data.int_seven < 8 );
     REQUIRE( data.int_seven > 6 );
     REQUIRE( data.int_seven > 0 );
@@ -126,14 +126,14 @@ TEST_CASE( "Ordering comparison checks that should succeed", "" )
     REQUIRE( data.int_seven >= 6 );
     REQUIRE( data.int_seven <= 7 );
     REQUIRE( data.int_seven <= 8 );
-    
+
     REQUIRE( data.float_nine_point_one > 9 );
     REQUIRE( data.float_nine_point_one < 10 );
     REQUIRE( data.float_nine_point_one < 9.2 );
-    
+
     REQUIRE( data.str_hello <= "hello" );
     REQUIRE( data.str_hello >= "hello" );
-    
+
     REQUIRE( data.str_hello < "hellp" );
     REQUIRE( data.str_hello < "zebra" );
     REQUIRE( data.str_hello > "hellm" );
@@ -143,7 +143,7 @@ TEST_CASE( "Ordering comparison checks that should succeed", "" )
 TEST_CASE( "Ordering comparison checks that should fail", "[.][failing]" )
 {
     TestData data;
-    
+
     CHECK( data.int_seven > 7 );
     CHECK( data.int_seven < 7 );
     CHECK( data.int_seven > 8 );
@@ -153,11 +153,11 @@ TEST_CASE( "Ordering comparison checks that should fail", "[.][failing]" )
 
     CHECK( data.int_seven >= 8 );
     CHECK( data.int_seven <= 6 );
-    
+
     CHECK( data.float_nine_point_one < 9 );
     CHECK( data.float_nine_point_one > 10 );
     CHECK( data.float_nine_point_one > 9.2 );
-    
+
     CHECK( data.str_hello > "hello" );
     CHECK( data.str_hello < "hello" );
     CHECK( data.str_hello > "hellp" );
@@ -178,7 +178,7 @@ TEST_CASE( "Comparisons with int literals don't warn when mixing signed/ unsigne
     unsigned long ul = 4;
     char c = 5;
     unsigned char uc = 6;
-    
+
     REQUIRE( i == 1 );
     REQUIRE( ui == 2 );
     REQUIRE( l == 3 );
@@ -215,7 +215,7 @@ TEST_CASE( "comparisons between int variables", "" )
 	unsigned short	unsigned_short_var = 1;
 	unsigned int	unsigned_int_var = 1;
 	unsigned long	unsigned_long_var = 1L;
-    
+
 	REQUIRE( long_var == unsigned_char_var );
 	REQUIRE( long_var == unsigned_short_var );
 	REQUIRE( long_var == unsigned_int_var );
@@ -252,7 +252,7 @@ template<typename T>
 struct Ex
 {
     Ex( T ){}
-    
+
     bool operator == ( const T& ) const { return true; }
     T operator * ( const T& ) const { return T(); }
 };
@@ -273,13 +273,13 @@ TEST_CASE( "Pointers can be compared to null", "" )
 {
     TestData* p = CATCH_NULL;
     TestData* pNULL = CATCH_NULL;
-    
+
     REQUIRE( p == CATCH_NULL );
     REQUIRE( p == pNULL );
-    
+
     TestData data;
     p = &data;
-    
+
     REQUIRE( p != CATCH_NULL );
 
     const TestData* cp = p;
@@ -290,7 +290,7 @@ TEST_CASE( "Pointers can be compared to null", "" )
 
     REQUIRE( returnsNull() == CATCH_NULL );
     REQUIRE( returnsConstNull() == CATCH_NULL );
-    
+
     REQUIRE( CATCH_NULL != p );
 }
 
@@ -304,7 +304,7 @@ TEST_CASE( "Pointers can be compared to null", "" )
 TEST_CASE( "'Not' checks that should succeed", "" )
 {
     bool falseValue = false;
-    
+
     REQUIRE( false == false );
     REQUIRE( true == true );
     REQUIRE( !false );
@@ -320,15 +320,15 @@ TEST_CASE( "'Not' checks that should succeed", "" )
 TEST_CASE( "'Not' checks that should fail", "[.][failing]" )
 {
     bool trueValue = true;
-    
+
     CHECK( false != false );
     CHECK( true != true );
     CHECK( !true );
     CHECK_FALSE( true );
-    
+
     CHECK( !trueValue );
     CHECK_FALSE( trueValue );
-    
+
     CHECK( !(1 == 1) );
     CHECK_FALSE( 1 == 1 );
 }

projects/SelfTest/ExceptionTests.cpp

@@ -96,32 +96,61 @@ public:
     CustomException( const std::string& msg )
     : m_msg( msg )
     {}
-    
+
     std::string getMessage() const
     {
         return m_msg;
     }
-    
+
 private:
     std::string m_msg;
 };
 
+class CustomStdException : public std::exception
+{
+public:
+    CustomStdException( const std::string& msg )
+    : m_msg( msg )
+    {}
+    ~CustomStdException() CATCH_NOEXCEPT {}
+
+    std::string getMessage() const
+    {
+        return m_msg;
+    }
+
+private:
+    std::string m_msg;
+};
+
+
 CATCH_TRANSLATE_EXCEPTION( CustomException& ex )
 {
     return ex.getMessage();
 }
 
+CATCH_TRANSLATE_EXCEPTION( CustomStdException& ex )
+{
+    return ex.getMessage();
+}
+
 CATCH_TRANSLATE_EXCEPTION( double& ex )
 {
     return Catch::toString( ex );
 }
 
-TEST_CASE("Unexpected custom exceptions can be translated", "[.][failing]" )
+TEST_CASE("Non-std exceptions can be translated", "[.][failing]" )
 {
 	if( Catch::alwaysTrue() )
 	    throw CustomException( "custom exception" );
 }
 
+TEST_CASE("Custom std-exceptions can be custom translated", "[.][failing]" )
+{
+    if( Catch::alwaysTrue() )
+        throw CustomException( "custom std exception" );
+}
+
 inline void throwCustom() {
 	if( Catch::alwaysTrue() )
 		throw CustomException( "custom exception - not std" );

projects/SelfTest/GeneratorTests.cpp

@@ -19,10 +19,10 @@ inline int multiply( int a, int b )
 CATCH_TEST_CASE( "Generators over two ranges", "[generators]" )
 {
     using namespace Catch::Generators;
-    
+
     int i = CATCH_GENERATE( between( 1, 5 ).then( values( 15, 20, 21 ).then( 36 ) ) );
     int j = CATCH_GENERATE( between( 100, 107 ) );
-    
+
     CATCH_REQUIRE( multiply( i, 2 ) == i*2 );
     CATCH_REQUIRE( multiply( j, 2 ) == j*2 );
 }
@@ -32,11 +32,11 @@ struct IntPair { int first, second; };
 CATCH_TEST_CASE( "Generator over a range of pairs", "[generators]" )
 {
     using namespace Catch::Generators;
- 
+
     IntPair p[] = { { 0, 1 }, { 2, 3 } };
-    
+
     IntPair* i = CATCH_GENERATE( between( p, &p[1] ) );
-    
+
     CATCH_REQUIRE( i->first == i->second-1 );
-    
+
 }

projects/SelfTest/MessageTests.cpp

@@ -38,7 +38,7 @@ TEST_CASE( "INFO gets logged on failure, even if captured before successful asse
     CHECK( a == 2 );
 
     INFO( "this message should be logged" );
-    
+
     CHECK( a == 1 );
 
     INFO( "and this, but later" );
@@ -85,7 +85,7 @@ TEST_CASE( "Standard output from all sections is reported", "[messages][.]" )
     {
         std::cout << "Message from section one" << std::endl;
     }
-    
+
     SECTION( "two", "" )
     {
         std::cout << "Message from section two" << std::endl;

projects/SelfTest/MiscTests.cpp

@@ -21,7 +21,7 @@ TEST_CASE( "random SECTION tests", "[.][sections][failing]" )
 {
     int a = 1;
     int b = 2;
-    
+
     SECTION( "s1", "doesn't equal" )
     {
         REQUIRE( a != b );
@@ -38,7 +38,7 @@ TEST_CASE( "nested SECTION tests", "[.][sections][failing]" )
 {
     int a = 1;
     int b = 2;
-    
+
     SECTION( "s1", "doesn't equal" )
     {
         REQUIRE( a != b );
@@ -55,7 +55,7 @@ TEST_CASE( "more nested SECTION tests", "[sections][failing][.]" )
 {
     int a = 1;
     int b = 2;
-    
+
     SECTION( "s1", "doesn't equal" )
     {
         SECTION( "s2", "equal" )
@@ -82,7 +82,7 @@ TEST_CASE( "even more nested SECTION tests", "[sections]" )
         {
             SUCCEED(""); // avoid failing due to no tests
         }
-        
+
         SECTION( "e (leaf)", "" )
         {
             SUCCEED(""); // avoid failing due to no tests
@@ -98,14 +98,14 @@ TEST_CASE( "even more nested SECTION tests", "[sections]" )
 TEST_CASE( "looped SECTION tests", "[.][failing][sections]" )
 {
     int a = 1;
-    
+
     for( int b = 0; b < 10; ++b )
     {
         std::ostringstream oss;
         oss << "b is currently: " << b;
         SECTION( "s1", oss.str() )
         {
-            CHECK( b > a );            
+            CHECK( b > a );
         }
     }
 }
@@ -113,18 +113,18 @@ TEST_CASE( "looped SECTION tests", "[.][failing][sections]" )
 TEST_CASE( "looped tests", "[.][failing]" )
 {
     static const int fib[]  = { 1, 1, 2, 3, 5, 8, 13, 21 };
-    
+
     for( size_t i=0; i < sizeof(fib)/sizeof(int); ++i )
     {
         INFO( "Testing if fib[" << i << "] (" << fib[i] << ") is even" );
-        CHECK( ( fib[i] % 2 ) == 0 );                
+        CHECK( ( fib[i] % 2 ) == 0 );
     }
 }
 
 TEST_CASE( "Sends stuff to stdout and stderr", "[.]" )
 {
     std::cout << "A string sent directly to stdout" << std::endl;
-    
+
     std::cerr << "A string sent directly to stderr" << std::endl;
 }
 
@@ -162,7 +162,7 @@ inline bool testCheckedElse( bool flag )
 {
     CHECKED_ELSE( flag )
         return false;
-    
+
     return true;
 }
 
@@ -191,13 +191,13 @@ TEST_CASE( "xmlentitycheck", "" )
 TEST_CASE( "send a single char to INFO", "[failing][.]" )
 {
     INFO(3);
-    REQUIRE(false);    
+    REQUIRE(false);
 }
 
 TEST_CASE( "atomic if", "[failing][0]")
 {
     size_t x = 0;
-    
+
     if( x )
         REQUIRE(x > 0);
     else
@@ -208,10 +208,16 @@ inline const char* testStringForMatching()
 {
     return "this string contains 'abc' as a substring";
 }
+inline const char* testStringForMatching2()
+{
+    return "some completely different text that contains one common word";
+}
+
+using namespace Catch::Matchers;
 
 TEST_CASE("String matchers", "[matchers]" )
 {
-    REQUIRE_THAT( testStringForMatching(), Contains( "string" ) );    
+    REQUIRE_THAT( testStringForMatching(), Contains( "string" ) );
     CHECK_THAT( testStringForMatching(), Contains( "abc" ) );
 
     CHECK_THAT( testStringForMatching(), StartsWith( "this" ) );
@@ -256,6 +262,42 @@ TEST_CASE("Equals", "[matchers]")
     CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) );
 }
 
+TEST_CASE("Matchers can be (AllOf) composed with the && operator", "[matchers][operators][operator&&]")
+{
+    CHECK_THAT( testStringForMatching(),
+           Contains( "string" ) &&
+           Contains( "abc" ) &&
+           Contains( "substring" ) &&
+           Contains( "contains" ) );
+}
+
+TEST_CASE("Matchers can be (AnyOf) composed with the || operator", "[matchers][operators][operator||]")
+{
+    CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
+    CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
+}
+
+TEST_CASE("Matchers can be composed with both && and ||", "[matchers][operators][operator||][operator&&]")
+{
+    CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) );
+}
+
+TEST_CASE("Matchers can be composed with both && and || - failing", "[matchers][operators][operator||][operator&&][.failing]")
+{
+    CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) );
+}
+
+TEST_CASE("Matchers can be negated (Not) with the ! operator", "[matchers][operators][not]")
+{
+    CHECK_THAT( testStringForMatching(), !Contains( "different" ) );
+}
+
+TEST_CASE("Matchers can be negated (Not) with the ! operator - failing", "[matchers][operators][not][.failing]")
+{
+    CHECK_THAT( testStringForMatching(), !Contains( "substring" ) );
+}
+
+
 inline unsigned int Factorial( unsigned int number )
 {
 //  return number <= 1 ? number : Factorial(number-1)*number;
@@ -297,38 +339,38 @@ TEST_CASE( "second tag", "[tag2]" )
 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( "We can use the 'swap trick' to reset the capacity", "" ) {
             std::vector<int> empty;
             empty.swap( v );
-            
+
             REQUIRE( v.capacity() == 0 );
         }
     }
     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 );
     }
@@ -426,7 +468,7 @@ TEST_CASE( "XmlEncode" ) {
 #ifdef CATCH_CONFIG_CPP11_LONG_LONG
 TEST_CASE( "long long" ) {
     long long l = std::numeric_limits<long long>::max();
-    
+
     REQUIRE( l == std::numeric_limits<long long>::max() );
 }
 #endif
@@ -436,3 +478,8 @@ TEST_CASE( "long long" ) {
 //    int x = 10/i; // This should cause the signal to fire
 //    CHECK( x == 0 );
 //}
+
+TEST_CASE( "This test 'should' fail but doesn't", "[.][failing][!shouldfail]" )
+{
+    SUCCEED( "oops!" );
+}

projects/SelfTest/PartTrackerTests.cpp

@@ -12,13 +12,13 @@
 namespace Catch
 {
     class LocalContext {
-        
+
     public:
         TrackerContext& operator()() const {
             return TrackerContext::instance();
         }
     };
-    
+
 } // namespace Catch
 
 inline Catch::TrackerContext& C_A_T_C_H_Context() {
@@ -37,11 +37,11 @@ using namespace Catch;
 //}
 
 TEST_CASE( "Tracker", "" ) {
-    
+
     TrackerContext ctx;
     ctx.startRun();
     ctx.startCycle();
-    
+
     ITracker& testCase = SectionTracker::acquire( ctx, "Testcase" );
     REQUIRE( testCase.isOpen() );
 
@@ -57,13 +57,13 @@ TEST_CASE( "Tracker", "" ) {
         REQUIRE( ctx.completedCycle() );
         REQUIRE( testCase.isSuccessfullyCompleted() );
     }
-    
+
     SECTION( "fail one section", "" ) {
         s1.fail();
         REQUIRE( s1.isComplete() );
         REQUIRE( s1.isSuccessfullyCompleted() == false );
         REQUIRE( testCase.isComplete() == false );
-        
+
         testCase.close();
         REQUIRE( ctx.completedCycle() );
         REQUIRE( testCase.isSuccessfullyCompleted() == false );
@@ -72,10 +72,10 @@ TEST_CASE( "Tracker", "" ) {
             ctx.startCycle();
             ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
             REQUIRE( testCase2.isOpen() );
-            
+
             ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
             REQUIRE( s1b.isOpen() == false );
-            
+
             testCase2.close();
             REQUIRE( ctx.completedCycle() );
             REQUIRE( testCase.isComplete() );
@@ -85,7 +85,7 @@ TEST_CASE( "Tracker", "" ) {
             ctx.startCycle();
             ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
             REQUIRE( testCase2.isOpen() );
-            
+
             ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
             REQUIRE( s1b.isOpen() == false );
 
@@ -94,19 +94,19 @@ TEST_CASE( "Tracker", "" ) {
 
             s2.close();
             REQUIRE( ctx.completedCycle() );
-            
+
             testCase2.close();
             REQUIRE( testCase.isComplete() );
             REQUIRE( testCase.isSuccessfullyCompleted() );
         }
     }
-    
+
     SECTION( "successfully close one section, then find another", "" ) {
         s1.close();
-        
+
         ITracker& s2 = SectionTracker::acquire( ctx, "S2" );
         REQUIRE( s2.isOpen() == false );
-        
+
         testCase.close();
         REQUIRE( testCase.isComplete() == false );
 
@@ -114,7 +114,7 @@ TEST_CASE( "Tracker", "" ) {
             ctx.startCycle();
             ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
             REQUIRE( testCase2.isOpen() );
-            
+
             ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
             REQUIRE( s1b.isOpen() == false );
 
@@ -122,14 +122,14 @@ TEST_CASE( "Tracker", "" ) {
             REQUIRE( s2b.isOpen() );
 
             REQUIRE( ctx.completedCycle() == false );
-            
+
             SECTION ("Successfully close S2") {
                 s2b.close();
                 REQUIRE( ctx.completedCycle() );
 
                 REQUIRE( s2b.isSuccessfullyCompleted() );
                 REQUIRE( testCase2.isComplete() == false );
-                
+
                 testCase2.close();
                 REQUIRE( testCase2.isSuccessfullyCompleted() );
             }
@@ -139,7 +139,7 @@ TEST_CASE( "Tracker", "" ) {
 
                 REQUIRE( s2b.isComplete() );
                 REQUIRE( s2b.isSuccessfullyCompleted() == false );
-                
+
                 testCase2.close();
                 REQUIRE( testCase2.isSuccessfullyCompleted() == false );
 
@@ -147,19 +147,19 @@ TEST_CASE( "Tracker", "" ) {
                 ctx.startCycle();
                 ITracker& testCase3 = SectionTracker::acquire( ctx, "Testcase" );
                 REQUIRE( testCase3.isOpen() );
-                
+
                 ITracker& s1c = SectionTracker::acquire( ctx, "S1" );
                 REQUIRE( s1c.isOpen() == false );
-                
+
                 ITracker& s2c = SectionTracker::acquire( ctx, "S2" );
                 REQUIRE( s2c.isOpen() == false );
-            
+
                 testCase3.close();
                 REQUIRE( testCase3.isSuccessfullyCompleted() );
             }
         }
     }
-    
+
     SECTION( "open a nested section", "" ) {
         ITracker& s2 = SectionTracker::acquire( ctx, "S2" );
         REQUIRE( s2.isOpen() );
@@ -167,15 +167,15 @@ TEST_CASE( "Tracker", "" ) {
         s2.close();
         REQUIRE( s2.isComplete() );
         REQUIRE( s1.isComplete() == false );
-        
+
         s1.close();
         REQUIRE( s1.isComplete() );
         REQUIRE( testCase.isComplete() == false );
-        
+
         testCase.close();
         REQUIRE( testCase.isComplete() );
     }
-    
+
     SECTION( "start a generator", "" ) {
         IndexTracker& g1 = IndexTracker::acquire( ctx, "G1", 2 );
         REQUIRE( g1.isOpen() );
@@ -195,17 +195,17 @@ TEST_CASE( "Tracker", "" ) {
                 ctx.startCycle();
                 ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
                 REQUIRE( testCase2.isOpen() );
-                
+
                 ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
                 REQUIRE( s1b.isOpen() );
-                
-                
+
+
                 IndexTracker& g1b = IndexTracker::acquire( ctx, "G1", 2 );
                 REQUIRE( g1b.isOpen() );
                 REQUIRE( g1b.index() == 1 );
-                
+
                 REQUIRE( s1.isComplete() == false );
-                
+
                 s1b.close();
                 REQUIRE( s1b.isComplete() );
                 REQUIRE( g1b.isComplete() );
@@ -225,98 +225,98 @@ TEST_CASE( "Tracker", "" ) {
 
             testCase.close();
             REQUIRE( testCase.isComplete() == false );
-            
+
             SECTION( "Re-enter for second generation", "" ) {
                 ctx.startCycle();
                 ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
                 REQUIRE( testCase2.isOpen() );
-                
+
                 ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
                 REQUIRE( s1b.isOpen() );
-                
+
                 // generator - next value
                 IndexTracker& g1b = IndexTracker::acquire( ctx, "G1", 2 );
                 REQUIRE( g1b.isOpen() );
                 REQUIRE( g1b.index() == 1 );
-                
+
                 // inner section again
                 ITracker& s2b = SectionTracker::acquire( ctx, "S2" );
                 REQUIRE( s2b.isOpen() );
-                
+
                 s2b.close();
                 REQUIRE( s2b.isComplete() );
-                
+
                 s1b.close();
                 REQUIRE( g1b.isComplete() );
                 REQUIRE( s1b.isComplete() );
-                
+
                 testCase2.close();
                 REQUIRE( testCase2.isComplete() );
             }
         }
-        
+
         SECTION( "Fail an inner section", "" ) {
             ITracker& s2 = SectionTracker::acquire( ctx, "S2" );
             REQUIRE( s2.isOpen() );
-            
+
             s2.fail();
             REQUIRE( s2.isComplete() );
             REQUIRE( s2.isSuccessfullyCompleted() == false );
-            
+
             s1.close();
             REQUIRE( s1.isComplete() == false );
-            
+
             testCase.close();
             REQUIRE( testCase.isComplete() == false );
-            
+
             SECTION( "Re-enter for second generation", "" ) {
                 ctx.startCycle();
                 ITracker& testCase2 = SectionTracker::acquire( ctx, "Testcase" );
                 REQUIRE( testCase2.isOpen() );
-                
+
                 ITracker& s1b = SectionTracker::acquire( ctx, "S1" );
                 REQUIRE( s1b.isOpen() );
-                
+
                 // generator - still same value
                 IndexTracker& g1b = IndexTracker::acquire( ctx, "G1", 2 );
                 REQUIRE( g1b.isOpen() );
                 REQUIRE( g1b.index() == 0 );
-                
+
                 // inner section again - this time won't open
                 ITracker& s2b = SectionTracker::acquire( ctx, "S2" );
                 REQUIRE( s2b.isOpen() == false );
-                
+
                 s1b.close();
                 REQUIRE( g1b.isComplete() == false );
                 REQUIRE( s1b.isComplete() == false );
-                
+
                 testCase2.close();
                 REQUIRE( testCase2.isComplete() == false );
-                
+
                 // Another cycle - now should complete
                 ctx.startCycle();
                 ITracker& testCase3 = SectionTracker::acquire( ctx, "Testcase" );
                 REQUIRE( testCase3.isOpen() );
-                
+
                 ITracker& s1c = SectionTracker::acquire( ctx, "S1" );
                 REQUIRE( s1c.isOpen() );
-                
+
                 // generator - now next value
                 IndexTracker& g1c = IndexTracker::acquire( ctx, "G1", 2 );
                 REQUIRE( g1c.isOpen() );
                 REQUIRE( g1c.index() == 1 );
-                
+
                 // inner section - now should open again
                 ITracker& s2c = SectionTracker::acquire( ctx, "S2" );
                 REQUIRE( s2c.isOpen() );
-                
+
                 s2c.close();
                 REQUIRE( s2c.isComplete() );
-                
+
                 s1c.close();
                 REQUIRE( g1c.isComplete() );
                 REQUIRE( s1c.isComplete() );
-                
+
                 testCase3.close();
                 REQUIRE( testCase3.isComplete() );
             }

projects/SelfTest/TagAliasTests.cpp

@@ -11,6 +11,8 @@
 
 TEST_CASE( "Tag alias can be registered against tag patterns", "" ) {
 
+    using namespace Catch::Matchers;
+
     Catch::TagAliasRegistry registry;
 
     registry.add( "[@zzz]", "[one][two]", Catch::SourceLineInfo( "file", 2 ) );

projects/SelfTest/TestMain.cpp

@@ -25,7 +25,7 @@ CATCH_REGISTER_TAG_ALIAS( "[@tricky]", "[tricky]~[.]" )
 template<size_t size>
 void parseIntoConfig( const char * (&argv)[size], Catch::ConfigData& config ) {
     Catch::Clara::CommandLine<Catch::ConfigData> parser = Catch::makeCommandLineParser();
-    parser.parseInto( size, argv, config );
+    parser.parseInto( Catch::Clara::argsToVector( size, argv ), config );
 }
 
 template<size_t size>
@@ -44,18 +44,20 @@ inline Catch::TestCase fakeTestCase( const char* name, const char* desc = "" ){
 
 TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
 
+    using namespace Catch::Matchers;
+
     Catch::ConfigData config;
 
     SECTION( "default - no arguments", "" ) {
         const char* argv[] = { "test" };
         CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-        
+
         CHECK( config.shouldDebugBreak == false );
         CHECK( config.abortAfter == -1 );
         CHECK( config.noThrow == false );
         CHECK( config.reporterNames.empty() );
     }
-    
+
     SECTION( "test lists", "" ) {
         SECTION( "1 test", "Specify one test case using" ) {
             const char* argv[] = { "test", "test1" };
@@ -84,24 +86,24 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         }
 
     }
-    
+
     SECTION( "reporter", "" ) {
         SECTION( "-r/console", "" ) {
             const char* argv[] = { "test", "-r", "console" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.reporterNames[0] == "console" );
         }
         SECTION( "-r/xml", "" ) {
             const char* argv[] = { "test", "-r", "xml" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.reporterNames[0] == "xml" );
         }
         SECTION( "-r xml and junit", "" ) {
             const char* argv[] = { "test", "-r", "xml", "-r", "junit" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.reporterNames.size() == 2 );
             REQUIRE( config.reporterNames[0] == "xml" );
             REQUIRE( config.reporterNames[1] == "junit" );
@@ -109,26 +111,26 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         SECTION( "--reporter/junit", "" ) {
             const char* argv[] = { "test", "--reporter", "junit" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.reporterNames[0] == "junit" );
         }
     }
-    
+
     SECTION( "debugger", "" ) {
         SECTION( "-b", "" ) {
             const char* argv[] = { "test", "-b" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.shouldDebugBreak == true );
         }
         SECTION( "--break", "" ) {
             const char* argv[] = { "test", "--break" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-            
+
             REQUIRE( config.shouldDebugBreak );
         }
     }
-        
+
     SECTION( "abort", "" ) {
         SECTION( "-a aborts after first failure", "" ) {
             const char* argv[] = { "test", "-a" };
@@ -151,7 +153,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
             REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) );
         }
     }
-    
+
     SECTION( "nothrow", "" ) {
         SECTION( "-e", "" ) {
             const char* argv[] = { "test", "-e" };
@@ -193,19 +195,41 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         }
     }
 
-    SECTION( "force-colour", "") {
-        SECTION( "--force-colour", "" ) {
-            const char* argv[] = { "test", "--force-colour" };
-            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
-
-            REQUIRE( config.forceColour );
-        }
-
-        SECTION( "without --force-colour", "" ) {
+    SECTION( "use-colour", "") {
+        
+        using Catch::UseColour;
+        
+        SECTION( "without option", "" ) {
             const char* argv[] = { "test" };
             CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+            
+            REQUIRE( config.useColour == UseColour::Auto );
+        }
 
-            REQUIRE( !config.forceColour );
+        SECTION( "auto", "" ) {
+            const char* argv[] = { "test", "--use-colour", "auto" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+
+            REQUIRE( config.useColour == UseColour::Auto );
+        }
+
+        SECTION( "yes", "" ) {
+            const char* argv[] = { "test", "--use-colour", "yes" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+            
+            REQUIRE( config.useColour == UseColour::Yes );
+        }
+
+        SECTION( "no", "" ) {
+            const char* argv[] = { "test", "--use-colour", "no" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+            
+            REQUIRE( config.useColour == UseColour::No );
+        }
+
+        SECTION( "error", "" ) {
+            const char* argv[] = { "test", "--use-colour", "wrong" };
+            REQUIRE_THROWS_WITH( parseIntoConfig( argv, config ), Contains( "colour mode must be one of" ) );
         }
     }
 }
@@ -217,7 +241,7 @@ TEST_CASE( "Long strings can be wrapped", "[wrap]" ) {
     SECTION( "plain string", "" ) {
         // guide:                 123456789012345678
         std::string testString = "one two three four";
-        
+
         SECTION( "No wrapping", "" ) {
             CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString );
             CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString );
@@ -261,14 +285,14 @@ TEST_CASE( "Long strings can be wrapped", "[wrap]" ) {
                                         .setInitialIndent( 1 ) );
             CHECK( text.toString() == " one two\n    three\n    four" );
         }
-        
+
     }
-    
+
     SECTION( "With newlines", "" ) {
-        
+
         // guide:                 1234567890123456789
         std::string testString = "one two\nthree four";
-        
+
         SECTION( "No wrapping" , "" ) {
             CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString );
             CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString );
@@ -288,17 +312,17 @@ TEST_CASE( "Long strings can be wrapped", "[wrap]" ) {
             CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" );
         }
     }
-    
+
     SECTION( "With tabs", "" ) {
 
         // guide:                 1234567890123456789
         std::string testString = "one two \tthree four five six";
-        
+
         CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString()
             == "one two three\n        four\n        five\n        six" );
     }
-    
-    
+
+
 }
 
 using namespace Catch;
@@ -324,7 +348,7 @@ public:
     ColourString( std::string const& _string, std::vector<ColourIndex> const& _colours )
     : string( _string ), colours( _colours )
     {}
-    
+
     ColourString& addColour( Colour::Code colour, int _index ) {
         colours.push_back( ColourIndex( colour,
                                         resolveRelativeIndex( _index ),
@@ -337,7 +361,7 @@ public:
                                         resolveLastRelativeIndex( _toIndex ) ) );
         return *this;
     }
-    
+
     void writeToStream( std::ostream& _stream ) const {
         std::size_t last = 0;
         for( std::size_t i = 0; i < colours.size(); ++i ) {
@@ -351,7 +375,7 @@ public:
             last = index.toIndex;
         }
         if( last < string.size() )
-            _stream << string.substr( last );        
+            _stream << string.substr( last );
     }
     friend std::ostream& operator << ( std::ostream& _stream, ColourString const& _colourString ) {
         _colourString.writeToStream( _stream );
@@ -408,7 +432,7 @@ TEST_CASE( "replaceInPlace", "" ) {
 
 // !TBD: This will be folded into Text class
 TEST_CASE( "Strings can be rendered with colour", "[.colour]" ) {
-    
+
     {
         ColourString cs( "hello" );
         cs  .addColour( Colour::Red, 0 )
@@ -420,19 +444,19 @@ TEST_CASE( "Strings can be rendered with colour", "[.colour]" ) {
     {
         ColourString cs( "hello" );
         cs  .addColour( Colour::Blue, 1, -2 );
-        
+
         Catch::cout() << cs << std::endl;
     }
-    
+
 }
 
 TEST_CASE( "Text can be formatted using the Text class", "" ) {
-    
+
     CHECK( Text( "hi there" ).toString() == "hi there" );
-    
+
     TextAttributes narrow;
     narrow.setWidth( 6 );
-    
+
     CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" );
 }
 
@@ -445,5 +469,15 @@ TEST_CASE( "Long text is truncted", "[Text][Truncated]" ) {
         oss << longLine << longLine << "\n";
     Text t( oss.str() );
     CHECK_THAT( t.toString(), EndsWith( "... message truncated due to excessive size" ) );
-    
+
 }
+
+inline void manuallyRegisteredTestFunction() {
+    SUCCEED( "was called" );
+}
+struct AutoTestReg {
+    AutoTestReg() {
+        REGISTER_TEST_CASE( manuallyRegisteredTestFunction, "ManuallyRegistered", "" );
+    }
+};
+AutoTestReg autoTestReg;

projects/SelfTest/TrickyTests.cpp

@@ -25,7 +25,7 @@ namespace Catch
         std::ostringstream oss;
         oss << "std::pair( " << value.first << ", " << value.second << " )";
         return oss.str();
-        
+
     }
 }
 
@@ -38,7 +38,7 @@ TEST_CASE
 {
     std::pair<int, int> aNicePair( 1, 2 );
 
-    REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair );    
+    REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -62,7 +62,7 @@ TEST_CASE
     /*
     int a = 1;
     int b = 2;
-    
+
     // This only captures part of the expression, but issues a warning about the rest
     REQUIRE( a+1 == b-1 );
     */
@@ -85,38 +85,38 @@ TEST_CASE
     "[Tricky][failing][.]"
 )
 {
-    
+
     Opaque o1, o2;
     o1.val = 7;
     o2.val = 8;
-  
+
     CHECK( &o1 == &o2 );
     CHECK( o1 == o2 );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 TEST_CASE
-(   
+(
     "string literals of different sizes can be compared",
     "[Tricky][failing][.]"
 )
 {
     REQUIRE( std::string( "first" ) == "second" );
-    
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 TEST_CASE
-(   
+(
     "An expression with side-effects should only be evaluated once",
     "[Tricky]"
 )
 {
     int i = 7;
-    
+
     REQUIRE( i++ == 7 );
     REQUIRE( i++ == 8 );
-    
+
 }
 
 namespace A {
@@ -167,8 +167,8 @@ TEST_CASE
 */
 
 namespace ObjectWithConversions
-{    
-    struct Object 
+{
+    struct Object
     {
         operator unsigned int() {return 0xc0000000;}
     };
@@ -179,31 +179,31 @@ namespace ObjectWithConversions
         "Operators at different namespace levels not hijacked by Koenig lookup",
         "[Tricky]"
     )
-    {        
+    {
         Object o;
         REQUIRE(0xc0000000 == o );
     }
 }
 
-namespace ObjectWithNonConstEqualityOperator 
+namespace ObjectWithNonConstEqualityOperator
 {
     struct Test
     {
         Test( unsigned int v )
-        : m_value(v) 
+        : m_value(v)
         {}
-        
+
         bool operator==( const Test&rhs )
-        { 
+        {
             return (m_value == rhs.m_value);
         }
         bool operator==( const Test&rhs ) const
-        { 
+        {
             return (m_value != rhs.m_value);
         }
         unsigned int m_value;
     };
-    
+
     TEST_CASE("Demonstrate that a non-const == is not used", "[Tricky]" )
     {
         Test t( 1 );
@@ -226,7 +226,7 @@ namespace EnumBitFieldTests
 struct Obj
 {
     Obj():prop(&p){}
-    
+
     int p;
     int* prop;
 };
@@ -284,11 +284,11 @@ TEST_CASE( "(unimplemented) static bools can be evaluated", "[Tricky]" )
 /*
 TEST_CASE( "Tests with the same name are not allowed", "[Tricky]" )
 {
-    
+
 }
 TEST_CASE( "Tests with the same name are not allowed", "[Tricky]" )
 {
-    
+
 }
 */
 
@@ -317,13 +317,13 @@ TEST_CASE( "Assertions then sections", "[Tricky]" )
 {
     // This was causing a failure due to the way the console reporter was handling
     // the current section
-    
+
     REQUIRE( Catch::alwaysTrue() );
-    
+
     SECTION( "A section", "" )
     {
         REQUIRE( Catch::alwaysTrue() );
-        
+
         SECTION( "Another section", "" )
         {
             REQUIRE( Catch::alwaysTrue() );

projects/VS2010/TestCatch/TestCatch/TestCatch.vcxproj

@@ -93,7 +93,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\SelfTest\ApproxTests.cpp" />
     <ClCompile Include="..\..\..\SelfTest\BDDTests.cpp" />
-    <ClCompile Include="..\..\..\SelfTest\SectionTrackerTests.cpp" />
+    <ClCompile Include="..\..\..\SelfTest\PartTrackerTests.cpp" />
     <ClCompile Include="..\..\..\SelfTest\TestMain.cpp" />
     <ClCompile Include="..\..\..\SelfTest\ClassTests.cpp" />
     <ClCompile Include="..\..\..\SelfTest\ConditionTests.cpp" />

projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj

@@ -513,7 +513,7 @@
 		4A6D0C17149B3D3B00DB3EAA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0710;
 			};
 			buildConfigurationList = 4A6D0C1A149B3D3B00DB3EAA /* Build configuration list for PBXProject "CatchSelfTest" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -595,6 +595,7 @@
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = NO;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;

projects/runners/iTchRunner/internal/iTchRunnerAppDelegate.h

@@ -13,7 +13,7 @@
 
 
 
-@interface iTchRunnerAppDelegate : NSObject <UIApplicationDelegate> 
+@interface iTchRunnerAppDelegate : NSObject <UIApplicationDelegate>
 {
     UIWindow *window;
 }
@@ -25,15 +25,15 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 
-{        
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
     window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     [window setUserInteractionEnabled:YES];
     [window setMultipleTouchEnabled:YES];
-    
+
 	CGRect screenRect = [[UIScreen mainScreen] applicationFrame];
     iTchRunnerMainView* view = [[iTchRunnerMainView alloc] initWithFrame:screenRect];
-    
+
     [window addSubview:view];
     [window makeKeyAndVisible];
     arcSafeRelease( view );
@@ -42,7 +42,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)dealloc 
+- (void)dealloc
 {
 #if !CATCH_ARC_ENABLED
     [window release];
@@ -52,7 +52,7 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationWillResignActive:(UIApplication *)application 
+- (void)applicationWillResignActive:(UIApplication *)application
 {
     /*
      Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
@@ -62,17 +62,17 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationDidEnterBackground:(UIApplication *)application 
+- (void)applicationDidEnterBackground:(UIApplication *)application
 {
     /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
      If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
      */
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationWillEnterForeground:(UIApplication *)application 
+- (void)applicationWillEnterForeground:(UIApplication *)application
 {
     /*
      Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
@@ -81,7 +81,7 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationDidBecomeActive:(UIApplication *)application 
+- (void)applicationDidBecomeActive:(UIApplication *)application
 {
     /*
      Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
@@ -90,7 +90,7 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationWillTerminate:(UIApplication *)application 
+- (void)applicationWillTerminate:(UIApplication *)application
 {
     /*
      Called when the application is about to terminate.
@@ -100,7 +100,7 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application 
+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application
 {
     /*
      Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.

projects/runners/iTchRunner/internal/iTchRunnerMainView.h

@@ -33,7 +33,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 -(id) initWithFrame:(CGRect)frame
 {
-    if ((self = [super initWithFrame:frame])) 
+    if ((self = [super initWithFrame:frame]))
     {
         // Initialization code
         self.backgroundColor = [UIColor blackColor];
@@ -64,7 +64,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 -(void) showAlert
-{    
+{
     UIActionSheet* menu = [[UIActionSheet alloc] initWithTitle:@"Options"
                                                       delegate:self
                                              cancelButtonTitle:nil
@@ -72,7 +72,7 @@
                                              otherButtonTitles:@"Run all tests", nil];
     [menu showInView: self];
     arcSafeRelease( menu );
- 
+
 }
 
 // This is a copy & paste from Catch::Runner2 to get us bootstrapped (this is due to all be
@@ -144,7 +144,7 @@ inline Catch::Totals runTestsForGroup( Catch::RunContext& context, const Catch::
 {
     const Catch::AssertionResult& resultInfo = *pResultInfo;
     std::ostringstream oss;
-    
+
     if( resultInfo.hasExpression() )
     {
         oss << resultInfo.getExpression();
@@ -174,7 +174,7 @@ inline Catch::Totals runTestsForGroup( Catch::RunContext& context, const Catch::
         default:
             break;
     }
-    
+
     if( resultInfo.hasExpression() )
     {
         oss << " for: " << resultInfo.getExpandedExpression();

projects/runners/iTchRunner/internal/iTchRunnerReporter.h

@@ -13,7 +13,7 @@
 
 @protocol iTchRunnerDelegate
 
--(void) testWasRun: (const Catch::AssertionResult*) result;    
+-(void) testWasRun: (const Catch::AssertionResult*) result;
 
 @end
 
@@ -38,14 +38,14 @@ namespace Catch
         {
             return true;
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         static std::string getDescription
         ()
         {
             return "Captures results for iOS runner";
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         size_t getSucceeded
         ()
@@ -53,7 +53,7 @@ namespace Catch
         {
             return m_totals.assertions.passed;
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         size_t getFailed
         ()
@@ -61,20 +61,20 @@ namespace Catch
         {
             return m_totals.assertions.failed;
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         void reset()
         {
             m_totals = Totals();
         }
-        
+
     private: // IReporter
-        
+
         ///////////////////////////////////////////////////////////////////////////
         virtual void StartTesting
         ()
         {}
-        
+
         ///////////////////////////////////////////////////////////////////////////
         virtual void EndTesting
         (
@@ -83,7 +83,7 @@ namespace Catch
         {
             m_totals = totals;
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         virtual void Result
         (
@@ -92,7 +92,7 @@ namespace Catch
         {
             [m_delegate testWasRun: &result];
         }
-        
+
         ///////////////////////////////////////////////////////////////////////////
         // Deliberately unimplemented:
         virtual void StartGroup( const std::string& ){}
@@ -107,7 +107,7 @@ namespace Catch
 
     private:
         Totals m_totals;
-        
+
         id<iTchRunnerDelegate> m_delegate;
     };
 }

scripts/fixTrailingWhitespace.py

@@ -0,0 +1,46 @@
+from  __future__ import  print_function
+import os
+from scriptCommon import catchPath
+
+changedFiles = 0
+
+def isSourceFile( path ):
+    return path.endswith( ".cpp" ) or path.endswith( ".h" ) or path.endswith( ".hpp" )
+
+def fixAllFilesInDir( dir ):
+    for f in os.listdir( dir ):
+        path = os.path.join( dir,f )
+        if os.path.isfile( path ):
+            if isSourceFile( path ):
+                fixFile( path )
+        else:
+            fixAllFilesInDir( path )
+
+def fixFile( path ):
+    f = open( path, 'r' )
+    lines = []
+    changed = 0
+    for line in f:
+        trimmed = line.rstrip() + "\n"
+        if trimmed != line:
+            changed = changed +1
+        lines.append( trimmed )
+    f.close()
+    if changed > 0:
+        global changedFiles
+        changedFiles = changedFiles + 1
+        print( path + ":" )
+        print( " - fixed " + str(changed) + " line(s)" )
+        altPath = path + ".backup"
+        os.rename( path, altPath )
+        f2 = open( path, 'w' )
+        for line in lines:
+            f2.write( line )
+        f2.close()
+        os.remove( altPath )
+
+fixAllFilesInDir(catchPath)
+if changedFiles > 0:
+    print( "Fixed " + str(changedFiles) + " file(s)" )
+else:
+    print( "No trailing whitespace found" )