nsaunier/traffic-intelligence: include/catch.hpp comparison

comparison include/catch.hpp @ 806:c6f497291fd8 opencv3

updated catch and C++ code to opencv2.4.13

author	Nicolas Saunier <nicolas.saunier@polymtl.ca>
date	Fri, 10 Jun 2016 12:29:58 -0400
parents	f0f800b95765
children

comparison

equal deleted inserted replaced

-:180b6b0231c0
+:c6f497291fd8
 /*
-*  Generated: 2012-06-06 08:05:56.928287
+*  Catch v1.5.6
+*  Generated: 2016-06-09 19:20:41.460328
 *  ----------------------------------------------------------
 *  This file has been merged from multiple headers. Please don't edit it directly
 *  Copyright (c) 2012 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_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
 #define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// #included from: internal/catch_context.h
+#define TWOBLUECUBES_CATCH_HPP_INCLUDED
-// #included from: catch_interfaces_reporter.h
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+// #included from: internal/catch_suppress_warnings.h
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic ignored "-Wglobal-constructors"
+#       pragma clang diagnostic ignored "-Wvariadic-macros"
+#       pragma clang diagnostic ignored "-Wc99-extensions"
+#       pragma clang diagnostic ignored "-Wunused-variable"
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wc++98-compat"
+#       pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic ignored "-Wvariadic-macros"
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#endif
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+// #included from: internal/catch_notimplemented_exception.h
+#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
 // #included from: catch_common.h
+#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
 #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 )
-#ifdef __GNUC__
-#define ATTRIBUTE_NORETURN __attribute__ ((noreturn))
-#else
-#define ATTRIBUTE_NORETURN
-#endif
 #include <sstream>
 #include <stdexcept>
 #include <algorithm>
+// #included from: catch_compiler_capabilities.h
+#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported?
+// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
+// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
+// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported?
+// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported
+// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported?
+// CATCH_CONFIG_CPP11_OVERRIDE : is override supported?
+// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
+// 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
+// ****************
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_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 CATCH_CONFIG_NO_CPP11
+#ifdef __cplusplus
+#  if __cplusplus >= 201103L
+#    define CATCH_CPP11_OR_GREATER
+#  endif
+#  if __cplusplus >= 201402L
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+#endif
+#ifdef __clang__
+#  if __has_feature(cxx_nullptr)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+#  if __has_feature(cxx_noexcept)
+#    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__
+////////////////////////////////////////////////////////////////////////////////
+// Borland
+#ifdef __BORLANDC__
+#endif // __BORLANDC__
+////////////////////////////////////////////////////////////////////////////////
+// EDG
+#ifdef __EDG_VERSION__
+#endif // __EDG_VERSION__
+////////////////////////////////////////////////////////////////////////////////
+// Digital Mars
+#ifdef __DMC__
+#endif // __DMC__
+////////////////////////////////////////////////////////////////////////////////
+// GCC
+#ifdef __GNUC__
+#   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
+#endif // __GNUC__
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+#if (_MSC_VER >= 1600)
+#   define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
+#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#endif // _MSC_VER
+////////////////////////////////////////////////////////////////////////////////
+// Use variadic macros if the compiler supports them
+#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
+( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
+( defined __GNUC__ && __GNUC__ >= 3 ) || \
+( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )
+#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#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(CATCH_CPP11_OR_GREATER)
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#  endif
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#    define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#  endif
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#    define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#  endif
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#    define CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#  endif
+#  ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#    define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#  endif
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG)
+#    define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG
+#  endif
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE)
+#    define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE
+#  endif
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
+#    define CATCH_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(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NULLPTR
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NOEXCEPT
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_IS_ENUM
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_TUPLE
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS)
+#   define CATCH_CONFIG_VARIADIC_MACROS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_LONG_LONG
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_OVERRIDE
+#endif
+#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)
+#  define CATCH_NOEXCEPT noexcept
+#  define CATCH_NOEXCEPT_IS(x) noexcept(x)
+#else
+#  define CATCH_NOEXCEPT throw()
+#  define CATCH_NOEXCEPT_IS(x)
+#endif
+// nullptr support
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+#   define CATCH_NULL nullptr
+#else
+#   define CATCH_NULL NULL
+#endif
+// override support
+#ifdef CATCH_CONFIG_CPP11_OVERRIDE
+#   define CATCH_OVERRIDE override
+#else
+#   define CATCH_OVERRIDE
+#endif
+// unique_ptr support
+#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR
+#   define CATCH_AUTO_PTR( T ) std::unique_ptr<T>
+#else
+#   define CATCH_AUTO_PTR( T ) std::auto_ptr<T>
+#endif
 namespace Catch {
-	class NonCopyable {
+struct IConfig;
-		NonCopyable( const NonCopyable& );
-		void operator = ( const NonCopyable& );
+struct CaseSensitive { enum Choice {
-	protected:
+Yes,
-		NonCopyable() {}
+No
-		virtual ~NonCopyable() {}
+}; };
-	};
+class NonCopyable {
+#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+NonCopyable( NonCopyable const& )              = delete;
+NonCopyable( NonCopyable && )                  = delete;
+NonCopyable& operator = ( NonCopyable const& ) = delete;
+NonCopyable& operator = ( NonCopyable && )     = delete;
+#else
+NonCopyable( NonCopyable const& info );
+NonCopyable& operator = ( NonCopyable const& );
+#endif
+protected:
+NonCopyable() {}
+virtual ~NonCopyable();
+};
 class SafeBool {
 public:
 typedef void (SafeBool::*type)() const;
 template<typename ContainerT>
 inline void deleteAll( ContainerT& container ) {
 typename ContainerT::const_iterator it = container.begin();
 typename ContainerT::const_iterator itEnd = container.end();
 for(; it != itEnd; ++it )
-{
 delete *it;
-}
 }
 template<typename AssociativeContainerT>
 inline void deleteAllValues( AssociativeContainerT& container ) {
 typename AssociativeContainerT::const_iterator it = container.begin();
 typename AssociativeContainerT::const_iterator itEnd = container.end();
 for(; it != itEnd; ++it )
-{
 delete it->second;
 }
-}
+bool startsWith( std::string const& s, std::string const& prefix );
-template<typename ContainerT, typename Function>
+bool endsWith( std::string const& s, std::string const& suffix );
-inline void forEach( ContainerT& container, Function function ) {
+bool contains( std::string const& s, std::string const& infix );
-std::for_each( container.begin(), container.end(), function );
+void toLowerInPlace( std::string& s );
-}
+std::string toLower( std::string const& s );
+std::string trim( std::string const& str );
-template<typename ContainerT, typename Function>
+bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-inline void forEach( const ContainerT& container, Function function ) {
-std::for_each( container.begin(), container.end(), function );
+struct pluralise {
-}
+pluralise( std::size_t count, std::string const& label );
+friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+std::size_t m_count;
+std::string m_label;
+};
 struct SourceLineInfo {
-SourceLineInfo() : line( 0 ){}
+SourceLineInfo();
-SourceLineInfo( const std::string& _file, std::size_t _line )
+SourceLineInfo( char const* _file, std::size_t _line );
-:   file( _file ),
+SourceLineInfo( SourceLineInfo const& other );
-line( _line )
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-{}
+SourceLineInfo( SourceLineInfo && )                  = default;
-SourceLineInfo( const SourceLineInfo& other )
+SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
-:   file( other.file ),
+SourceLineInfo& operator = ( SourceLineInfo && )     = default;
-line( other.line )
+#  endif
-{}
+bool empty() const;
-void swap( SourceLineInfo& other ){
+bool operator == ( SourceLineInfo const& other ) const;
-file.swap( other.file );
+bool operator < ( SourceLineInfo const& other ) const;
-std::swap( line, other.line );
-}
 std::string file;
 std::size_t line;
 };
-inline std::ostream& operator << ( std::ostream& os, const SourceLineInfo& info ) {
+std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-#ifndef __GNUG__
-os << info.file << "(" << info.line << "): ";
+// This is just here to avoid compiler warnings with macro constants and boolean literals
-#else
+inline bool isTrue( bool value ){ return value; }
-os << info.file << ":" << info.line << ": ";
+inline bool alwaysTrue() { return true; }
-#endif
+inline bool alwaysFalse() { return false; }
-return os;
-}
+void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo );
-ATTRIBUTE_NORETURN
+void seedRng( IConfig const& config );
-inline void throwLogicError( const std::string& message, const std::string& file, std::size_t line ) {
+unsigned int rngSeed();
-std::ostringstream oss;
-oss << "Internal Catch error: '" << message << "' at: " << SourceLineInfo( file, line );
+// Use this in variadic streaming macros to allow
-throw std::logic_error( oss.str() );
+//    >> +StreamEndStop
+// as well as
+//    >> stuff +StreamEndStop
+struct StreamEndStop {
+std::string operator+() {
+return std::string();
+}
+};
+template<typename T>
+T const& operator + ( T const& value, StreamEndStop ) {
+return value;
 }
 }
-#define CATCH_INTERNAL_ERROR( msg ) throwLogicError( msg, __FILE__, __LINE__ );
+#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, __LINE__ )
+#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO );
-// #included from: catch_totals.hpp
+#include <ostream>
 namespace Catch {
-struct Counts {
+class NotImplementedException : public std::exception
-Counts() : passed( 0 ), failed( 0 ) {}
+{
+public:
-Counts operator - ( const Counts& other ) const {
+NotImplementedException( SourceLineInfo const& lineInfo );
-Counts diff;
+NotImplementedException( NotImplementedException const& ) {}
-diff.passed = passed - other.passed;
-diff.failed = failed - other.failed;
+virtual ~NotImplementedException() CATCH_NOEXCEPT {}
-return diff;
-}
+virtual const char* what() const CATCH_NOEXCEPT;
-Counts& operator += ( const Counts& other ) {
-passed += other.passed;
+private:
-failed += other.failed;
+std::string m_what;
-return *this;
+SourceLineInfo m_lineInfo;
-}
+};
-std::size_t total() const {
+} // end namespace Catch
-return passed + failed;
-}
+///////////////////////////////////////////////////////////////////////////////
+#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO )
-std::size_t passed;
-std::size_t failed;
+// #included from: internal/catch_context.h
-};
+#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
-struct Totals {
+// #included from: catch_interfaces_generators.h
+#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED
-Totals operator - ( const Totals& other ) const {
-Totals diff;
+#include <string>
-diff.assertions = assertions - other.assertions;
-diff.testCases = testCases - other.testCases;
+namespace Catch {
-return diff;
-}
+struct IGeneratorInfo {
+virtual ~IGeneratorInfo();
-Totals delta( const Totals& prevTotals ) const {
+virtual bool moveNext() = 0;
-Totals diff = *this - prevTotals;
+virtual std::size_t getCurrentIndex() const = 0;
-if( diff.assertions.failed > 0 )
+};
-++diff.testCases.failed;
-else
+struct IGeneratorsForTest {
-++diff.testCases.passed;
+virtual ~IGeneratorsForTest();
-return diff;
-}
+virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0;
+virtual bool moveNext() = 0;
-Counts assertions;
+};
-Counts testCases;
-};
+IGeneratorsForTest* createGeneratorsForTest();
-}
+} // end namespace Catch
 // #included from: catch_ptr.hpp
+#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
 namespace Catch {
 // An intrusive reference counting smart pointer.
 // T must implement addRef() and release() methods
 // typically implementing the IShared interface
 template<typename T>
 class Ptr {
 public:
-Ptr() : m_p( NULL ){}
+Ptr() : m_p( CATCH_NULL ){}
 Ptr( T* p ) : m_p( p ){
-m_p->addRef();
+if( m_p )
-}
+m_p->addRef();
-Ptr( const Ptr& other ) : m_p( other.m_p ){
+}
-m_p->addRef();
+Ptr( Ptr const& other ) : m_p( other.m_p ){
+if( m_p )
+m_p->addRef();
 }
 ~Ptr(){
 if( m_p )
 m_p->release();
+}
+void reset() {
+if( m_p )
+m_p->release();
+m_p = CATCH_NULL;
 }
 Ptr& operator = ( T* p ){
 Ptr temp( p );
 swap( temp );
 return *this;
 }
-Ptr& operator = ( Ptr& other ){
+Ptr& operator = ( Ptr const& other ){
 Ptr temp( other );
 swap( temp );
 return *this;
 }
-void swap( Ptr& other ){
+void swap( Ptr& other ) { std::swap( m_p, other.m_p ); }
-std::swap( m_p, other.m_p );
+T* get() const{ return m_p; }
-}
+T& operator*() const { return *m_p; }
+T* operator->() const { return m_p; }
-T* get(){
+bool operator !() const { return m_p == CATCH_NULL; }
-return m_p;
+operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); }
-}
-const T* get() const{
-return m_p;
-}
-T& operator*(){
-return *m_p;
-}
-const T& operator*() const{
-return *m_p;
-}
-T* operator->(){
-return m_p;
-}
-const T* operator->() const{
-return m_p;
-}
 private:
 T* m_p;
 };
 struct IShared : NonCopyable {
-virtual ~IShared(){}
+virtual ~IShared();
-virtual void addRef() = 0;
+virtual void addRef() const = 0;
-virtual void release() = 0;
+virtual void release() const = 0;
 };
-template<typename T>
+template<typename T = IShared>
 struct SharedImpl : T {
 SharedImpl() : m_rc( 0 ){}
-virtual void addRef(){
+virtual void addRef() const {
 ++m_rc;
 }
-virtual void release(){
+virtual void release() const {
 if( --m_rc == 0 )
 delete this;
 }
-int m_rc;
+mutable unsigned int m_rc;
 };
 } // end namespace Catch
-#include <string>
+#ifdef __clang__
-#include <ostream>
+#pragma clang diagnostic pop
-#include <map>
+#endif
-namespace Catch
-{
-struct IReporterConfig {
-virtual ~IReporterConfig() {}
-virtual std::ostream& stream () const = 0;
-virtual bool includeSuccessfulResults () const = 0;
-virtual std::string getName () const = 0;
-};
-class TestCaseInfo;
-class ResultInfo;
-struct IReporter : IShared {
-virtual ~IReporter() {}
-virtual bool shouldRedirectStdout() const = 0;
-virtual void StartTesting() = 0;
-virtual void EndTesting( const Totals& totals ) = 0;
-virtual void StartGroup( const std::string& groupName ) = 0;
-virtual void EndGroup( const std::string& groupName, const Totals& totals ) = 0;
-virtual void StartSection( const std::string& sectionName, const std::string& description ) = 0;
-virtual void EndSection( const std::string& sectionName, const Counts& assertions ) = 0;
-virtual void StartTestCase( const TestCaseInfo& testInfo ) = 0;
-virtual void Aborted() = 0;
-virtual void EndTestCase( const TestCaseInfo& testInfo, const Totals& totals, const std::string& stdOut, const std::string& stdErr ) = 0;
-virtual void Result( const ResultInfo& result ) = 0;
-};
-struct IReporterFactory {
-virtual ~IReporterFactory() {}
-virtual IReporter* create( const IReporterConfig& config ) const = 0;
-virtual std::string getDescription() const = 0;
-};
-struct IReporterRegistry {
-typedef std::map<std::string, IReporterFactory*> FactoryMap;
-virtual ~IReporterRegistry() {}
-virtual IReporter* create( const std::string& name, const IReporterConfig& config ) const = 0;
-virtual void registerReporter( const std::string& name, IReporterFactory* factory ) = 0;
-virtual const FactoryMap& getFactories() const = 0;
-};
-inline std::string trim( const std::string& str ) {
-std::string::size_type start = str.find_first_not_of( "\n\r\t " );
-std::string::size_type end = str.find_last_not_of( "\n\r\t " );
-return start != std::string::npos ? str.substr( start, 1+end-start ) : "";
-}
-}
-// #included from: catch_interfaces_config.h
-namespace Catch {
-struct IConfig {
-virtual ~IConfig(){}
-virtual bool allowThrows() const = 0;
-};
-}
 #include <memory>
 #include <vector>
 #include <stdlib.h>
 namespace Catch {
-class TestCaseInfo;
+class TestCase;
+class Stream;
 struct IResultCapture;
-struct ITestCaseRegistry;
 struct IRunner;
-struct IExceptionTranslatorRegistry;
+struct IGeneratorsForTest;
-class GeneratorsForTest;
+struct IConfig;
-class StreamBufBase : public std::streambuf{};
 struct IContext
 {
-virtual ~IContext(){}
+virtual ~IContext();
-virtual IResultCapture& getResultCapture() = 0;
+virtual IResultCapture* getResultCapture() = 0;
-virtual IRunner& getRunner() = 0;
+virtual IRunner* getRunner() = 0;
-virtual IReporterRegistry& getReporterRegistry() = 0;
+virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0;
-virtual ITestCaseRegistry& getTestCaseRegistry() = 0;
-virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
-virtual size_t getGeneratorIndex( const std::string& fileInfo, size_t totalSize ) = 0;
 virtual bool advanceGeneratorsForCurrentTest() = 0;
-virtual const IConfig* getConfig() const = 0;
+virtual Ptr<IConfig const> getConfig() const = 0;
 };
 struct IMutableContext : IContext
 {
+virtual ~IMutableContext();
 virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
 virtual void setRunner( IRunner* runner ) = 0;
-virtual void setConfig( const IConfig* config ) = 0;
+virtual void setConfig( Ptr<IConfig const> const& config ) = 0;
 };
 IContext& getCurrentContext();
 IMutableContext& getCurrentMutableContext();
+void cleanUpContext();
-class Context : public IMutableContext {
+Stream createStream( std::string const& streamName );
-Context();
-Context( const Context& );
-void operator=( const Context& );
-public: // IContext
-virtual IResultCapture& getResultCapture();
-virtual IRunner& getRunner();
-virtual IReporterRegistry& getReporterRegistry();
-virtual ITestCaseRegistry& getTestCaseRegistry();
-virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry();
-virtual size_t getGeneratorIndex( const std::string& fileInfo, size_t totalSize );
-virtual bool advanceGeneratorsForCurrentTest();
-virtual const IConfig* getConfig() const;
-public: // IMutableContext
-virtual void setResultCapture( IResultCapture* resultCapture );
-virtual void setRunner( IRunner* runner );
-virtual void setConfig( const IConfig* config );
-public: // Statics
-static std::streambuf* createStreamBuf( const std::string& streamName );
-static void cleanUp();
-friend IMutableContext& getCurrentMutableContext();
-private:
-GeneratorsForTest* findGeneratorsForCurrentTest();
-GeneratorsForTest& getGeneratorsForCurrentTest();
-private:
-std::auto_ptr<IReporterRegistry> m_reporterRegistry;
-std::auto_ptr<ITestCaseRegistry> m_testCaseRegistry;
-std::auto_ptr<IExceptionTranslatorRegistry> m_exceptionTranslatorRegistry;
-IRunner* m_runner;
-IResultCapture* m_resultCapture;
-const IConfig* m_config;
-std::map<std::string, GeneratorsForTest*> m_generatorsByTestName;
-};
 }
 // #included from: internal/catch_test_registry.hpp
+#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 // #included from: catch_interfaces_testcase.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
 #include <vector>
 namespace Catch {
-struct ITestCase {
-virtual ~ITestCase(){}
+class TestSpec;
+struct ITestCase : IShared {
 virtual void invoke () const = 0;
-virtual ITestCase* clone() const = 0;
+protected:
-virtual bool operator == ( const ITestCase& other ) const = 0;
+virtual ~ITestCase();
-virtual bool operator < ( const ITestCase& other ) const = 0;
+};
-};
+class TestCase;
-class TestCaseInfo;
+struct IConfig;
 struct ITestCaseRegistry {
-virtual ~ITestCaseRegistry(){}
+virtual ~ITestCaseRegistry();
-virtual void registerTest( const TestCaseInfo& testInfo ) = 0;
+virtual std::vector<TestCase> const& getAllTests() const = 0;
-virtual const std::vector<TestCaseInfo>& getAllTests() const = 0;
+virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-virtual std::vector<TestCaseInfo> getMatchingTestCases( const std::string& rawTestSpec ) = 0;
+};
-};
+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 );
 }
 namespace Catch {
 template<typename C>
-class MethodTestCase : public ITestCase {
+class MethodTestCase : public SharedImpl<ITestCase> {
 public:
 MethodTestCase( void (C::*method)() ) : m_method( method ) {}
 virtual void invoke() const {
 C obj;
 (obj.*m_method)();
 }
-virtual ITestCase* clone() const {
-return new MethodTestCase<C>( m_method );
-}
-virtual bool operator == ( const ITestCase& other ) const {
-const MethodTestCase* mtOther = dynamic_cast<const MethodTestCase*>( &other );
-return mtOther && m_method == mtOther->m_method;
-}
-virtual bool operator < ( const ITestCase& other ) const {
-const MethodTestCase* mtOther = dynamic_cast<const MethodTestCase*>( &other );
-return mtOther && &m_method < &mtOther->m_method;
-}
 private:
+virtual ~MethodTestCase() {}
 void (C::*m_method)();
 };
 typedef void(*TestFunction)();
+struct NameAndDesc {
+NameAndDesc( const char* _name = "", const char* _description= "" )
+: name( _name ), description( _description )
+{}
+const char* name;
+const char* description;
+};
+void registerTestCase
+(   ITestCase* testCase,
+char const* className,
+NameAndDesc const& nameAndDesc,
+SourceLineInfo const& lineInfo );
 struct AutoReg {
-AutoReg(    TestFunction function,
+AutoReg
-const char* name,
+(   TestFunction function,
-const char* description,
+SourceLineInfo const& lineInfo,
-const SourceLineInfo& lineInfo );
+NameAndDesc const& nameAndDesc );
 template<typename C>
-AutoReg(    void (C::*method)(),
+AutoReg
-const char* name,
+(   void (C::*method)(),
-const char* description,
+char const* className,
-const SourceLineInfo& lineInfo ) {
+NameAndDesc const& nameAndDesc,
-registerTestCase( new MethodTestCase<C>( method ), name, description, lineInfo );
+SourceLineInfo const& lineInfo ) {
-}
+registerTestCase
-void registerTestCase(  ITestCase* testCase,
+(   new MethodTestCase<C>( method ),
-const char* name,
+className,
-const char* description,
+nameAndDesc,
-const SourceLineInfo& lineInfo );
+lineInfo );
+}
 ~AutoReg();
 private:
-AutoReg( const AutoReg& );
+AutoReg( AutoReg const& );
-void operator= ( const AutoReg& );
+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_TESTCASE( Name, Desc ) \
+///////////////////////////////////////////////////////////////////////////////
-static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )(); \
+#define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME(  TestCaseFunction_catch_internal_ ), Name, Desc, CATCH_INTERNAL_LINEINFO ); }\
+static void TestName(); \
-static void INTERNAL_CATCH_UNIQUE_NAME(  TestCaseFunction_catch_internal_ )()
+namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\
+static void TestName()
-///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TESTCASE( ... ) \
-#define INTERNAL_CATCH_TESTCASE_NORETURN( Name, Desc ) \
+INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
-static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() ATTRIBUTE_NORETURN; \
-namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME(  TestCaseFunction_catch_internal_ ), Name, Desc, CATCH_INTERNAL_LINEINFO ); }\
+///////////////////////////////////////////////////////////////////////////////
-static void INTERNAL_CATCH_UNIQUE_NAME(  TestCaseFunction_catch_internal_ )()
+#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 CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \
+///////////////////////////////////////////////////////////////////////////////
-namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, Name, Desc, CATCH_INTERNAL_LINEINFO ); }
+#define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+namespace{ \
-///////////////////////////////////////////////////////////////////////////////
+struct TestName : ClassName{ \
-#define TEST_CASE_METHOD( ClassName, TestName, Desc )\
+void test(); \
-namespace{ \
+}; \
-struct INTERNAL_CATCH_UNIQUE_NAME( TestCaseMethod_catch_internal_ ) : ClassName{ \
+Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); \
-void test(); \
+} \
-}; \
+void TestName::test()
-Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &INTERNAL_CATCH_UNIQUE_NAME( TestCaseMethod_catch_internal_ )::test, TestName, Desc, CATCH_INTERNAL_LINEINFO ); \
+#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__ )
-void INTERNAL_CATCH_UNIQUE_NAME( TestCaseMethod_catch_internal_ )::test()
+///////////////////////////////////////////////////////////////////////////////
+#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 ) \
+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_METHOD2( TestCaseName, ClassName, TestName, Desc )\
+namespace{ \
+struct TestCaseName : ClassName{ \
+void test(); \
+}; \
+Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); \
+} \
+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
 // #included from: internal/catch_capture.hpp
+#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
-// #included from: catch_expression_builder.hpp
+// #included from: catch_result_builder.h
-// #included from: catch_expression.hpp
+#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED
-// #included from: catch_resultinfo_builder.hpp
+// #included from: catch_result_type.h
+#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
-// #included from: catch_tostring.hpp
+namespace Catch {
+// ResultWas::OfType enum
+struct ResultWas { enum OfType {
+Unknown = -1,
+Ok = 0,
+Info = 1,
+Warning = 2,
+FailureBit = 0x10,
+ExpressionFailed = FailureBit | 1,
+ExplicitFailure = FailureBit | 2,
+Exception = 0x100 | FailureBit,
+ThrewException = Exception | 1,
+DidntThrowException = Exception | 2,
+FatalErrorCondition = 0x200 | FailureBit
+}; };
+inline bool isOk( ResultWas::OfType resultType ) {
+return ( resultType & ResultWas::FailureBit ) == 0;
+}
+inline bool isJustInfo( int flags ) {
+return flags == ResultWas::Info;
+}
+// ResultDisposition::Flags enum
+struct ResultDisposition { enum Flags {
+Normal = 0x01,
+ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+FalseTest = 0x04,           // Prefix expression with !
+SuppressFail = 0x08         // Failures are reported but do not fail the test
+}; };
+inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+}
+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
+// #included from: catch_assertionresult.h
+#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
+#include <string>
+namespace Catch {
+struct AssertionInfo
+{
+AssertionInfo() {}
+AssertionInfo(  std::string const& _macroName,
+SourceLineInfo const& _lineInfo,
+std::string const& _capturedExpression,
+ResultDisposition::Flags _resultDisposition );
+std::string macroName;
+SourceLineInfo lineInfo;
+std::string capturedExpression;
+ResultDisposition::Flags resultDisposition;
+};
+struct AssertionResultData
+{
+AssertionResultData() : resultType( ResultWas::Unknown ) {}
+std::string reconstructedExpression;
+std::string message;
+ResultWas::OfType resultType;
+};
+class AssertionResult {
+public:
+AssertionResult();
+AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+~AssertionResult();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+AssertionResult( AssertionResult const& )              = default;
+AssertionResult( AssertionResult && )                  = default;
+AssertionResult& operator = ( AssertionResult const& ) = default;
+AssertionResult& operator = ( AssertionResult && )     = default;
+#  endif
+bool isOk() const;
+bool succeeded() const;
+ResultWas::OfType getResultType() const;
+bool hasExpression() const;
+bool hasMessage() const;
+std::string getExpression() const;
+std::string getExpressionInMacro() const;
+bool hasExpandedExpression() const;
+std::string getExpandedExpression() const;
+std::string getMessage() const;
+SourceLineInfo getSourceInfo() const;
+std::string getTestMacroName() const;
+protected:
+AssertionInfo m_info;
+AssertionResultData m_resultData;
+};
+} // end namespace Catch
+// #included from: catch_matchers.hpp
+#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
+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>
+{
+typedef ExpressionT ExpressionType;
+virtual ~Matcher() {}
+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>
+struct MatcherImpl : Matcher<ExpressionT> {
+virtual Ptr<Matcher<ExpressionT> > clone() const {
+return Ptr<Matcher<ExpressionT> >( new DerivedT( static_cast<DerivedT const&>( *this ) ) );
+}
+};
+namespace Generic {
+template<typename ExpressionT>
+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 {
+return !m_matcher->match( expr );
+}
+virtual std::string toString() const CATCH_OVERRIDE {
+return "not " + m_matcher->toString();
+}
+private:
+Ptr< Matcher<ExpressionT> > m_matcher;
+};
+template<typename ExpressionT>
+class AllOf : public MatcherImpl<AllOf<ExpressionT>, ExpressionT> {
+public:
+AllOf() {}
+AllOf( AllOf const& other ) : m_matchers( other.m_matchers ) {}
+AllOf& add( Matcher<ExpressionT> const& matcher ) {
+m_matchers.push_back( matcher.clone() );
+return *this;
+}
+virtual bool match( ExpressionT const& expr ) const
+{
+for( std::size_t i = 0; i < m_matchers.size(); ++i )
+if( !m_matchers[i]->match( expr ) )
+return false;
+return true;
+}
+virtual std::string toString() const {
+std::ostringstream oss;
+oss << "( ";
+for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+if( i != 0 )
+oss << " and ";
+oss << m_matchers[i]->toString();
+}
+oss << " )";
+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;
+};
+template<typename ExpressionT>
+class AnyOf : public MatcherImpl<AnyOf<ExpressionT>, ExpressionT> {
+public:
+AnyOf() {}
+AnyOf( AnyOf const& other ) : m_matchers( other.m_matchers ) {}
+AnyOf& add( Matcher<ExpressionT> const& matcher ) {
+m_matchers.push_back( matcher.clone() );
+return *this;
+}
+virtual bool match( ExpressionT const& expr ) const
+{
+for( std::size_t i = 0; i < m_matchers.size(); ++i )
+if( m_matchers[i]->match( expr ) )
+return true;
+return false;
+}
+virtual std::string toString() const {
+std::ostringstream oss;
+oss << "( ";
+for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+if( i != 0 )
+oss << " or ";
+oss << m_matchers[i]->toString();
+}
+oss << " )";
+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; }
+inline std::string makeString( const char* str ) { return str ? std::string( str ) : std::string(); }
+struct CasedString
+{
+CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+:   m_caseSensitivity( caseSensitivity ),
+m_str( adjustString( str ) )
+{}
+std::string adjustString( std::string const& str ) const {
+return m_caseSensitivity == CaseSensitive::No
+? toLower( str )
+: str;
+}
+std::string toStringSuffix() const
+{
+return m_caseSensitivity == CaseSensitive::No
+? " (case insensitive)"
+: "";
+}
+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 )
+{}
+Equals( Equals const& other ) : m_data( other.m_data ){}
+virtual ~Equals();
+virtual bool match( std::string const& expr ) const {
+return m_data.m_str == m_data.adjustString( expr );;
+}
+virtual std::string toString() const {
+return "equals: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
+}
+CasedString m_data;
+};
+struct Contains : MatcherImpl<Contains, std::string> {
+Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+: m_data( substr, caseSensitivity ){}
+Contains( Contains const& other ) : m_data( other.m_data ){}
+virtual ~Contains();
+virtual bool match( std::string const& expr ) const {
+return m_data.adjustString( expr ).find( m_data.m_str ) != std::string::npos;
+}
+virtual std::string toString() const {
+return "contains: \"" + m_data.m_str  + "\"" + m_data.toStringSuffix();
+}
+CasedString m_data;
+};
+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 startsWith( m_data.adjustString( expr ), m_data.m_str );
+}
+virtual std::string toString() const {
+return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();
+}
+CasedString m_data;
+};
+struct EndsWith : MatcherImpl<EndsWith, std::string> {
+EndsWith( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes )
+: m_data( substr, caseSensitivity ){}
+EndsWith( EndsWith const& other ) : m_data( other.m_data ){}
+virtual ~EndsWith();
+virtual bool match( std::string const& expr ) const {
+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();
+}
+CasedString m_data;
+};
+} // namespace StdString
+} // namespace Impl
+// The following functions create the actual matcher objects.
+// This allows the types to be inferred
+template<typename ExpressionT>
+inline Impl::Generic::Not<ExpressionT> Not( Impl::Matcher<ExpressionT> const& m ) {
+return Impl::Generic::Not<ExpressionT>( m );
+}
+template<typename ExpressionT>
+inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+Impl::Matcher<ExpressionT> const& m2 ) {
+return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 );
+}
+template<typename ExpressionT>
+inline Impl::Generic::AllOf<ExpressionT> AllOf( Impl::Matcher<ExpressionT> const& m1,
+Impl::Matcher<ExpressionT> const& m2,
+Impl::Matcher<ExpressionT> const& m3 ) {
+return Impl::Generic::AllOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
+}
+template<typename ExpressionT>
+inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+Impl::Matcher<ExpressionT> const& m2 ) {
+return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 );
+}
+template<typename ExpressionT>
+inline Impl::Generic::AnyOf<ExpressionT> AnyOf( Impl::Matcher<ExpressionT> const& m1,
+Impl::Matcher<ExpressionT> const& m2,
+Impl::Matcher<ExpressionT> const& m3 ) {
+return Impl::Generic::AnyOf<ExpressionT>().add( m1 ).add( m2 ).add( m3 );
+}
+inline Impl::StdString::Equals      Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+return Impl::StdString::Equals( str, caseSensitivity );
+}
+inline Impl::StdString::Equals      Equals( const char* str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+return Impl::StdString::Equals( Impl::StdString::makeString( str ), caseSensitivity );
+}
+inline Impl::StdString::Contains    Contains( std::string const& substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+return Impl::StdString::Contains( substr, caseSensitivity );
+}
+inline Impl::StdString::Contains    Contains( const char* substr, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ) {
+return Impl::StdString::Contains( Impl::StdString::makeString( substr ), caseSensitivity );
+}
+inline Impl::StdString::StartsWith  StartsWith( std::string const& substr ) {
+return Impl::StdString::StartsWith( substr );
+}
+inline Impl::StdString::StartsWith  StartsWith( const char* substr ) {
+return Impl::StdString::StartsWith( Impl::StdString::makeString( substr ) );
+}
+inline Impl::StdString::EndsWith    EndsWith( std::string const& substr ) {
+return Impl::StdString::EndsWith( substr );
+}
+inline Impl::StdString::EndsWith    EndsWith( const char* substr ) {
+return Impl::StdString::EndsWith( Impl::StdString::makeString( substr ) );
+}
+} // namespace Matchers
+using namespace Matchers;
+} // namespace Catch
+namespace Catch {
+struct TestFailureException{};
+template<typename T> class ExpressionLhs;
+struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
+struct CopyableStream {
+CopyableStream() {}
+CopyableStream( CopyableStream const& other ) {
+oss << other.oss.str();
+}
+CopyableStream& operator=( CopyableStream const& other ) {
+oss.str("");
+oss << other.oss.str();
+return *this;
+}
+std::ostringstream oss;
+};
+class ResultBuilder {
+public:
+ResultBuilder(  char const* macroName,
+SourceLineInfo const& lineInfo,
+char const* capturedExpression,
+ResultDisposition::Flags resultDisposition,
+char const* secondArg = "" );
+template<typename T>
+ExpressionLhs<T const&> operator <= ( T const& operand );
+ExpressionLhs<bool> operator <= ( bool value );
+template<typename T>
+ResultBuilder& operator << ( T const& value ) {
+m_stream.oss << value;
+return *this;
+}
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
+ResultBuilder& setResultType( ResultWas::OfType result );
+ResultBuilder& setResultType( bool result );
+ResultBuilder& setLhs( std::string const& lhs );
+ResultBuilder& setRhs( std::string const& rhs );
+ResultBuilder& setOp( std::string const& op );
+void endExpression();
+std::string reconstructExpression() const;
+AssertionResult build() const;
+void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal );
+void captureResult( ResultWas::OfType resultType );
+void captureExpression();
+void captureExpectedException( std::string const& expectedMessage );
+void captureExpectedException( Matchers::Impl::Matcher<std::string> const& matcher );
+void handleResult( AssertionResult const& result );
+void react();
+bool shouldDebugBreak() const;
+bool allowThrows() const;
+private:
+AssertionInfo m_assertionInfo;
+AssertionResultData m_data;
+struct ExprComponents {
+ExprComponents() : testFalse( false ) {}
+bool testFalse;
+std::string lhs, rhs, op;
+} m_exprComponents;
+CopyableStream m_stream;
+bool m_shouldDebugBreak;
+bool m_shouldThrow;
+};
+} // namespace Catch
+// Include after due to circular dependency:
+// #included from: catch_expression_lhs.hpp
+#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED
+// #included from: catch_evaluate.hpp
+#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#endif
+#include <cstddef>
+namespace Catch {
+namespace Internal {
+enum Operator {
+IsEqualTo,
+IsNotEqualTo,
+IsLessThan,
+IsGreaterThan,
+IsLessThanOrEqualTo,
+IsGreaterThanOrEqualTo
+};
+template<Operator Op> struct OperatorTraits             { static const char* getName(){ return "*error*"; } };
+template<> struct OperatorTraits<IsEqualTo>             { static const char* getName(){ return "=="; } };
+template<> struct OperatorTraits<IsNotEqualTo>          { static const char* getName(){ return "!="; } };
+template<> struct OperatorTraits<IsLessThan>            { static const char* getName(){ return "<"; } };
+template<> struct OperatorTraits<IsGreaterThan>         { static const char* getName(){ return ">"; } };
+template<> struct OperatorTraits<IsLessThanOrEqualTo>   { static const char* getName(){ return "<="; } };
+template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
+template<typename T>
+inline T& opCast(T const& t) { return const_cast<T&>(t); }
+// nullptr_t support based on pull request #154 from Konstantin Baumann
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; }
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+// So the compare overloads can be operator agnostic we convey the operator as a template
+// enum, which is used to specialise an Evaluator for doing the comparison.
+template<typename T1, typename T2, Operator Op>
+class Evaluator{};
+template<typename T1, typename T2>
+struct Evaluator<T1, T2, IsEqualTo> {
+static bool evaluate( T1 const& lhs, T2 const& 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 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 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 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 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 bool( opCast( lhs ) <= opCast( rhs ) );
+}
+};
+template<Operator Op, typename T1, typename T2>
+bool applyEvaluator( T1 const& lhs, T2 const& rhs ) {
+return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+}
+// This level of indirection allows us to specialise for integer types
+// to avoid signed/ unsigned warnings
+// "base" overload
+template<Operator Op, typename T1, typename T2>
+bool compare( T1 const& lhs, T2 const& rhs ) {
+return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+}
+// unsigned X to int
+template<Operator Op> bool compare( unsigned int lhs, int rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+}
+template<Operator Op> bool compare( unsigned long lhs, int rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+}
+template<Operator Op> bool compare( unsigned char lhs, int rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+}
+// unsigned X to long
+template<Operator Op> bool compare( unsigned int lhs, long rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+}
+template<Operator Op> bool compare( unsigned long lhs, long rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+}
+template<Operator Op> bool compare( unsigned char lhs, long rhs ) {
+return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+}
+// int to unsigned X
+template<Operator Op> bool compare( int lhs, unsigned int rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+}
+template<Operator Op> bool compare( int lhs, unsigned long rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+}
+template<Operator Op> bool compare( int lhs, unsigned char rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+}
+// long to unsigned X
+template<Operator Op> bool compare( long lhs, unsigned int rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+template<Operator Op> bool compare( long lhs, unsigned long rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+template<Operator Op> bool compare( long lhs, unsigned char rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+// pointer to long (when comparing against NULL)
+template<Operator Op, typename T> bool compare( long lhs, T* rhs ) {
+return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+}
+template<Operator Op, typename T> bool compare( T* lhs, long rhs ) {
+return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+}
+// pointer to int (when comparing against NULL)
+template<Operator Op, typename T> bool compare( int lhs, T* rhs ) {
+return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+}
+template<Operator Op, typename T> bool compare( T* lhs, int rhs ) {
+return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+}
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+// long long to unsigned X
+template<Operator Op> bool compare( long long lhs, unsigned int rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+template<Operator Op> bool compare( long long lhs, unsigned long rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+template<Operator Op> bool compare( long long lhs, unsigned long long rhs ) {
+return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+}
+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 );
+}
+template<Operator Op> bool compare( unsigned long long lhs, long rhs ) {
+return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+}
+template<Operator Op> bool compare( unsigned long long lhs, long long rhs ) {
+return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+}
+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 );
+}
+template<Operator Op, typename T> bool compare( T* lhs, long long rhs ) {
+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 ) {
+return Evaluator<T*, T*, Op>::evaluate( nullptr, rhs );
+}
+template<Operator Op, typename T> bool compare( T* lhs, std::nullptr_t ) {
+return Evaluator<T*, T*, Op>::evaluate( lhs, nullptr );
+}
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+} // end of namespace Internal
+} // end of namespace Catch
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+// #included from: catch_tostring.h
+#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
 #include <sstream>
+#include <iomanip>
+#include <limits>
+#include <vector>
+#include <cstddef>
+#ifdef __OBJC__
+// #included from: catch_objc_arc.hpp
+#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED
+#import <Foundation/Foundation.h>
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+[obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+if( [obj respondsToSelector: sel] )
+return [obj performSelector: sel];
+return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+if( [obj respondsToSelector: sel] )
+return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+#endif
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+#include <tuple>
+#endif
+#ifdef CATCH_CONFIG_CPP11_IS_ENUM
+#include <type_traits>
+#endif
 namespace Catch {
+// Why we're here.
+template<typename T>
+std::string toString( T const& value );
+// Built in overloads
+std::string toString( std::string const& value );
+std::string toString( std::wstring const& value );
+std::string toString( const char* const value );
+std::string toString( char* const value );
+std::string toString( const wchar_t* const value );
+std::string toString( wchar_t* const value );
+std::string toString( int value );
+std::string toString( unsigned long value );
+std::string toString( unsigned int value );
+std::string toString( const double value );
+std::string toString( const float value );
+std::string toString( bool value );
+std::string toString( char value );
+std::string toString( signed char value );
+std::string toString( unsigned char value );
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+std::string toString( long long value );
+std::string toString( unsigned long long value );
+#endif
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+std::string toString( std::nullptr_t );
+#endif
+#ifdef __OBJC__
+std::string toString( NSString const * const& nsstring );
+std::string toString( NSString * CATCH_ARC_STRONG const& nsstring );
+std::string toString( NSObject* const& nsObject );
+#endif
 namespace Detail {
-struct NonStreamable {
+extern const std::string unprintableString;
-template<typename T> NonStreamable( const T& ){}
-};
+struct BorgType {
+template<typename T> BorgType( T const& );
-// If the type does not have its own << overload for ostream then
+};
-// this one will be used instead
-inline std::ostream& operator << ( std::ostream& ss, NonStreamable ){
+struct TrueType { char sizer[1]; };
-return ss << "{?}";
+struct FalseType { char sizer[2]; };
-}
+TrueType& testStreamable( std::ostream& );
+FalseType testStreamable( FalseType );
+FalseType operator<<( std::ostream const&, BorgType const& );
 template<typename T>
-inline std::string makeString( const T& value ) {
+struct IsStreamInsertable {
-std::ostringstream oss;
+static std::ostream &s;
-oss << value;
+static T  const&t;
-return oss.str();
+enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
-}
+};
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+template<typename T,
+bool IsEnum = std::is_enum<T>::value
+>
+struct EnumStringMaker
+{
+static std::string convert( T const& ) { return unprintableString; }
+};
 template<typename T>
-inline std::string makeString( T* p ) {
+struct EnumStringMaker<T,true>
+{
+static std::string convert( T const& v )
+{
+return ::Catch::toString(
+static_cast<typename std::underlying_type<T>::type>(v)
+);
+}
+};
+#endif
+template<bool C>
+struct StringMakerBase {
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+template<typename T>
+static std::string convert( T const& v )
+{
+return EnumStringMaker<T>::convert( v );
+}
+#else
+template<typename T>
+static std::string convert( T const& ) { return unprintableString; }
+#endif
+};
+template<>
+struct StringMakerBase<true> {
+template<typename T>
+static std::string convert( T const& _value ) {
+std::ostringstream oss;
+oss << _value;
+return oss.str();
+}
+};
+std::string rawMemoryToString( const void *object, std::size_t size );
+template<typename T>
+inline std::string rawMemoryToString( const T& object ) {
+return rawMemoryToString( &object, sizeof(object) );
+}
+} // end namespace Detail
+template<typename T>
+struct StringMaker :
+Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
+template<typename T>
+struct StringMaker<T*> {
+template<typename U>
+static std::string convert( U* p ) {
 if( !p )
-return INTERNAL_CATCH_STRINGIFY( NULL );
+return "NULL";
-std::ostringstream oss;
+else
-oss << p;
+return Detail::rawMemoryToString( p );
-return oss.str();
+}
-}
+};
+template<typename R, typename C>
+struct StringMaker<R C::*> {
+static std::string convert( R C::* p ) {
+if( !p )
+return "NULL";
+else
+return Detail::rawMemoryToString( p );
+}
+};
+namespace Detail {
+template<typename InputIterator>
+std::string rangeToString( InputIterator first, InputIterator last );
+}
+//template<typename T, typename Allocator>
+//struct StringMaker<std::vector<T, Allocator> > {
+//    static std::string convert( std::vector<T,Allocator> const& v ) {
+//        return Detail::rangeToString( v.begin(), v.end() );
+//    }
+//};
+template<typename T, typename Allocator>
+std::string toString( std::vector<T,Allocator> const& v ) {
+return Detail::rangeToString( v.begin(), v.end() );
+}
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+// toString for tuples
+namespace TupleDetail {
+template<
+typename Tuple,
+std::size_t N = 0,
+bool = (N < std::tuple_size<Tuple>::value)
+>
+struct ElementPrinter {
+static void print( const Tuple& tuple, std::ostream& os )
+{
+os << ( N ? ", " : " " )
+<< Catch::toString(std::get<N>(tuple));
+ElementPrinter<Tuple,N+1>::print(tuple,os);
+}
+};
+template<
+typename Tuple,
+std::size_t N
+>
+struct ElementPrinter<Tuple,N,false> {
+static void print( const Tuple&, std::ostream& ) {}
+};
+}
+template<typename ...Types>
+struct StringMaker<std::tuple<Types...>> {
+static std::string convert( const std::tuple<Types...>& tuple )
+{
+std::ostringstream os;
+os << '{';
+TupleDetail::ElementPrinter<std::tuple<Types...>>::print( tuple, os );
+os << " }";
+return os.str();
+}
+};
+#endif // CATCH_CONFIG_CPP11_TUPLE
+namespace Detail {
 template<typename T>
-inline std::string makeString( const T* p ) {
+std::string makeString( T const& value ) {
-if( !p )
+return StringMaker<T>::convert( value );
-return INTERNAL_CATCH_STRINGIFY( NULL );
+}
-std::ostringstream oss;
-oss << p;
-return oss.str();
-}
 } // end namespace Detail
 /// \brief converts any type to a string
 ///
 /// The default template forwards on to ostringstream - except when an
 /// ostringstream overload does not exist - in which case it attempts to detect
 /// that and writes {?}.
 /// Overload (not specialise) this template for custom typs that you don't want
 /// to provide an ostream overload for.
 template<typename T>
-std::string toString( const T& value ) {
+std::string toString( T const& value ) {
-return Detail::makeString( value );
+return StringMaker<T>::convert( value );
 }
-// Built in overloads
+namespace Detail {
+template<typename InputIterator>
-inline std::string toString( const std::string& value ) {
+std::string rangeToString( InputIterator first, InputIterator last ) {
-return "\"" + value + "\"";
+std::ostringstream oss;
+oss << "{ ";
+if( first != last ) {
+oss << Catch::toString( *first );
+for( ++first ; first != last ; ++first )
+oss << ", " << Catch::toString( *first );
+}
+oss << " }";
+return oss.str();
+}
 }
-inline std::string toString( const std::wstring& value ) {
-std::ostringstream oss;
-oss << "\"";
-for(size_t i = 0; i < value.size(); ++i )
-oss << static_cast<char>( value[i] <= 0xff ? value[i] : '?');
-oss << "\"";
-return oss.str();
-}
-inline std::string toString( const char* const value ) {
-return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
-}
-inline std::string toString( char* const value ) {
-return Catch::toString( static_cast<const char*>( value ) );
-}
-inline std::string toString( int value ) {
-std::ostringstream oss;
-oss << value;
-return oss.str();
-}
-inline std::string toString( unsigned long value ) {
-std::ostringstream oss;
-if( value > 8192 )
-oss << "0x" << std::hex << value;
-else
-oss << value;
-return oss.str();
-}
-inline std::string toString( unsigned int value ) {
-return toString( static_cast<unsigned long>( value ) );
-}
-inline std::string toString( const double value ) {
-std::ostringstream oss;
-oss << value;
-return oss.str();
-}
-inline std::string toString( bool value ) {
-return value ? "true" : "false";
-}
-inline std::string toString( char value ) {
-return value < ' '
-? toString( (unsigned int)value )
-: Detail::makeString( value );
-}
-inline std::string toString( signed char value ) {
-return toString( static_cast<char>( value ) );
-}
-#ifdef CATCH_CONFIG_CPP11_NULLPTR
-inline std::string toString( std::nullptr_t ) {
-return "nullptr";
-}
-#endif
 } // end namespace Catch
-// #included from: catch_resultinfo.hpp
-#include <string>
-// #included from: catch_result_type.h
 namespace Catch {
-struct ResultWas { enum OfType {
+// Wraps the LHS of an expression and captures the operator and RHS (if any) -
-Unknown = -1,
+// wrapping them all in a ResultBuilder object
-Ok = 0,
+template<typename T>
-Info = 1,
+class ExpressionLhs {
-Warning = 2,
+ExpressionLhs& operator = ( ExpressionLhs const& );
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
-FailureBit = 0x10,
+ExpressionLhs& operator = ( ExpressionLhs && ) = delete;
+#  endif
-ExpressionFailed = FailureBit | 1,
-ExplicitFailure = FailureBit | 2,
-Exception = 0x100 | FailureBit,
-ThrewException = Exception | 1,
-DidntThrowException = Exception | 2
-}; };
-struct ResultAction { enum Value {
-None,
-Failed = 1, // Failure - but no debug break if Debug bit not set
-Debug = 2,  // If this bit is set, invoke the debugger
-Abort = 4   // Test run should abort
-}; };
-}
-namespace Catch {
-class ResultInfo {
-public:
-ResultInfo()
-:   m_macroName(),
-m_expr(),
-m_lhs(),
-m_rhs(),
-m_op(),
-m_message(),
-m_result( ResultWas::Unknown ),
-m_isNot( false )
-{}
-ResultInfo( const char* expr,
-ResultWas::OfType result,
-bool isNot,
-const SourceLineInfo& lineInfo,
-const char* macroName,
-const char* message )
-:   m_macroName( macroName ),
-m_lineInfo( lineInfo ),
-m_expr( expr ),
-m_lhs(),
-m_rhs(),
-m_op( isNotExpression( expr ) ? "!" : "" ),
-m_message( message ),
-m_result( result ),
-m_isNot( isNot )
-{
-if( isNot )
-m_expr = "!" + m_expr;
-}
-virtual ~ResultInfo() {}
-bool ok() const {
-return ( m_result & ResultWas::FailureBit ) != ResultWas::FailureBit;
-}
-ResultWas::OfType getResultType() const {
-return m_result;
-}
-bool hasExpression() const {
-return !m_expr.empty();
-}
-bool hasMessage() const {
-return !m_message.empty();
-}
-std::string getExpression() const {
-return m_expr;
-}
-bool hasExpandedExpression() const {
-return hasExpression() && getExpandedExpressionInternal() != m_expr;
-}
-std::string getExpandedExpression() const {
-return hasExpression() ? getExpandedExpressionInternal() : "";
-}
-std::string getMessage() const {
-return m_message;
-}
-std::string getFilename() const {
-return m_lineInfo.file;
-}
-std::size_t getLine() const {
-return m_lineInfo.line;
-}
-std::string getTestMacroName() const {
-return m_macroName;
-}
-protected:
-std::string getExpandedExpressionInternal() const {
-if( m_op == "" || m_isNot )
-return m_lhs.empty() ? m_expr : m_op + m_lhs;
-else if( m_op == "matches" )
-return m_lhs + " " + m_rhs;
-else if( m_op != "!" )
-{
-if( m_lhs.size() + m_rhs.size() < 30 )
-return m_lhs + " " + m_op + " " + m_rhs;
-else if( m_lhs.size() < 70 && m_rhs.size() < 70 )
-return "\n\t" + m_lhs + "\n\t" + m_op + "\n\t" + m_rhs;
-else
-return "\n" + m_lhs + "\n" + m_op + "\n" + m_rhs + "\n\n";
-}
-else
-return "{can't expand - use " + m_macroName + "_FALSE( " + m_expr.substr(1) + " ) instead of " + m_macroName + "( " + m_expr + " ) for better diagnostics}";
-}
-bool isNotExpression( const char* expr ) {
-return expr && expr[0] == '!';
-}
-protected:
-std::string m_macroName;
-SourceLineInfo m_lineInfo;
-std::string m_expr, m_lhs, m_rhs, m_op;
-std::string m_message;
-ResultWas::OfType m_result;
-bool m_isNot;
-};
-} // end namespace Catch
-// #included from: catch_evaluate.hpp
-namespace Catch {
-namespace Internal {
-enum Operator {
-IsEqualTo,
-IsNotEqualTo,
-IsLessThan,
-IsGreaterThan,
-IsLessThanOrEqualTo,
-IsGreaterThanOrEqualTo
-};
-template<Operator Op> struct OperatorTraits             { static const char* getName(){ return "*error*"; } };
-template<> struct OperatorTraits<IsEqualTo>             { static const char* getName(){ return "=="; } };
-template<> struct OperatorTraits<IsNotEqualTo>          { static const char* getName(){ return "!="; } };
-template<> struct OperatorTraits<IsLessThan>            { static const char* getName(){ return "<"; } };
-template<> struct OperatorTraits<IsGreaterThan>         { static const char* getName(){ return ">"; } };
-template<> struct OperatorTraits<IsLessThanOrEqualTo>   { static const char* getName(){ return "<="; } };
-template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
-// So the compare overloads can be operator agnostic we convey the operator as a template
-// enum, which is used to specialise an Evaluator for doing the comparison.
-template<typename T1, typename T2, Operator Op>
-class Evaluator{};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsEqualTo> {
-static bool evaluate( const T1& lhs, const T2& rhs) {
-return const_cast<T1&>( lhs ) ==  const_cast<T2&>( rhs );
-}
-};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsNotEqualTo> {
-static bool evaluate( const T1& lhs, const T2& rhs ) {
-return const_cast<T1&>( lhs ) != const_cast<T2&>( rhs );
-}
-};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsLessThan> {
-static bool evaluate( const T1& lhs, const T2& rhs ) {
-return const_cast<T1&>( lhs ) < const_cast<T2&>( rhs );
-}
-};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsGreaterThan> {
-static bool evaluate( const T1& lhs, const T2& rhs ) {
-return const_cast<T1&>( lhs ) > const_cast<T2&>( rhs );
-}
-};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
-static bool evaluate( const T1& lhs, const T2& rhs ) {
-return const_cast<T1&>( lhs ) >= const_cast<T2&>( rhs );
-}
-};
-template<typename T1, typename T2>
-struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
-static bool evaluate( const T1& lhs, const T2& rhs ) {
-return const_cast<T1&>( lhs ) <= const_cast<T2&>( rhs );
-}
-};
-template<Operator Op, typename T1, typename T2>
-bool applyEvaluator( const T1& lhs, const T2& rhs ) {
-return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
-}
-// "base" overload
-template<Operator Op, typename T1, typename T2>
-bool compare( const T1& lhs, const T2& rhs ) {
-return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
-}
-// unsigned X to int
-template<Operator Op> bool compare( unsigned int lhs, int rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-}
-template<Operator Op> bool compare( unsigned long lhs, int rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-}
-template<Operator Op> bool compare( unsigned char lhs, int rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
-}
-// unsigned X to long
-template<Operator Op> bool compare( unsigned int lhs, long rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-}
-template<Operator Op> bool compare( unsigned long lhs, long rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-}
-template<Operator Op> bool compare( unsigned char lhs, long rhs ) {
-return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
-}
-// int to unsigned X
-template<Operator Op> bool compare( int lhs, unsigned int rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-}
-template<Operator Op> bool compare( int lhs, unsigned long rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-}
-template<Operator Op> bool compare( int lhs, unsigned char rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
-}
-// long to unsigned X
-template<Operator Op> bool compare( long lhs, unsigned int rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-}
-template<Operator Op> bool compare( long lhs, unsigned long rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-}
-template<Operator Op> bool compare( long lhs, unsigned char rhs ) {
-return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
-}
-// pointer to long (when comparing against NULL)
-template<Operator Op, typename T>
-bool compare( long lhs, const T* rhs ) {
-return Evaluator<const T*, const T*, Op>::evaluate( reinterpret_cast<const T*>( lhs ), rhs );
-}
-template<Operator Op, typename T>
-bool compare( long lhs, T* rhs ) {
-return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
-}
-template<Operator Op, typename T>
-bool compare( const T* lhs, long rhs ) {
-return Evaluator<const T*, const T*, Op>::evaluate( lhs, reinterpret_cast<const T*>( rhs ) );
-}
-template<Operator Op, typename T>
-bool compare( T* lhs, long rhs ) {
-return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
-}
-// pointer to int (when comparing against NULL)
-template<Operator Op, typename T>
-bool compare( int lhs, const T* rhs ) {
-return Evaluator<const T*, const T*, Op>::evaluate( reinterpret_cast<const T*>( lhs ), rhs );
-}
-template<Operator Op, typename T>
-bool compare( int lhs, T* rhs ) {
-return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
-}
-template<Operator Op, typename T>
-bool compare( const T* lhs, int rhs ) {
-return Evaluator<const T*, const T*, Op>::evaluate( lhs, reinterpret_cast<const T*>( rhs ) );
-}
-template<Operator Op, typename T>
-bool compare( T* lhs, int rhs ) {
-return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
-}
-} // end of namespace Internal
-} // end of namespace Catch
-namespace Catch {
-struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
-class ResultInfoBuilder : public ResultInfo {
 public:
+ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ) {}
-ResultInfoBuilder() {}
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+ExpressionLhs( ExpressionLhs const& ) = default;
-ResultInfoBuilder(  const char* expr,
+ExpressionLhs( ExpressionLhs && )     = default;
-bool isNot,
+#  endif
-const SourceLineInfo& lineInfo,
-const char* macroName,
-const char* message = "" )
-: ResultInfo( expr, ResultWas::Unknown, isNot, lineInfo, macroName, message )
-{}
-void setResultType( ResultWas::OfType result ) {
-// Flip bool results if isNot is set
-if( m_isNot && result == ResultWas::Ok )
-m_result = ResultWas::ExpressionFailed;
-else if( m_isNot && result == ResultWas::ExpressionFailed )
-m_result = ResultWas::Ok;
-else
-m_result = result;
-}
-void setMessage( const std::string& message ) {
-m_message = message;
-}
-void setLineInfo( const SourceLineInfo& lineInfo ) {
-m_lineInfo = lineInfo;
-}
-void setLhs( const std::string& lhs ) {
-m_lhs = lhs;
-}
-void setRhs( const std::string& rhs ) {
-m_rhs = rhs;
-}
-void setOp( const std::string& op ) {
-m_op = op;
-}
 template<typename RhsT>
-STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator ||
+ResultBuilder& operator == ( RhsT const& rhs ) {
-(
+return captureExpression<Internal::IsEqualTo>( rhs );
-const RhsT&
+}
-);
 template<typename RhsT>
-STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator &&
+ResultBuilder& operator != ( RhsT const& rhs ) {
-(
+return captureExpression<Internal::IsNotEqualTo>( rhs );
-const RhsT&
+}
-);
+template<typename RhsT>
+ResultBuilder& operator < ( RhsT const& rhs ) {
+return captureExpression<Internal::IsLessThan>( rhs );
+}
+template<typename RhsT>
+ResultBuilder& operator > ( RhsT const& rhs ) {
+return captureExpression<Internal::IsGreaterThan>( rhs );
+}
+template<typename RhsT>
+ResultBuilder& operator <= ( RhsT const& rhs ) {
+return captureExpression<Internal::IsLessThanOrEqualTo>( rhs );
+}
+template<typename RhsT>
+ResultBuilder& operator >= ( RhsT const& rhs ) {
+return captureExpression<Internal::IsGreaterThanOrEqualTo>( rhs );
+}
+ResultBuilder& operator == ( bool rhs ) {
+return captureExpression<Internal::IsEqualTo>( rhs );
+}
+ResultBuilder& operator != ( bool rhs ) {
+return captureExpression<Internal::IsNotEqualTo>( rhs );
+}
+void endExpression() {
+bool value = m_lhs ? true : false;
+m_rb
+.setLhs( Catch::toString( value ) )
+.setResultType( value )
+.endExpression();
+}
+// Only simple binary expressions are allowed on the LHS.
+// If more complex compositions are required then place the sub expression in parentheses
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& );
+template<typename RhsT> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& );
 private:
-friend class ExpressionBuilder;
+template<Internal::Operator Op, typename RhsT>
-template<typename T> friend class Expression;
+ResultBuilder& captureExpression( RhsT const& rhs ) {
+return m_rb
-template<typename T> friend class PtrExpression;
+.setResultType( Internal::compare<Op>( m_lhs, rhs ) )
+.setLhs( Catch::toString( m_lhs ) )
-ResultInfoBuilder& captureBoolExpression( bool result ) {
+.setRhs( Catch::toString( rhs ) )
-m_lhs = Catch::toString( result );
+.setOp( Internal::OperatorTraits<Op>::getName() );
-m_op = m_isNot ? "!" : "";
+}
-setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed );
-return *this;
-}
-template<Internal::Operator Op, typename T1, typename T2>
-ResultInfoBuilder& captureExpression( const T1& lhs, const T2& rhs ) {
-setResultType( Internal::compare<Op>( lhs, rhs ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
-m_lhs = Catch::toString( lhs );
-m_rhs = Catch::toString( rhs );
-m_op = Internal::OperatorTraits<Op>::getName();
-return *this;
-}
-template<Internal::Operator Op, typename T>
-ResultInfoBuilder& captureExpression( const T* lhs, int rhs ) {
-return captureExpression<Op>( lhs, reinterpret_cast<const T*>( rhs ) );
-}
-};
-} // end namespace Catch
-namespace Catch {
-template<typename T>
-class Expression {
-	void operator = ( const Expression& );
-public:
-Expression( ResultInfoBuilder& result, T lhs )
-:   m_result( result ),
-m_lhs( lhs )
-{}
-template<typename RhsT>
-ResultInfoBuilder& operator == ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
-}
-template<typename RhsT>
-ResultInfoBuilder& operator != ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
-}
-template<typename RhsT>
-ResultInfoBuilder& operator < ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsLessThan>( m_lhs, rhs );
-}
-template<typename RhsT>
-ResultInfoBuilder& operator > ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsGreaterThan>( m_lhs, rhs );
-}
-template<typename RhsT>
-ResultInfoBuilder& operator <= ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsLessThanOrEqualTo>( m_lhs, rhs );
-}
-template<typename RhsT>
-ResultInfoBuilder& operator >= ( const RhsT& rhs ) {
-return m_result.captureExpression<Internal::IsGreaterThanOrEqualTo>( m_lhs, rhs );
-}
-ResultInfoBuilder& operator == ( bool rhs ) {
-return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
-}
-ResultInfoBuilder& operator != ( bool rhs ) {
-return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
-}
-operator ResultInfoBuilder& () {
-return m_result.captureBoolExpression( m_lhs );
-}
-template<typename RhsT>
-STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( const RhsT& );
-template<typename RhsT>
-STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( const RhsT& );
 private:
-ResultInfoBuilder& m_result;
+ResultBuilder& m_rb;
 T m_lhs;
 };
 } // end namespace Catch
-#include <sstream>
 namespace Catch {
-class ExpressionBuilder {
-public:
-ExpressionBuilder(  const SourceLineInfo& lineInfo,
-const char* macroName,
-const char* expr = "",
-bool isNot = false )
-: m_result( expr, isNot, lineInfo, macroName ),
-m_messageStream()
-{}
 template<typename T>
-Expression<const T&> operator->* ( const T & operand ) {
+inline ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) {
-Expression<const T&> expr( m_result, operand );
+return ExpressionLhs<T const&>( *this, operand );
-return expr;
+}
-}
+inline ExpressionLhs<bool> ResultBuilder::operator <= ( bool value ) {
-Expression<bool> operator->* ( bool value ) {
+return ExpressionLhs<bool>( *this, value );
-Expression<bool> expr( m_result, value );
+}
-return expr;
-}
+} // namespace Catch
-template<typename T>
+// #included from: catch_message.h
-ExpressionBuilder& operator << ( const T & value ) {
+#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
-m_messageStream << Catch::toString( value );
-return *this;
+#include <string>
-}
+namespace Catch {
-template<typename MatcherT, typename ArgT>
-ExpressionBuilder& acceptMatcher(   const MatcherT& matcher,
+struct MessageInfo {
-const ArgT& arg,
+MessageInfo(    std::string const& _macroName,
-const std::string& matcherCallAsString ) {
+SourceLineInfo const& _lineInfo,
-std::string matcherAsString = Catch::toString( matcher );
+ResultWas::OfType _type );
-if( matcherAsString == "{?}" )
-matcherAsString = matcherCallAsString;
+std::string macroName;
-m_result.setLhs( Catch::toString( arg ) );
+SourceLineInfo lineInfo;
-m_result.setRhs( matcherAsString );
+ResultWas::OfType type;
-m_result.setOp( "matches" );
+std::string message;
-m_result.setResultType( matcher( arg ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
+unsigned int sequence;
-return *this;
-}
+bool operator == ( MessageInfo const& other ) const {
+return sequence == other.sequence;
-template<typename MatcherT, typename ArgT>
+}
-ExpressionBuilder& acceptMatcher(   const MatcherT& matcher,
+bool operator < ( MessageInfo const& other ) const {
-ArgT* arg,
+return sequence < other.sequence;
-const std::string& matcherCallAsString ) {
+}
-std::string matcherAsString = Catch::toString( matcher );
+private:
-if( matcherAsString == "{?}" )
+static unsigned int globalCount;
-matcherAsString = matcherCallAsString;
+};
-m_result.setLhs( Catch::toString( arg ) );
-m_result.setRhs( matcherAsString );
+struct MessageBuilder {
-m_result.setOp( "matches" );
+MessageBuilder( std::string const& macroName,
-m_result.setResultType( matcher( arg ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
+SourceLineInfo const& lineInfo,
-return *this;
+ResultWas::OfType type )
-}
+: m_info( macroName, lineInfo, type )
+{}
-ExpressionBuilder& setResultType( ResultWas::OfType resultType ) {
-m_result.setResultType( resultType );
+template<typename T>
-return *this;
+MessageBuilder& operator << ( T const& value ) {
-}
+m_stream << value;
+return *this;
-operator ResultInfoBuilder&() {
+}
-m_result.setMessage( m_messageStream.str() );
-return m_result;
+MessageInfo m_info;
-}
+std::ostringstream m_stream;
+};
-private:
-ResultInfoBuilder m_result;
+class ScopedMessage {
-std::ostringstream m_messageStream;
+public:
-};
+ScopedMessage( MessageBuilder const& builder );
+ScopedMessage( ScopedMessage const& other );
+~ScopedMessage();
+MessageInfo m_info;
+};
 } // end namespace Catch
 // #included from: catch_interfaces_capture.h
+#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
 #include <string>
 namespace Catch {
-class TestCaseInfo;
+class TestCase;
-class ScopedInfo;
+class AssertionResult;
-class ResultInfoBuilder;
+struct AssertionInfo;
-class ResultInfo;
+struct SectionInfo;
+struct SectionEndInfo;
+struct MessageInfo;
+class ScopedMessageBuilder;
+struct Counts;
 struct IResultCapture {
-virtual ~IResultCapture(){}
+virtual ~IResultCapture();
-virtual void testEnded( const ResultInfo& result ) = 0;
+virtual void assertionEnded( AssertionResult const& result ) = 0;
-virtual bool sectionStarted(    const std::string& name,
+virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-const std::string& description,
-const SourceLineInfo& lineInfo,
 Counts& assertions ) = 0;
-virtual void sectionEnded( const std::string& name, const Counts& assertions ) = 0;
+virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-virtual void pushScopedInfo( ScopedInfo* scopedInfo ) = 0;
+virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-virtual void popScopedInfo( ScopedInfo* scopedInfo ) = 0;
+virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-virtual bool shouldDebugBreak() const = 0;
+virtual void popScopedMessage( MessageInfo const& message ) = 0;
-virtual ResultAction::Value acceptResult( bool result ) = 0;
-virtual ResultAction::Value acceptResult( ResultWas::OfType result ) = 0;
-virtual ResultAction::Value acceptExpression( const ResultInfoBuilder& resultInfo ) = 0;
-virtual void acceptMessage( const std::string& msg ) = 0;
 virtual std::string getCurrentTestName() const = 0;
-virtual const ResultInfo* getLastResult() const = 0;
+virtual const AssertionResult* getLastResult() const = 0;
-};
+virtual void handleFatalErrorCondition( std::string const& message ) = 0;
+};
+IResultCapture& getResultCapture();
 }
-// #included from: catch_debugger.hpp
+// #included from: catch_debugger.h
+#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
-#include <iostream>
+// #included from: catch_platform.h
+#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #define CATCH_PLATFORM_MAC
 #elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
 #define CATCH_PLATFORM_IPHONE
-#elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
 #define CATCH_PLATFORM_WINDOWS
 #endif
+#include <string>
+namespace Catch{
+bool isDebuggerActive();
+void writeToDebugConsole( std::string const& text );
+}
 #ifdef CATCH_PLATFORM_MAC
-#include <assert.h>
+// The following code snippet based on:
-#include <stdbool.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/sysctl.h>
-namespace Catch{
-// The following function is taken directly from the following technical note:
-// http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
-// Returns true if the current process is being debugged (either
-// running under the debugger or has a debugger attached post facto).
-inline bool isDebuggerActive(){
-int                 junk;
-int                 mib[4];
-struct kinfo_proc   info;
-size_t              size;
-// Initialize the flags so that, if sysctl fails for some bizarre
-// reason, we get a predictable result.
-info.kp_proc.p_flag = 0;
-// Initialize mib, which tells sysctl the info we want, in this case
-// we're looking for information about a specific process ID.
-mib[0] = CTL_KERN;
-mib[1] = KERN_PROC;
-mib[2] = KERN_PROC_PID;
-mib[3] = getpid();
-// Call sysctl.
-size = sizeof(info);
-junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0);
-assert(junk == 0);
-// We're being debugged if the P_TRACED flag is set.
-return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-}
-}
-// The following code snippet taken from:
 // http://cocoawithlove.com/2008/03/break-into-debugger.html
 #ifdef DEBUG
 #if defined(__ppc64__) || defined(__ppc__)
-#define BreakIntoDebugger() \
+#define CATCH_BREAK_INTO_DEBUGGER() \
 if( Catch::isDebuggerActive() ) { \
 __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
 : : : "memory","r0","r3","r4" ); \
 }
 #else
-#define BreakIntoDebugger() if( Catch::isDebuggerActive() ) {__asm__("int $3\n" : : );}
+#define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) {__asm__("int $3\n" : : );}
 #endif
-#else
-inline void BreakIntoDebugger(){}
 #endif
 #elif defined(_MSC_VER)
-extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+#define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { __debugbreak(); }
-#define BreakIntoDebugger() if (IsDebuggerPresent() ) { __debugbreak(); }
-inline bool isDebuggerActive() {
-return IsDebuggerPresent() != 0;
-}
 #elif defined(__MINGW32__)
-extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
 extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-#define BreakIntoDebugger() if (IsDebuggerPresent() ) { DebugBreak(); }
+#define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { DebugBreak(); }
-inline bool isDebuggerActive() {
+#endif
-return IsDebuggerPresent() != 0;
-}
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+#define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue();
+#endif
+// #included from: catch_interfaces_runner.h
+#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
+namespace Catch {
+class TestCase;
+struct IRunner {
+virtual ~IRunner();
+virtual bool aborting() const = 0;
+};
+}
+///////////////////////////////////////////////////////////////////////////////
+// In the event of a failure works out if the debugger needs to be invoked
+// and/or an exception thrown and takes appropriate action.
+// This needs to be done as a macro so the debugger will stop in the user
+// source code rather than in Catch library code
+#define INTERNAL_CATCH_REACT( resultBuilder ) \
+if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \
+resultBuilder.react();
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ) \
+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
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( expr, resultDisposition, macroName ) \
+INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
+if( Catch::getResultCapture().getLastResult()->succeeded() )
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( expr, resultDisposition, macroName ) \
+INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ); \
+if( !Catch::getResultCapture().getLastResult()->succeeded() )
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( expr, resultDisposition, macroName ) \
+do { \
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
+try { \
+expr; \
+__catchResult.captureResult( Catch::ResultWas::Ok ); \
+} \
+catch( ... ) { \
+__catchResult.useActiveException( resultDisposition ); \
+} \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( expr, resultDisposition, matcher, macroName ) \
+do { \
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition, #matcher ); \
+if( __catchResult.allowThrows() ) \
+try { \
+expr; \
+__catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+} \
+catch( ... ) { \
+__catchResult.captureExpectedException( matcher ); \
+} \
+else \
+__catchResult.captureResult( Catch::ResultWas::Ok ); \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( expr, exceptionType, resultDisposition, macroName ) \
+do { \
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
+if( __catchResult.allowThrows() ) \
+try { \
+expr; \
+__catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+} \
+catch( exceptionType ) { \
+__catchResult.captureResult( Catch::ResultWas::Ok ); \
+} \
+catch( ... ) { \
+__catchResult.useActiveException( resultDisposition ); \
+} \
+else \
+__catchResult.captureResult( Catch::ResultWas::Ok ); \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
+///////////////////////////////////////////////////////////////////////////////
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, ... ) \
+do { \
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+__catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \
+__catchResult.captureResult( messageType ); \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
 #else
-	   inline void BreakIntoDebugger(){}
+#define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \
-	   inline bool isDebuggerActive() { return false; }
+do { \
-#endif
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+__catchResult << log + ::Catch::StreamEndStop(); \
+__catchResult.captureResult( messageType ); \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
+#endif
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( log, macroName ) \
+Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( arg, matcher, resultDisposition, macroName ) \
+do { \
+Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \
+try { \
+std::string matcherAsString = (matcher).toString(); \
+__catchResult \
+.setLhs( Catch::toString( arg ) ) \
+.setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
+.setOp( "matches" ) \
+.setResultType( (matcher).match( arg ) ); \
+__catchResult.captureExpression(); \
+} catch( ... ) { \
+__catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
+} \
+INTERNAL_CATCH_REACT( __catchResult ) \
+} while( Catch::alwaysFalse() )
+// #included from: internal/catch_section.h
+#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
+// #included from: catch_section_info.h
+#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
+// #included from: catch_totals.hpp
+#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
+#include <cstddef>
+namespace Catch {
+struct Counts {
+Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {}
+Counts operator - ( Counts const& other ) const {
+Counts diff;
+diff.passed = passed - other.passed;
+diff.failed = failed - other.failed;
+diff.failedButOk = failedButOk - other.failedButOk;
+return diff;
+}
+Counts& operator += ( Counts const& other ) {
+passed += other.passed;
+failed += other.failed;
+failedButOk += other.failedButOk;
+return *this;
+}
+std::size_t total() const {
+return passed + failed + failedButOk;
+}
+bool allPassed() const {
+return failed == 0 && failedButOk == 0;
+}
+bool allOk() const {
+return failed == 0;
+}
+std::size_t passed;
+std::size_t failed;
+std::size_t failedButOk;
+};
+struct Totals {
+Totals operator - ( Totals const& other ) const {
+Totals diff;
+diff.assertions = assertions - other.assertions;
+diff.testCases = testCases - other.testCases;
+return diff;
+}
+Totals delta( Totals const& prevTotals ) const {
+Totals diff = *this - prevTotals;
+if( diff.assertions.failed > 0 )
+++diff.testCases.failed;
+else if( diff.assertions.failedButOk > 0 )
+++diff.testCases.failedButOk;
+else
+++diff.testCases.passed;
+return diff;
+}
+Totals& operator += ( Totals const& other ) {
+assertions += other.assertions;
+testCases += other.testCases;
+return *this;
+}
+Counts assertions;
+Counts testCases;
+};
+}
+namespace Catch {
+struct SectionInfo {
+SectionInfo
+(   SourceLineInfo const& _lineInfo,
+std::string const& _name,
+std::string const& _description = std::string() );
+std::string name;
+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
+// #included from: catch_timer.h
+#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
 #ifdef CATCH_PLATFORM_WINDOWS
-extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
+typedef unsigned long long uint64_t;
-inline void writeToDebugConsole( const std::string& text ) {
-::OutputDebugStringA( text.c_str() );
-}
 #else
-inline void writeToDebugConsole( const std::string& text ) {
+#include <stdint.h>
-// !TBD: Need a version for Mac/ XCode and other IDEs
+#endif
-std::cout << text;
-}
-#endif // CATCH_PLATFORM_WINDOWS
-#include <ostream>
 namespace Catch {
-struct TestFailureException{};
+class Timer {
+public:
-class ScopedInfo {
+Timer() : m_ticks( 0 ) {}
-public:
+void start();
-ScopedInfo() : m_oss() {
+unsigned int getElapsedMicroseconds() const;
-getCurrentContext().getResultCapture().pushScopedInfo( this );
+unsigned int getElapsedMilliseconds() const;
-}
+double getElapsedSeconds() const;
-~ScopedInfo() {
+private:
-getCurrentContext().getResultCapture().popScopedInfo( this );
+uint64_t m_ticks;
-}
+};
-template<typename T>
+} // namespace Catch
-ScopedInfo& operator << ( const T& value ) {
-m_oss << value;
-return *this;
-}
-std::string getInfo () const {
-return m_oss.str();
-}
-private:
-std::ostringstream m_oss;
-};
-// This is just here to avoid compiler warnings with macro constants
-inline bool isTrue( bool value ){ return value; }
-} // end namespace Catch
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ACCEPT_EXPR( expr, stopOnFailure, originalExpr ) \
-if( Catch::ResultAction::Value internal_catch_action = Catch::getCurrentContext().getResultCapture().acceptExpression( expr )  ) { \
-if( internal_catch_action & Catch::ResultAction::Debug ) BreakIntoDebugger(); \
-if( internal_catch_action & Catch::ResultAction::Abort ) throw Catch::TestFailureException(); \
-if( Catch::isTrue( stopOnFailure ) ) throw Catch::TestFailureException(); \
-if( Catch::isTrue( false ) ){ bool this_is_here_to_invoke_warnings = ( originalExpr ); Catch::isTrue( this_is_here_to_invoke_warnings ); } \
-}
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ) \
-do { try { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr, isNot )->*expr ), stopOnFailure, expr ); \
-} catch( Catch::TestFailureException& ) { \
-throw; \
-} catch( ... ) { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ) << Catch::getCurrentContext().getExceptionTranslatorRegistry().translateActiveException() ).setResultType( Catch::ResultWas::ThrewException ), false, expr ); \
-throw; \
-} } while( Catch::isTrue( false ) )
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( expr, isNot, stopOnFailure, macroName ) \
-INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ); \
-if( Catch::getCurrentContext().getResultCapture().getLastResult()->ok() )
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( expr, isNot, stopOnFailure, macroName ) \
-INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ); \
-if( !Catch::getCurrentContext().getResultCapture().getLastResult()->ok() )
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( expr, stopOnFailure, macroName ) \
-try { \
-expr; \
-INTERNAL_CATCH_ACCEPT_EXPR( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ).setResultType( Catch::ResultWas::Ok ), stopOnFailure, false ); \
-} \
-catch( ... ) { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ) << Catch::getCurrentContext().getExceptionTranslatorRegistry().translateActiveException() ).setResultType( Catch::ResultWas::ThrewException ), stopOnFailure, false ); \
-}
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( expr, exceptionType, stopOnFailure, macroName ) \
-try { \
-if( Catch::getCurrentContext().getConfig()->allowThrows() ) { \
-expr; \
-INTERNAL_CATCH_ACCEPT_EXPR( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ).setResultType( Catch::ResultWas::DidntThrowException ), stopOnFailure, false ); \
-} \
-} \
-catch( Catch::TestFailureException& ) { \
-throw; \
-} \
-catch( exceptionType ) { \
-INTERNAL_CATCH_ACCEPT_EXPR( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ).setResultType( Catch::ResultWas::Ok ), stopOnFailure, false ); \
-}
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( expr, exceptionType, stopOnFailure, macroName ) \
-INTERNAL_CATCH_THROWS( expr, exceptionType, stopOnFailure, macroName ) \
-catch( ... ) { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr ) << Catch::getCurrentContext().getExceptionTranslatorRegistry().translateActiveException() ).setResultType( Catch::ResultWas::ThrewException ), stopOnFailure, false ); \
-}
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( reason, resultType, stopOnFailure, macroName ) \
-Catch::getCurrentContext().getResultCapture().acceptExpression( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName ) << reason ).setResultType( resultType ) );
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_SCOPED_INFO( log ) \
-Catch::ScopedInfo INTERNAL_CATCH_UNIQUE_NAME( info ); \
-INTERNAL_CATCH_UNIQUE_NAME( info ) << log
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( arg, matcher, stopOnFailure, macroName ) \
-do { try { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #arg " " #matcher, false ).acceptMatcher( ::Catch::Matchers::matcher, arg, #matcher ) ), stopOnFailure, false ); \
-} catch( Catch::TestFailureException& ) { \
-throw; \
-} catch( ... ) { \
-INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #arg " " #matcher ) << Catch::getCurrentContext().getExceptionTranslatorRegistry().translateActiveException() ).setResultType( Catch::ResultWas::ThrewException ), false, false ); \
-throw; \
-}}while( Catch::isTrue( false ) )
-// #included from: internal/catch_section.hpp
 #include <string>
 namespace Catch {
-class Section {
+class Section : NonCopyable {
 public:
-Section(    const std::string& name,
+Section( SectionInfo const& info );
-const std::string& description,
+~Section();
-const SourceLineInfo& lineInfo )
-:   m_name( name ),
-m_sectionIncluded( getCurrentContext().getResultCapture().sectionStarted( name, description, lineInfo, m_assertions ) )
-{}
-~Section() {
-if( m_sectionIncluded )
-getCurrentContext().getResultCapture().sectionEnded( m_name, m_assertions );
-}
 // This indicates whether the section should be executed or not
-operator bool() {
+operator bool() const;
-return m_sectionIncluded;
-}
 private:
+SectionInfo m_info;
 std::string m_name;
 Counts m_assertions;
 bool m_sectionIncluded;
+Timer m_timer;
 };
 } // end namespace Catch
-#define INTERNAL_CATCH_SECTION( name, desc ) \
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
-if( Catch::Section INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::Section( name, desc, CATCH_INTERNAL_LINEINFO ) )
+#define INTERNAL_CATCH_SECTION( ... ) \
+if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) )
+#else
+#define INTERNAL_CATCH_SECTION( name, desc ) \
+if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) )
+#endif
 // #included from: internal/catch_generators.hpp
+#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
 #include <iterator>
 #include <vector>
 #include <string>
 #include <stdlib.h>
 class BetweenGenerator : public IGenerator<T> {
 public:
 BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){}
 virtual T getValue( std::size_t index ) const {
-return m_from+static_cast<T>( index );
+return m_from+static_cast<int>( index );
 }
 virtual std::size_t size() const {
 return static_cast<std::size_t>( 1+m_to-m_from );
 }
 template<typename T>
 class CompositeGenerator {
 public:
 CompositeGenerator() : m_totalSize( 0 ) {}
-	// *** Move semantics, similar to auto_ptr ***
+// *** Move semantics, similar to auto_ptr ***
 CompositeGenerator( CompositeGenerator& other )
 :   m_fileInfo( other.m_fileInfo ),
 m_totalSize( 0 )
 {
-		move( other );
+move( other );
 }
 CompositeGenerator& setFileInfo( const char* fileInfo ) {
 m_fileInfo = fileInfo;
 return *this;
 return generator->getValue( overallIndex-index );
 }
 index += generator->size();
 }
 CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
-		return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
+return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
 }
 void add( const IGenerator<T>* generator ) {
 m_totalSize += generator->size();
 m_composed.push_back( generator );
 #define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line )
 #define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
 // #included from: internal/catch_interfaces_exception.h
+#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 #include <string>
+#include <vector>
+// #included from: catch_interfaces_registry_hub.h
+#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
+#include <string>
 namespace Catch {
+class TestCase;
+struct ITestCaseRegistry;
+struct IExceptionTranslatorRegistry;
+struct IExceptionTranslator;
+struct IReporterRegistry;
+struct IReporterFactory;
+struct IRegistryHub {
+virtual ~IRegistryHub();
+virtual IReporterRegistry const& getReporterRegistry() const = 0;
+virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
+};
+struct IMutableRegistryHub {
+virtual ~IMutableRegistryHub();
+virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) = 0;
+virtual void registerListener( Ptr<IReporterFactory> const& factory ) = 0;
+virtual void registerTest( TestCase const& testInfo ) = 0;
+virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+};
+IRegistryHub& getRegistryHub();
+IMutableRegistryHub& getMutableRegistryHub();
+void cleanUp();
+std::string translateActiveException();
+}
+namespace Catch {
 typedef std::string(*exceptionTranslateFunction)();
+struct IExceptionTranslator;
+typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
 struct IExceptionTranslator {
-virtual ~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 {
-virtual ~IExceptionTranslatorRegistry(){}
+virtual ~IExceptionTranslatorRegistry();
-virtual void registerTranslator( IExceptionTranslator* translator ) = 0;
 virtual std::string translateActiveException() const = 0;
 };
 class ExceptionTranslatorRegistrar {
 template<typename T>
 ExceptionTranslator( std::string(*translateFunction)( T& ) )
 : 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 );
 }
 }
 };
 public:
 template<typename T>
 ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-getCurrentContext().getExceptionTranslatorRegistry().registerTranslator
+getMutableRegistryHub().registerTranslator
 ( new ExceptionTranslator<T>( translateFunction ) );
 }
 };
 }
 ///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) \
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-static std::string INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator )( signature ); \
+static std::string translatorName( signature ); \
-namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ) ); }\
+namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\
-static std::string INTERNAL_CATCH_UNIQUE_NAME(  catch_internal_ExceptionTranslator )( signature )
+static std::string translatorName( signature )
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
 // #included from: internal/catch_approx.hpp
+#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
 #include <cmath>
 #include <limits>
 namespace Catch {
 :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
 m_scale( 1.0 ),
 m_value( value )
 {}
-Approx( const Approx& other )
+Approx( Approx const& other )
 :   m_epsilon( other.m_epsilon ),
 m_scale( other.m_scale ),
 m_value( other.m_value )
 {}
 approx.epsilon( m_epsilon );
 approx.scale( m_scale );
 return approx;
 }
-friend bool operator == ( double lhs, const Approx& rhs ) {
+friend bool operator == ( double lhs, Approx const& rhs ) {
 // Thanks to Richard Harris for his help refining this formula
 return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
 }
-friend bool operator == ( const Approx& lhs, double rhs ) {
+friend bool operator == ( Approx const& lhs, double rhs ) {
 return operator==( rhs, lhs );
 }
-friend bool operator != ( double lhs, const Approx& rhs ) {
+friend bool operator != ( double lhs, Approx const& rhs ) {
 return !operator==( lhs, rhs );
 }
-friend bool operator != ( const Approx& lhs, double rhs ) {
+friend bool operator != ( Approx const& lhs, double rhs ) {
 return !operator==( rhs, lhs );
 }
 Approx& epsilon( double newEpsilon ) {
 m_epsilon = newEpsilon;
 return *this;
 }
 std::string toString() const {
 std::ostringstream oss;
-oss << "Approx( " << m_value << ")";
+oss << "Approx( " << Catch::toString( m_value ) << " )";
 return oss.str();
 }
 private:
 double m_epsilon;
 double m_value;
 };
 }
 template<>
-inline std::string toString<Detail::Approx>( const Detail::Approx& value ) {
+inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
 return value.toString();
 }
 } // end namespace Catch
-// #included from: internal/catch_matchers.hpp
+// #included from: internal/catch_interfaces_tag_alias_registry.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
+// #included from: catch_tag_alias.h
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
+#include <string>
 namespace Catch {
-namespace Matchers {
-namespace Impl {
+struct TagAlias {
-namespace StdString {
+TagAlias( std::string _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {}
-struct Equals {
+std::string tag;
-Equals( const std::string& str ) : m_str( str ){}
+SourceLineInfo lineInfo;
+};
-bool operator()( const std::string& str ) const
-{
+struct RegistrarForTagAliases {
-return str == m_str;
+RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-}
+};
-friend std::ostream& operator<<( std::ostream& os, const Equals& matcher )
+} // end namespace Catch
-{
-os << "equals: \"" << matcher.m_str << "\"";
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); }
-return os;
+// #included from: catch_option.hpp
-}
+#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
-std::string m_str;
-};
+namespace Catch {
-struct Contains {
+// An optional type
-Contains( const std::string& substr ) : m_substr( substr ){}
+template<typename T>
+class Option {
-bool operator()( const std::string& str ) const
+public:
-{
+Option() : nullableValue( CATCH_NULL ) {}
-return str.find( m_substr ) != std::string::npos;
+Option( T const& _value )
-}
+: nullableValue( new( storage ) T( _value ) )
+{}
-friend std::ostream& operator<<( std::ostream& os, const Contains& matcher )
+Option( Option const& _other )
-{
+: nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL )
-os << "contains: \"" << matcher.m_substr << "\"";
+{}
-return os;
-}
+~Option() {
-std::string m_substr;
+reset();
-};
+}
-struct StartsWith {
+Option& operator= ( Option const& _other ) {
-StartsWith( const std::string& substr ) : m_substr( substr ){}
+if( &_other != this ) {
+reset();
-bool operator()( const std::string& str ) const
+if( _other )
-{
+nullableValue = new( storage ) T( *_other );
-return str.find( m_substr ) == 0;
+}
-}
+return *this;
+}
-friend std::ostream& operator<<( std::ostream& os, const StartsWith& matcher )
+Option& operator = ( T const& _value ) {
-{
+reset();
-os << "starts with: \"" << matcher.m_substr << "\"";
+nullableValue = new( storage ) T( _value );
-return os;
+return *this;
 }
-std::string m_substr;
-};
+void reset() {
+if( nullableValue )
-struct EndsWith {
+nullableValue->~T();
-EndsWith( const std::string& substr ) : m_substr( substr ){}
+nullableValue = CATCH_NULL;
+}
-bool operator()( const std::string& str ) const
-{
+T& operator*() { return *nullableValue; }
-return str.find( m_substr ) == str.size() - m_substr.size();
+T const& operator*() const { return *nullableValue; }
-}
+T* operator->() { return nullableValue; }
+const T* operator->() const { return nullableValue; }
-friend std::ostream& operator<<( std::ostream& os, const EndsWith& matcher )
-{
+T valueOr( T const& defaultValue ) const {
-os << "ends with: \"" << matcher.m_substr << "\"";
+return nullableValue ? *nullableValue : defaultValue;
-return os;
+}
-}
-std::string m_substr;
+bool some() const { return nullableValue != CATCH_NULL; }
-};
+bool none() const { return nullableValue == CATCH_NULL; }
-} // namespace StdString
-} // namespace Impl
+bool operator !() const { return nullableValue == CATCH_NULL; }
+operator SafeBool::type() const {
-inline Impl::StdString::Equals      Equals( const std::string& str ){ return Impl::StdString::Equals( str ); }
+return SafeBool::makeSafe( some() );
-inline Impl::StdString::Contains    Contains( const std::string& substr ){ return Impl::StdString::Contains( substr ); }
+}
-inline Impl::StdString::StartsWith  StartsWith( const std::string& substr ){ return Impl::StdString::StartsWith( substr ); }
-inline Impl::StdString::EndsWith    EndsWith( const std::string& substr ){ return Impl::StdString::EndsWith( substr ); }
+private:
+T* nullableValue;
-} // namespace Matchers
+char storage[sizeof(T)];
+};
-using namespace Matchers;
+} // end namespace Catch
-} // namespace Catch
+namespace Catch {
+struct ITagAliasRegistry {
+virtual ~ITagAliasRegistry();
+virtual Option<TagAlias> find( std::string const& alias ) const = 0;
+virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+static ITagAliasRegistry const& get();
+};
+} // end namespace Catch
 // These files are included here so the single_include script doesn't put them
 // in the conditionally compiled sections
-// #included from: internal/catch_test_case_info.hpp
+// #included from: internal/catch_test_case_info.h
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
-#include <map>
 #include <string>
+#include <set>
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
 namespace Catch {
-class TestCaseInfo {
+struct ITestCase;
+struct TestCaseInfo {
+enum SpecialProperties{
+None = 0,
+IsHidden = 1 << 1,
+ShouldFail = 1 << 2,
+MayFail = 1 << 3,
+Throws = 1 << 4
+};
+TestCaseInfo(   std::string const& _name,
+std::string const& _className,
+std::string const& _description,
+std::set<std::string> const& _tags,
+SourceLineInfo const& _lineInfo );
+TestCaseInfo( TestCaseInfo const& other );
+friend void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags );
+bool isHidden() const;
+bool throws() const;
+bool okToFail() const;
+bool expectedToFail() const;
+std::string name;
+std::string className;
+std::string description;
+std::set<std::string> tags;
+std::set<std::string> lcaseTags;
+std::string tagsAsString;
+SourceLineInfo lineInfo;
+SpecialProperties properties;
+};
+class TestCase : public TestCaseInfo {
 public:
-TestCaseInfo(   ITestCase* testCase,
-const char* name,
+TestCase( ITestCase* testCase, TestCaseInfo const& info );
-const char* description,
+TestCase( TestCase const& other );
-const SourceLineInfo& lineInfo )
-:   m_test( testCase ),
+TestCase withName( std::string const& _newName ) const;
-m_name( name ),
-m_description( description ),
+void invoke() const;
-m_lineInfo( lineInfo )
-{}
+TestCaseInfo const& getTestCaseInfo() const;
-TestCaseInfo()
+void swap( TestCase& other );
-:   m_test( NULL ),
+bool operator == ( TestCase const& other ) const;
-m_name(),
+bool operator < ( TestCase const& other ) const;
-m_description()
+TestCase& operator = ( TestCase const& other );
-{}
-TestCaseInfo( const TestCaseInfo& other )
-:   m_test( other.m_test->clone() ),
-m_name( other.m_name ),
-m_description( other.m_description ),
-m_lineInfo( other.m_lineInfo )
-{}
-TestCaseInfo( const TestCaseInfo& other, const std::string& name )
-:   m_test( other.m_test->clone() ),
-m_name( name ),
-m_description( other.m_description ),
-m_lineInfo( other.m_lineInfo )
-{}
-TestCaseInfo& operator = ( const TestCaseInfo& other ) {
-TestCaseInfo temp( other );
-swap( temp );
-return *this;
-}
-~TestCaseInfo() {
-delete m_test;
-}
-void invoke() const {
-m_test->invoke();
-}
-const std::string& getName() const {
-return m_name;
-}
-const std::string& getDescription() const {
-return m_description;
-}
-const SourceLineInfo& getLineInfo() const {
-return m_lineInfo;
-}
-bool isHidden() const {
-return m_name.size() >= 2 && m_name[0] == '.' && m_name[1] == '/';
-}
-void swap( TestCaseInfo& other ) {
-std::swap( m_test, other.m_test );
-m_name.swap( other.m_name );
-m_description.swap( other.m_description );
-m_lineInfo.swap( other.m_lineInfo );
-}
-bool operator == ( const TestCaseInfo& other ) const {
-return *m_test == *other.m_test && m_name == other.m_name;
-}
-bool operator < ( const TestCaseInfo& other ) const {
-return m_name < other.m_name;
-}
 private:
-ITestCase* m_test;
+Ptr<ITestCase> test;
-std::string m_name;
+};
-std::string m_description;
-SourceLineInfo m_lineInfo;
+TestCase makeTestCase(  ITestCase* testCase,
-};
+std::string const& className,
+std::string const& name,
-///////////////////////////////////////////////////////////////////////////
+std::string const& description,
+SourceLineInfo const& lineInfo );
-class TestSpec {
-public:
-TestSpec( const std::string& rawSpec )
-:   m_rawSpec( rawSpec ),
-m_isWildcarded( false ) {
-if( m_rawSpec[m_rawSpec.size()-1] == '*' ) {
-m_rawSpec = m_rawSpec.substr( 0, m_rawSpec.size()-1 );
-m_isWildcarded = true;
-}
-}
-bool matches ( const std::string& testName ) const {
-if( !m_isWildcarded )
-return m_rawSpec == testName;
-else
-return testName.size() >= m_rawSpec.size() && testName.substr( 0, m_rawSpec.size() ) == m_rawSpec;
-}
-private:
-std::string m_rawSpec;
-bool m_isWildcarded;
-};
 }
-// #included from: internal/catch_interfaces_runner.h
+#ifdef __clang__
+#pragma clang diagnostic pop
-#include <string>
+#endif
-namespace Catch {
-class TestCaseInfo;
-struct IRunner {
-virtual ~IRunner() {}
-virtual void runAll( bool runHiddenTests = false ) = 0;
-virtual std::size_t runMatching( const std::string& rawTestSpec ) = 0;
-virtual Totals getTotals() const = 0;
-};
-}
 #ifdef __OBJC__
 // #included from: internal/catch_objc.hpp
+#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
-#import <Foundation/Foundation.h>
 #import <objc/runtime.h>
 #include <string>
 // NB. Any general catch headers included here must be included
 // in catch.hpp first to make sure they are included by the single
 // header for non obj-usage
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-[obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-if( [obj respondsToSelector: sel] )
-return [obj performSelector: sel];
-return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-if( [obj respondsToSelector: sel] )
-return [obj performSelector: sel];
-#pragma clang diagnostic pop
-return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#endif
 ///////////////////////////////////////////////////////////////////////////////
 // This protocol is really only here for (self) documenting purposes, since
 // all its methods are optional.
 @protocol OcFixture
 @end
 namespace Catch {
-class OcMethod : public ITestCase {
+class OcMethod : public SharedImpl<ITestCase> {
 public:
 OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
 virtual void invoke() const {
 performOptionalSelector( obj, m_sel );
 performOptionalSelector( obj, @selector(tearDown)  );
 arcSafeRelease( obj );
 }
-virtual ITestCase* clone() const {
-return new OcMethod( m_cls, m_sel );
-}
-virtual bool operator == ( const ITestCase& other ) const {
-const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
-return ocmOther && ocmOther->m_sel == m_sel;
-}
-virtual bool operator < ( const ITestCase& other ) const {
-const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
-return ocmOther && ocmOther->m_sel < m_sel;
-}
 private:
+virtual ~OcMethod() {}
 Class m_cls;
 SEL m_sel;
 };
 namespace Detail{
-inline bool startsWith( const std::string& str, const std::string& sub ) {
-return str.length() > sub.length() && str.substr( 0, sub.length() ) == sub;
-}
 inline std::string getAnnotation(   Class cls,
-const std::string& annotationName,
+std::string const& annotationName,
-const std::string& testCaseName ) {
+std::string const& testCaseName ) {
 NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
 SEL sel = NSSelectorFromString( selStr );
 arcSafeRelease( selStr );
 id value = performOptionalSelector( cls, sel );
 if( value )
 }
 }
 inline size_t registerTestMethods() {
 size_t noTestMethods = 0;
-int noClasses = objc_getClassList( NULL, 0 );
+int noClasses = objc_getClassList( CATCH_NULL, 0 );
 Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
 objc_getClassList( classes, noClasses );
 for( int c = 0; c < noClasses; c++ ) {
 u_int count;
 Method* methods = class_copyMethodList( cls, &count );
 for( u_int m = 0; m < count ; m++ ) {
 SEL selector = method_getName(methods[m]);
 std::string methodName = sel_getName(selector);
-if( Detail::startsWith( methodName, "Catch_TestCase_" ) ) {
+if( startsWith( methodName, "Catch_TestCase_" ) ) {
 std::string testCaseName = methodName.substr( 15 );
 std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
 std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+const char* className = class_getName( cls );
-getCurrentContext().getTestCaseRegistry().registerTest( TestCaseInfo( new OcMethod( cls, selector ), name.c_str(), desc.c_str(), SourceLineInfo() ) );
+getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) );
 noTestMethods++;
 }
 }
 free(methods);
 }
 }
 return noTestMethods;
 }
-inline std::string toString( NSString* const& nsstring ) {
-return std::string( "@\"" ) + [nsstring UTF8String] + "\"";
-}
 namespace Matchers {
 namespace Impl {
 namespace NSStringMatchers {
-struct StringHolder {
+template<typename MatcherT>
+struct StringHolder : MatcherImpl<MatcherT, NSString*>{
 StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
 StringHolder() {
 arcSafeRelease( m_substr );
 }
 NSString* m_substr;
 };
-struct Equals : StringHolder {
+struct Equals : StringHolder<Equals> {
 Equals( NSString* substr ) : StringHolder( substr ){}
-bool operator()( NSString* str ) const {
+virtual bool match( ExpressionType const& str ) const {
-return [str isEqualToString:m_substr];
+return  (str != nil || m_substr == nil ) &&
+[str isEqualToString:m_substr];
 }
-friend std::ostream& operator<<( std::ostream& os, const Equals& matcher ) {
+virtual std::string toString() const {
-os << "equals string: " << Catch::toString( matcher.m_substr );
+return "equals string: " + Catch::toString( m_substr );
-return os;
 }
 };
-struct Contains : StringHolder {
+struct Contains : StringHolder<Contains> {
 Contains( NSString* substr ) : StringHolder( substr ){}
-bool operator()( NSString* str ) const {
+virtual bool match( ExpressionType const& str ) const {
-return [str rangeOfString:m_substr].location != NSNotFound;
+return  (str != nil || m_substr == nil ) &&
+[str rangeOfString:m_substr].location != NSNotFound;
 }
-friend std::ostream& operator<<( std::ostream& os, const Contains& matcher ) {
+virtual std::string toString() const {
-os << "contains: " << Catch::toString( matcher.m_substr );
+return "contains string: " + Catch::toString( m_substr );
-return os;
 }
 };
-struct StartsWith : StringHolder {
+struct StartsWith : StringHolder<StartsWith> {
 StartsWith( NSString* substr ) : StringHolder( substr ){}
-bool operator()( NSString* str ) const {
+virtual bool match( ExpressionType const& str ) const {
-return [str rangeOfString:m_substr].location == 0;
+return  (str != nil || m_substr == nil ) &&
+[str rangeOfString:m_substr].location == 0;
 }
-friend std::ostream& operator<<( std::ostream& os, const StartsWith& matcher ) {
+virtual std::string toString() const {
-os << "starts with: " << Catch::toString( matcher.m_substr );
+return "starts with: " + Catch::toString( m_substr );
-return os;
 }
 };
-struct EndsWith : StringHolder {
+struct EndsWith : StringHolder<EndsWith> {
 EndsWith( NSString* substr ) : StringHolder( substr ){}
-bool operator()( NSString* str ) const {
+virtual bool match( ExpressionType const& str ) const {
-return [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+return  (str != nil || m_substr == nil ) &&
+[str rangeOfString:m_substr].location == [str length] - [m_substr length];
 }
-friend std::ostream& operator<<( std::ostream& os, const EndsWith& matcher ) {
+virtual std::string toString() const {
-os << "ends with: " << Catch::toString( matcher.m_substr );
+return "ends with: " + Catch::toString( m_substr );
-return os;
 }
 };
 } // namespace NSStringMatchers
 } // namespace Impl
 } \
 -(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test )
 #endif
-#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
+#ifdef CATCH_IMPL
-// #included from: catch_runner.hpp
+// #included from: internal/catch_impl.hpp
+#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
-// #included from: internal/catch_context_impl.hpp
-// #included from: catch_test_case_registry_impl.hpp
+// Collect all the implementation files together here
+// These are the equivalent of what would usually be cpp files
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+// #included from: ../catch_session.hpp
+#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+// #included from: internal/catch_commandline.hpp
+#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
+// #included from: catch_config.hpp
+#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
+// #included from: catch_test_spec_parser.hpp
+#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+// #included from: catch_test_spec.hpp
+#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+// #included from: catch_wildcard_pattern.hpp
+#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+namespace Catch
+{
+class WildcardPattern {
+enum WildcardPosition {
+NoWildcard = 0,
+WildcardAtStart = 1,
+WildcardAtEnd = 2,
+WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+};
+public:
+WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity )
+:   m_caseSensitivity( caseSensitivity ),
+m_wildcard( NoWildcard ),
+m_pattern( adjustCase( pattern ) )
+{
+if( startsWith( m_pattern, "*" ) ) {
+m_pattern = m_pattern.substr( 1 );
+m_wildcard = WildcardAtStart;
+}
+if( endsWith( m_pattern, "*" ) ) {
+m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+}
+}
+virtual ~WildcardPattern();
+virtual bool matches( std::string const& str ) const {
+switch( m_wildcard ) {
+case NoWildcard:
+return m_pattern == adjustCase( str );
+case WildcardAtStart:
+return endsWith( adjustCase( str ), m_pattern );
+case WildcardAtEnd:
+return startsWith( adjustCase( str ), m_pattern );
+case WildcardAtBothEnds:
+return contains( adjustCase( str ), m_pattern );
+}
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+throw std::logic_error( "Unknown enum" );
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+}
+private:
+std::string adjustCase( std::string const& str ) const {
+return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
+}
+CaseSensitive::Choice m_caseSensitivity;
+WildcardPosition m_wildcard;
+std::string m_pattern;
+};
+}
+#include <string>
 #include <vector>
-#include <set>
-#include <sstream>
+namespace Catch {
+class TestSpec {
+struct Pattern : SharedImpl<> {
+virtual ~Pattern();
+virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+};
+class NamePattern : public Pattern {
+public:
+NamePattern( std::string const& name )
+: m_wildcardPattern( toLower( name ), CaseSensitive::No )
+{}
+virtual ~NamePattern();
+virtual bool matches( TestCaseInfo const& testCase ) const {
+return m_wildcardPattern.matches( toLower( testCase.name ) );
+}
+private:
+WildcardPattern m_wildcardPattern;
+};
+class TagPattern : public Pattern {
+public:
+TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
+virtual ~TagPattern();
+virtual bool matches( TestCaseInfo const& testCase ) const {
+return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end();
+}
+private:
+std::string m_tag;
+};
+class ExcludedPattern : public Pattern {
+public:
+ExcludedPattern( Ptr<Pattern> const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
+virtual ~ExcludedPattern();
+virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+private:
+Ptr<Pattern> m_underlyingPattern;
+};
+struct Filter {
+std::vector<Ptr<Pattern> > m_patterns;
+bool matches( TestCaseInfo const& testCase ) const {
+// All patterns in a filter must match for the filter to be a match
+for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it )
+if( !(*it)->matches( testCase ) )
+return false;
+return true;
+}
+};
+public:
+bool hasFilters() const {
+return !m_filters.empty();
+}
+bool matches( TestCaseInfo const& testCase ) const {
+// A TestSpec matches if any filter matches
+for( std::vector<Filter>::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it )
+if( it->matches( testCase ) )
+return true;
+return false;
+}
+private:
+std::vector<Filter> m_filters;
+friend class TestSpecParser;
+};
+}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+namespace Catch {
+class TestSpecParser {
+enum Mode{ None, Name, QuotedName, Tag };
+Mode m_mode;
+bool m_exclusion;
+std::size_t m_start, m_pos;
+std::string m_arg;
+TestSpec::Filter m_currentFilter;
+TestSpec m_testSpec;
+ITagAliasRegistry const* m_tagAliases;
+public:
+TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+TestSpecParser& parse( std::string const& arg ) {
+m_mode = None;
+m_exclusion = false;
+m_start = std::string::npos;
+m_arg = m_tagAliases->expandAliases( arg );
+for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+visitChar( m_arg[m_pos] );
+if( m_mode == Name )
+addPattern<TestSpec::NamePattern>();
+return *this;
+}
+TestSpec testSpec() {
+addFilter();
+return m_testSpec;
+}
+private:
+void visitChar( char c ) {
+if( m_mode == None ) {
+switch( c ) {
+case ' ': return;
+case '~': m_exclusion = true; return;
+case '[': return startNewMode( Tag, ++m_pos );
+case '"': return startNewMode( QuotedName, ++m_pos );
+default: startNewMode( Name, m_pos ); break;
+}
+}
+if( m_mode == Name ) {
+if( c == ',' ) {
+addPattern<TestSpec::NamePattern>();
+addFilter();
+}
+else if( c == '[' ) {
+if( subString() == "exclude:" )
+m_exclusion = true;
+else
+addPattern<TestSpec::NamePattern>();
+startNewMode( Tag, ++m_pos );
+}
+}
+else if( m_mode == QuotedName && c == '"' )
+addPattern<TestSpec::NamePattern>();
+else if( m_mode == Tag && c == ']' )
+addPattern<TestSpec::TagPattern>();
+}
+void startNewMode( Mode mode, std::size_t start ) {
+m_mode = mode;
+m_start = start;
+}
+std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
+template<typename T>
+void addPattern() {
+std::string token = subString();
+if( startsWith( token, "exclude:" ) ) {
+m_exclusion = true;
+token = token.substr( 8 );
+}
+if( !token.empty() ) {
+Ptr<TestSpec::Pattern> pattern = new T( token );
+if( m_exclusion )
+pattern = new TestSpec::ExcludedPattern( pattern );
+m_currentFilter.m_patterns.push_back( pattern );
+}
+m_exclusion = false;
+m_mode = None;
+}
+void addFilter() {
+if( !m_currentFilter.m_patterns.empty() ) {
+m_testSpec.m_filters.push_back( m_currentFilter );
+m_currentFilter = TestSpec::Filter();
+}
+}
+};
+inline TestSpec parseTestSpec( std::string const& arg ) {
+return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+}
+} // namespace Catch
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+// #included from: catch_interfaces_config.h
+#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 #include <iostream>
+#include <string>
+#include <vector>
 namespace Catch {
-class TestRegistry : public ITestCaseRegistry {
+struct Verbosity { enum Level {
+NoOutput = 0,
+Quiet,
+Normal
+}; };
+struct WarnAbout { enum What {
+Nothing = 0x00,
+NoAssertions = 0x01
+}; };
+struct ShowDurations { enum OrNot {
+DefaultForReporter,
+Always,
+Never
+}; };
+struct RunTests { enum InWhatOrder {
+InDeclarationOrder,
+InLexicographicalOrder,
+InRandomOrder
+}; };
+struct UseColour { enum YesOrNo {
+Auto,
+Yes,
+No
+}; };
+class TestSpec;
+struct IConfig : IShared {
+virtual ~IConfig();
+virtual bool allowThrows() const = 0;
+virtual std::ostream& stream() const = 0;
+virtual std::string name() const = 0;
+virtual bool includeSuccessfulResults() const = 0;
+virtual bool shouldDebugBreak() const = 0;
+virtual bool warnAboutMissingAssertions() const = 0;
+virtual int abortAfter() const = 0;
+virtual bool showInvisibles() const = 0;
+virtual ShowDurations::OrNot showDurations() const = 0;
+virtual TestSpec const& testSpec() const = 0;
+virtual RunTests::InWhatOrder runOrder() const = 0;
+virtual unsigned int rngSeed() const = 0;
+virtual UseColour::YesOrNo useColour() const = 0;
+};
+}
+// #included from: catch_stream.h
+#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
+// #included from: catch_streambuf.h
+#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED
+#include <streambuf>
+namespace Catch {
+class StreamBufBase : public std::streambuf {
 public:
-TestRegistry() : m_unnamedCount( 0 ) {}
+virtual ~StreamBufBase() CATCH_NOEXCEPT;
+};
-virtual void registerTest( const TestCaseInfo& testInfo ) {
+}
-if( testInfo.getName() == "" ) {
-std::ostringstream oss;
+#include <streambuf>
-oss << testInfo.getName() << "unnamed/" << ++m_unnamedCount;
+#include <ostream>
-return registerTest( TestCaseInfo( testInfo, oss.str() ) );
+#include <fstream>
-}
+namespace Catch {
-if( m_functions.find( testInfo ) == m_functions.end() ) {
-m_functions.insert( testInfo );
+std::ostream& cout();
-m_functionsInOrder.push_back( testInfo );
+std::ostream& cerr();
-}
-else {
+struct IStream {
-const TestCaseInfo& prev = *m_functions.find( testInfo );
+virtual ~IStream() CATCH_NOEXCEPT;
-std::cerr   << "error: TEST_CASE( \"" << testInfo.getName() << "\" ) already defined.\n"
+virtual std::ostream& stream() const = 0;
-<< "\tFirst seen at " << SourceLineInfo( prev.getLineInfo() ) << "\n"
+};
-<< "\tRedefined at " << SourceLineInfo( testInfo.getLineInfo() ) << std::endl;
-exit(1);
+class FileStream : public IStream {
-}
+mutable std::ofstream m_ofs;
-}
-virtual const std::vector<TestCaseInfo>& getAllTests() const {
-return m_functionsInOrder;
-}
-virtual std::vector<TestCaseInfo> getMatchingTestCases( const std::string& rawTestSpec ) {
-TestSpec testSpec( rawTestSpec );
-std::vector<TestCaseInfo> testList;
-std::vector<TestCaseInfo>::const_iterator it = m_functionsInOrder.begin();
-std::vector<TestCaseInfo>::const_iterator itEnd = m_functionsInOrder.end();
-for(; it != itEnd; ++it ) {
-if( testSpec.matches( it->getName() ) ) {
-testList.push_back( *it );
-}
-}
-return testList;
-}
-private:
-std::set<TestCaseInfo> m_functions;
-std::vector<TestCaseInfo> m_functionsInOrder;
-size_t m_unnamedCount;
-};
-///////////////////////////////////////////////////////////////////////////
-class FreeFunctionTestCase : public ITestCase {
 public:
+FileStream( std::string const& filename );
-FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {}
+virtual ~FileStream() CATCH_NOEXCEPT;
+public: // IStream
-virtual void invoke() const {
+virtual std::ostream& stream() const CATCH_OVERRIDE;
-m_fun();
+};
-}
+class CoutStream : public IStream {
-virtual ITestCase* clone() const {
+mutable std::ostream m_os;
-return new FreeFunctionTestCase( m_fun );
+public:
-}
+CoutStream();
+virtual ~CoutStream() CATCH_NOEXCEPT;
-virtual bool operator == ( const ITestCase& other ) const {
-const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other );
+public: // IStream
-return ffOther && m_fun == ffOther->m_fun;
+virtual std::ostream& stream() const CATCH_OVERRIDE;
-}
+};
-virtual bool operator < ( const ITestCase& other ) const {
+class DebugOutStream : public IStream {
-const FreeFunctionTestCase* ffOther = dynamic_cast<const FreeFunctionTestCase*> ( &other );
+CATCH_AUTO_PTR( StreamBufBase ) m_streamBuf;
-return ffOther && m_fun < ffOther->m_fun;
+mutable std::ostream m_os;
-}
+public:
+DebugOutStream();
-private:
+virtual ~DebugOutStream() CATCH_NOEXCEPT;
-TestFunction m_fun;
-};
+public: // IStream
+virtual std::ostream& stream() const CATCH_OVERRIDE;
-///////////////////////////////////////////////////////////////////////////
+};
+}
-AutoReg::AutoReg(   TestFunction function,
-const char* name,
-const char* description,
-const SourceLineInfo& lineInfo ) {
-registerTestCase( new FreeFunctionTestCase( function ), name, description, lineInfo );
-}
-AutoReg::~AutoReg() {}
-void AutoReg::registerTestCase( ITestCase* testCase,
-const char* name,
-const char* description,
-const SourceLineInfo& lineInfo ) {
-getCurrentContext().getTestCaseRegistry().registerTest( TestCaseInfo( testCase, name, description, lineInfo ) );
-}
-} // end namespace Catch
-// #included from: catch_runner_impl.hpp
-// #included from: catch_config.hpp
 #include <memory>
 #include <vector>
 #include <string>
 #include <iostream>
+#include <ctime>
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
 namespace Catch {
-struct Include { enum WhichResults {
+struct ConfigData {
-FailedOnly,
-SuccessfulResults
+ConfigData()
-}; };
+:   listTests( false ),
+listTags( false ),
-struct List{ enum What {
+listReporters( false ),
-None = 0,
+listTestNamesOnly( false ),
+showSuccessfulTests( false ),
-Reports = 1,
+shouldDebugBreak( false ),
-Tests = 2,
+noThrow( false ),
-All = 3,
+showHelp( false ),
+showInvisibles( false ),
-WhatMask = 0xf,
+filenamesAsTags( false ),
+abortAfter( -1 ),
-AsText = 0x10,
+rngSeed( 0 ),
-AsXml = 0x11,
+verbosity( Verbosity::Normal ),
+warnings( WarnAbout::Nothing ),
-AsMask = 0xf0
+showDurations( ShowDurations::DefaultForReporter ),
-}; };
+runOrder( RunTests::InDeclarationOrder ),
+useColour( UseColour::Auto )
-class Config : public IReporterConfig, public IConfig {
+{}
+bool listTests;
+bool listTags;
+bool listReporters;
+bool listTestNamesOnly;
+bool showSuccessfulTests;
+bool shouldDebugBreak;
+bool noThrow;
+bool showHelp;
+bool showInvisibles;
+bool filenamesAsTags;
+int abortAfter;
+unsigned int rngSeed;
+Verbosity::Level verbosity;
+WarnAbout::What warnings;
+ShowDurations::OrNot showDurations;
+RunTests::InWhatOrder runOrder;
+UseColour::YesOrNo useColour;
+std::string outputFilename;
+std::string name;
+std::string processName;
+std::vector<std::string> reporterNames;
+std::vector<std::string> testsOrTags;
+};
+class Config : public SharedImpl<IConfig> {
 private:
-Config( const Config& other );
+Config( Config const& other );
-Config& operator = ( const Config& other );
+Config& operator = ( Config const& other );
+virtual void dummy();
 public:
 Config()
-:   m_listSpec( List::None ),
-m_shouldDebugBreak( false ),
-m_showHelp( false ),
-m_streambuf( NULL ),
-m_os( std::cout.rdbuf() ),
-m_includeWhichResults( Include::FailedOnly ),
-m_cutoff( -1 ),
-m_allowThrows( true )
 {}
-~Config() {
+Config( ConfigData const& data )
-m_os.rdbuf( std::cout.rdbuf() );
+:   m_data( data ),
-delete m_streambuf;
+m_stream( openStream() )
-}
+{
+if( !data.testsOrTags.empty() ) {
-void setReporter( const std::string& reporterName ) {
+TestSpecParser parser( ITagAliasRegistry::get() );
-if( m_reporter.get() )
+for( std::size_t i = 0; i < data.testsOrTags.size(); ++i )
-return setError( "Only one reporter may be specified" );
+parser.parse( data.testsOrTags[i] );
-setReporter( getCurrentContext().getReporterRegistry().create( reporterName, *this ) );
+m_testSpec = parser.testSpec();
 }
+}
-void addTestSpec( const std::string& testSpec ) {
-m_testSpecs.push_back( testSpec );
+virtual ~Config() {
 }
-bool testsSpecified() const {
+std::string const& getFilename() const {
-return !m_testSpecs.empty();
+return m_data.outputFilename ;
 }
-const std::vector<std::string>& getTestSpecs() const {
+bool listTests() const { return m_data.listTests; }
-return m_testSpecs;
+bool listTestNamesOnly() const { return m_data.listTestNamesOnly; }
-}
+bool listTags() const { return m_data.listTags; }
+bool listReporters() const { return m_data.listReporters; }
-List::What getListSpec( void ) const {
-return m_listSpec;
+std::string getProcessName() const { return m_data.processName; }
-}
+bool shouldDebugBreak() const { return m_data.shouldDebugBreak; }
-void setListSpec( List::What listSpec ) {
-m_listSpec = listSpec;
+std::vector<std::string> getReporterNames() const { return m_data.reporterNames; }
-}
+int abortAfter() const { return m_data.abortAfter; }
-void setFilename( const std::string& filename ) {
-m_filename = filename;
+TestSpec const& testSpec() const { return m_testSpec; }
-}
+bool showHelp() const { return m_data.showHelp; }
-const std::string& getFilename() const {
+bool showInvisibles() const { return m_data.showInvisibles; }
-return m_filename;
-}
+// IConfig interface
+virtual bool allowThrows() const        { return !m_data.noThrow; }
-const std::string& getMessage() const {
+virtual std::ostream& stream() const    { return m_stream->stream(); }
-return m_message;
+virtual std::string name() const        { return m_data.name.empty() ? m_data.processName : m_data.name; }
-}
+virtual bool includeSuccessfulResults() const   { return m_data.showSuccessfulTests; }
+virtual bool warnAboutMissingAssertions() const { return m_data.warnings & WarnAbout::NoAssertions; }
-void setError( const std::string& errorMessage ) {
+virtual ShowDurations::OrNot showDurations() const { return m_data.showDurations; }
-m_message = errorMessage;
+virtual RunTests::InWhatOrder runOrder() const  { return m_data.runOrder; }
-}
+virtual unsigned int rngSeed() const    { return m_data.rngSeed; }
+virtual UseColour::YesOrNo useColour() const { return m_data.useColour; }
-void setReporter( IReporter* reporter ) {
-m_reporter = reporter;
-}
-Ptr<IReporter> getReporter() {
-if( !m_reporter.get() )
-const_cast<Config*>( this )->setReporter( getCurrentContext().getReporterRegistry().create( "basic", *this ) );
-return m_reporter;
-}
-List::What listWhat() const {
-return static_cast<List::What>( m_listSpec & List::WhatMask );
-}
-List::What listAs() const {
-return static_cast<List::What>( m_listSpec & List::AsMask );
-}
-void setIncludeWhichResults( Include::WhichResults includeWhichResults ) {
-m_includeWhichResults = includeWhichResults;
-}
-void setShouldDebugBreak( bool shouldDebugBreakFlag ) {
-m_shouldDebugBreak = shouldDebugBreakFlag;
-}
-void setName( const std::string& name ) {
-m_name = name;
-}
-std::string getName() const {
-return m_name;
-}
-bool shouldDebugBreak() const {
-return m_shouldDebugBreak;
-}
-void setShowHelp( bool showHelpFlag ) {
-m_showHelp = showHelpFlag;
-}
-bool showHelp() const {
-return m_showHelp;
-}
-virtual std::ostream& stream() const {
-return m_os;
-}
-void setStreamBuf( std::streambuf* buf ) {
-m_os.rdbuf( buf ? buf : std::cout.rdbuf() );
-}
-void useStream( const std::string& streamName ) {
-std::streambuf* newBuf = Context::createStreamBuf( streamName );
-setStreamBuf( newBuf );
-delete m_streambuf;
-m_streambuf = newBuf;
-}
-virtual bool includeSuccessfulResults() const {
-return m_includeWhichResults == Include::SuccessfulResults;
-}
-int getCutoff() const {
-return m_cutoff;
-}
-void setCutoff( int cutoff ) {
-m_cutoff = cutoff;
-}
-void setAllowThrows( bool allowThrows ) {
-m_allowThrows = allowThrows;
-}
-virtual bool allowThrows() const {
-return m_allowThrows;
-}
 private:
-Ptr<IReporter> m_reporter;
-std::string m_filename;
+IStream const* openStream() {
-std::string m_message;
+if( m_data.outputFilename.empty() )
-List::What m_listSpec;
+return new CoutStream();
-std::vector<std::string> m_testSpecs;
+else if( m_data.outputFilename[0] == '%' ) {
-bool m_shouldDebugBreak;
+if( m_data.outputFilename == "%debug" )
-bool m_showHelp;
+return new DebugOutStream();
-std::streambuf* m_streambuf;
+else
-mutable std::ostream m_os;
+throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename );
-Include::WhichResults m_includeWhichResults;
+}
-std::string m_name;
+else
-int m_cutoff;
+return new FileStream( m_data.outputFilename );
-bool m_allowThrows;
+}
-};
+ConfigData m_data;
-struct NewConfig {
+CATCH_AUTO_PTR( IStream const ) m_stream;
-std::string reporter;
+TestSpec m_testSpec;
-std::string outputFilename;
+};
-List::What listSpec;
-std::vector<std::string> testSpecs;
+} // end namespace Catch
-bool shouldDebugBreak;
-bool showHelp;
+// #included from: catch_clara.h
-Include::WhichResults includeWhichResults;
+#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CLARA_CONFIG_CONSOLE_WIDTH
+#undef CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
+// Declare Clara inside the Catch namespace
+#define STITCH_CLARA_OPEN_NAMESPACE namespace Catch {
+// #included from: ../external/clara.h
+// 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)
+#ifndef STITCH_CLARA_OPEN_NAMESPACE
+#define TWOBLUECUBES_CLARA_H_INCLUDED
+#define STITCH_CLARA_OPEN_NAMESPACE
+#define STITCH_CLARA_CLOSE_NAMESPACE
+#else
+#define STITCH_CLARA_CLOSE_NAMESPACE }
+#endif
+#define STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE STITCH_CLARA_OPEN_NAMESPACE
+// ----------- #included from tbc_text_format.h -----------
+// Only use header guard if we are not using an outer namespace
+#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
+#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#define TBC_TEXT_FORMAT_H_INCLUDED
+#endif
+#include <string>
+#include <vector>
+#include <sstream>
+#include <algorithm>
+// Use optional outer namespace
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+#endif
+namespace Tbc {
+#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
+const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
+#else
+const unsigned int consoleWidth = 80;
+#endif
+struct TextAttributes {
+TextAttributes()
+:   initialIndent( std::string::npos ),
+indent( 0 ),
+width( consoleWidth-1 ),
+tabChar( '\t' )
+{}
+TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
+TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
+TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
+TextAttributes& setTabChar( char _value )               { tabChar = _value; return *this; }
+std::size_t initialIndent;  // indent of first line, or npos
+std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
+std::size_t width;          // maximum width of text, including indent. Longer text will wrap
+char tabChar;               // If this char is seen the indent is changed to current pos
+};
+class Text {
+public:
+Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
+: attr( _attr )
+{
+std::string wrappableChars = " [({.,/|\\-";
+std::size_t indent = _attr.initialIndent != std::string::npos
+? _attr.initialIndent
+: _attr.indent;
+std::string remainder = _str;
+while( !remainder.empty() ) {
+if( lines.size() >= 1000 ) {
+lines.push_back( "... message truncated due to excessive size" );
+return;
+}
+std::size_t tabPos = std::string::npos;
+std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
+std::size_t pos = remainder.find_first_of( '\n' );
+if( pos <= width ) {
+width = pos;
+}
+pos = remainder.find_last_of( _attr.tabChar, width );
+if( pos != std::string::npos ) {
+tabPos = pos;
+if( remainder[width] == '\n' )
+width--;
+remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
+}
+if( width == remainder.size() ) {
+spliceLine( indent, remainder, width );
+}
+else if( remainder[width] == '\n' ) {
+spliceLine( indent, remainder, width );
+if( width <= 1 || remainder.size() != 1 )
+remainder = remainder.substr( 1 );
+indent = _attr.indent;
+}
+else {
+pos = remainder.find_last_of( wrappableChars, width );
+if( pos != std::string::npos && pos > 0 ) {
+spliceLine( indent, remainder, pos );
+if( remainder[0] == ' ' )
+remainder = remainder.substr( 1 );
+}
+else {
+spliceLine( indent, remainder, width-1 );
+lines.back() += "-";
+}
+if( lines.size() == 1 )
+indent = _attr.indent;
+if( tabPos != std::string::npos )
+indent += tabPos;
+}
+}
+}
+void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
+lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
+_remainder = _remainder.substr( _pos );
+}
+typedef std::vector<std::string>::const_iterator const_iterator;
+const_iterator begin() const { return lines.begin(); }
+const_iterator end() const { return lines.end(); }
+std::string const& last() const { return lines.back(); }
+std::size_t size() const { return lines.size(); }
+std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+std::string toString() const {
+std::ostringstream oss;
+oss << *this;
+return oss.str();
+}
+inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+it != itEnd; ++it ) {
+if( it != _text.begin() )
+_stream << "\n";
+_stream << *it;
+}
+return _stream;
+}
+private:
+std::string str;
+TextAttributes attr;
+std::vector<std::string> lines;
+};
+} // end namespace Tbc
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+} // end outer namespace
+#endif
+#endif // TBC_TEXT_FORMAT_H_INCLUDED
+// ----------- end of #include from tbc_text_format.h -----------
+// ........... back in clara.h
+#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
+// ----------- #included from clara_compilers.h -----------
+#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 <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
+#endif
+namespace Clara {
+struct UnpositionalTag {};
+extern UnpositionalTag _;
+#ifdef CLARA_CONFIG_MAIN
+UnpositionalTag _;
+#endif
+namespace Detail {
+#ifdef CLARA_CONSOLE_WIDTH
+const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH;
+#else
+const unsigned int consoleWidth = 80;
+#endif
+using namespace Tbc;
+inline bool startsWith( std::string const& str, std::string const& prefix ) {
+return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix;
+}
+template<typename T> struct RemoveConstRef{ typedef T type; };
+template<typename T> struct RemoveConstRef<T&>{ typedef T type; };
+template<typename T> struct RemoveConstRef<T const&>{ typedef T type; };
+template<typename T> struct RemoveConstRef<T const>{ typedef T type; };
+template<typename T>    struct IsBool       { static const bool value = false; };
+template<>              struct IsBool<bool> { static const bool value = true; };
+template<typename T>
+void convertInto( std::string const& _source, T& _dest ) {
+std::stringstream ss;
+ss << _source;
+ss >> _dest;
+if( ss.fail() )
+throw std::runtime_error( "Unable to convert " + _source + " to destination type" );
+}
+inline void convertInto( std::string const& _source, std::string& _dest ) {
+_dest = _source;
+}
+inline void convertInto( std::string const& _source, bool& _dest ) {
+std::string sourceLC = _source;
+std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), ::tolower );
+if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" )
+_dest = true;
+else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" )
+_dest = false;
+else
+throw std::runtime_error( "Expected a boolean value but did not recognise:\n  '" + _source + "'" );
+}
+template<typename ConfigT>
+struct IArgFunction {
+virtual ~IArgFunction() {}
+#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS
+IArgFunction()                      = default;
+IArgFunction( IArgFunction const& ) = default;
+#endif
+virtual void set( ConfigT& config, std::string const& value ) const = 0;
+virtual bool takesArg() const = 0;
+virtual IArgFunction* clone() const = 0;
+};
+template<typename ConfigT>
+class BoundArgFunction {
+public:
+BoundArgFunction() : functionObj( CLARA_NULL ) {}
+BoundArgFunction( IArgFunction<ConfigT>* _functionObj ) : functionObj( _functionObj ) {}
+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() : CLARA_NULL;
+delete functionObj;
+functionObj = newFunctionObj;
+return *this;
+}
+~BoundArgFunction() { delete functionObj; }
+void set( ConfigT& config, std::string const& value ) const {
+functionObj->set( config, value );
+}
+bool takesArg() const { return functionObj->takesArg(); }
+bool isSet() const {
+return functionObj != CLARA_NULL;
+}
+private:
+IArgFunction<ConfigT>* functionObj;
+};
+template<typename C>
+struct NullBinder : IArgFunction<C>{
+virtual void set( C&, std::string const& ) const {}
+virtual bool takesArg() const { return true; }
+virtual IArgFunction<C>* clone() const { return new NullBinder( *this ); }
+};
+template<typename C, typename M>
+struct BoundDataMember : IArgFunction<C>{
+BoundDataMember( M C::* _member ) : member( _member ) {}
+virtual void set( C& p, std::string const& stringValue ) const {
+convertInto( stringValue, p.*member );
+}
+virtual bool takesArg() const { return !IsBool<M>::value; }
+virtual IArgFunction<C>* clone() const { return new BoundDataMember( *this ); }
+M C::* member;
+};
+template<typename C, typename M>
+struct BoundUnaryMethod : IArgFunction<C>{
+BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {}
+virtual void set( C& p, std::string const& stringValue ) const {
+typename RemoveConstRef<M>::type value;
+convertInto( stringValue, 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 );
+};
+template<typename C>
+struct BoundNullaryMethod : IArgFunction<C>{
+BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {}
+virtual void set( C& p, std::string const& stringValue ) const {
+bool value;
+convertInto( stringValue, value );
+if( value )
+(p.*member)();
+}
+virtual bool takesArg() const { return false; }
+virtual IArgFunction<C>* clone() const { return new BoundNullaryMethod( *this ); }
+void (C::*member)();
+};
+template<typename C>
+struct BoundUnaryFunction : IArgFunction<C>{
+BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {}
+virtual void set( C& obj, std::string const& stringValue ) const {
+bool value;
+convertInto( stringValue, value );
+if( value )
+function( obj );
+}
+virtual bool takesArg() const { return false; }
+virtual IArgFunction<C>* clone() const { return new BoundUnaryFunction( *this ); }
+void (*function)( C& );
+};
+template<typename C, typename T>
+struct BoundBinaryFunction : IArgFunction<C>{
+BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {}
+virtual void set( C& obj, std::string const& stringValue ) const {
+typename RemoveConstRef<T>::type value;
+convertInto( stringValue, 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 );
+};
+} // namespace Detail
+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 };
+Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {}
+Type type;
+std::string data;
+};
+Parser() : mode( None ), from( 0 ), inQuotes( false ){}
+void parseIntoTokens( std::vector<std::string> const& args, std::vector<Token>& tokens ) {
+const std::string doubleDash = "--";
+for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i )
+parseIntoTokens( args[i], tokens);
+}
+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 );
+}
+}
+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", 3 ).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", 1 ).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>
+struct CommonArgProperties {
+CommonArgProperties() {}
+CommonArgProperties( Detail::BoundArgFunction<ConfigT> const& _boundField ) : boundField( _boundField ) {}
+Detail::BoundArgFunction<ConfigT> boundField;
+std::string description;
+std::string detail;
+std::string placeholder; // Only value if boundField takes an arg
+bool takesArg() const {
+return !placeholder.empty();
+}
+void validate() const {
+if( !boundField.isSet() )
+throw std::logic_error( "option not bound" );
+}
+};
+struct OptionArgProperties {
+std::vector<std::string> shortNames;
+std::string longName;
+bool hasShortName( std::string const& shortName ) const {
+return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end();
+}
+bool hasLongName( std::string const& _longName ) const {
+return _longName == longName;
+}
+};
+struct PositionalArgProperties {
+PositionalArgProperties() : position( -1 ) {}
+int position; // -1 means non-positional (floating)
+bool isFixedPositional() const {
+return position != -1;
+}
+};
+template<typename ConfigT>
+class CommandLine {
+struct Arg : CommonArgProperties<ConfigT>, OptionArgProperties, PositionalArgProperties {
+Arg() {}
+Arg( Detail::BoundArgFunction<ConfigT> const& _boundField ) : CommonArgProperties<ConfigT>( _boundField ) {}
+using CommonArgProperties<ConfigT>::placeholder; // !TBD
+std::string dbgName() const {
+if( !longName.empty() )
+return "--" + longName;
+if( !shortNames.empty() )
+return "-" + shortNames[0];
+return "positional args";
+}
+std::string commands() const {
+std::ostringstream oss;
+bool first = true;
+std::vector<std::string>::const_iterator it = shortNames.begin(), itEnd = shortNames.end();
+for(; it != itEnd; ++it ) {
+if( first )
+first = false;
+else
+oss << ", ";
+oss << "-" << *it;
+}
+if( !longName.empty() ) {
+if( !first )
+oss << ", ";
+oss << "--" << longName;
+}
+if( !placeholder.empty() )
+oss << " <" << placeholder << ">";
+return oss.str();
+}
+};
+typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr;
+friend void addOptName( Arg& arg, std::string const& optName )
+{
+if( optName.empty() )
+return;
+if( Detail::startsWith( optName, "--" ) ) {
+if( !arg.longName.empty() )
+throw std::logic_error( "Only one long opt may be specified. '"
++ arg.longName
++ "' already specified, now attempting to add '"
++ optName + "'" );
+arg.longName = optName.substr( 2 );
+}
+else if( Detail::startsWith( optName, "-" ) )
+arg.shortNames.push_back( optName.substr( 1 ) );
+else
+throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" );
+}
+friend void setPositionalArg( Arg& arg, int position )
+{
+arg.position = position;
+}
+class ArgBuilder {
+public:
+ArgBuilder( Arg* arg ) : m_arg( arg ) {}
+// Bind a non-boolean data member (requires placeholder string)
+template<typename C, typename M>
+void bind( M C::* field, std::string const& placeholder ) {
+m_arg->boundField = new Detail::BoundDataMember<C,M>( field );
+m_arg->placeholder = placeholder;
+}
+// Bind a boolean data member (no placeholder required)
+template<typename C>
+void bind( bool C::* field ) {
+m_arg->boundField = new Detail::BoundDataMember<C,bool>( field );
+}
+// Bind a method taking a single, non-boolean argument (requires a placeholder string)
+template<typename C, typename M>
+void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) {
+m_arg->boundField = new Detail::BoundUnaryMethod<C,M>( unaryMethod );
+m_arg->placeholder = placeholder;
+}
+// Bind a method taking a single, boolean argument (no placeholder string required)
+template<typename C>
+void bind( void (C::* unaryMethod)( bool ) ) {
+m_arg->boundField = new Detail::BoundUnaryMethod<C,bool>( unaryMethod );
+}
+// Bind a method that takes no arguments (will be called if opt is present)
+template<typename C>
+void bind( void (C::* nullaryMethod)() ) {
+m_arg->boundField = new Detail::BoundNullaryMethod<C>( nullaryMethod );
+}
+// Bind a free function taking a single argument - the object to operate on (no placeholder string required)
+template<typename C>
+void bind( void (* unaryFunction)( C& ) ) {
+m_arg->boundField = new Detail::BoundUnaryFunction<C>( unaryFunction );
+}
+// Bind a free function taking a single argument - the object to operate on (requires a placeholder string)
+template<typename C, typename T>
+void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) {
+m_arg->boundField = new Detail::BoundBinaryFunction<C, T>( binaryFunction );
+m_arg->placeholder = placeholder;
+}
+ArgBuilder& describe( std::string const& description ) {
+m_arg->description = description;
+return *this;
+}
+ArgBuilder& detail( std::string const& detail ) {
+m_arg->detail = detail;
+return *this;
+}
+protected:
+Arg* m_arg;
+};
+class OptBuilder : public ArgBuilder {
+public:
+OptBuilder( Arg* arg ) : ArgBuilder( arg ) {}
+OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {}
+OptBuilder& operator[]( std::string const& optName ) {
+addOptName( *ArgBuilder::m_arg, optName );
+return *this;
+}
+};
+public:
+CommandLine()
+:   m_boundProcessName( new Detail::NullBinder<ConfigT>() ),
+m_highestSpecifiedArgPosition( 0 ),
+m_throwOnUnrecognisedTokens( false )
+{}
+CommandLine( CommandLine const& other )
+:   m_boundProcessName( other.m_boundProcessName ),
+m_options ( other.m_options ),
+m_positionalArgs( other.m_positionalArgs ),
+m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ),
+m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens )
+{
+if( other.m_floatingArg.get() )
+m_floatingArg.reset( new Arg( *other.m_floatingArg ) );
+}
+CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) {
+m_throwOnUnrecognisedTokens = shouldThrow;
+return *this;
+}
+OptBuilder operator[]( std::string const& optName ) {
+m_options.push_back( Arg() );
+addOptName( m_options.back(), optName );
+OptBuilder builder( &m_options.back() );
+return builder;
+}
+ArgBuilder operator[]( int position ) {
+m_positionalArgs.insert( std::make_pair( position, Arg() ) );
+if( position > m_highestSpecifiedArgPosition )
+m_highestSpecifiedArgPosition = position;
+setPositionalArg( m_positionalArgs[position], position );
+ArgBuilder builder( &m_positionalArgs[position] );
+return builder;
+}
+// Invoke this with the _ instance
+ArgBuilder operator[]( UnpositionalTag ) {
+if( m_floatingArg.get() )
+throw std::logic_error( "Only one unpositional argument can be added" );
+m_floatingArg.reset( new Arg() );
+ArgBuilder builder( m_floatingArg.get() );
+return builder;
+}
+template<typename C, typename M>
+void bindProcessName( M C::* field ) {
+m_boundProcessName = new Detail::BoundDataMember<C,M>( field );
+}
+template<typename C, typename M>
+void bindProcessName( void (C::*_unaryMethod)( M ) ) {
+m_boundProcessName = new Detail::BoundUnaryMethod<C,M>( _unaryMethod );
+}
+void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const {
+typename std::vector<Arg>::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it;
+std::size_t maxWidth = 0;
+for( it = itBegin; it != itEnd; ++it )
+maxWidth = (std::max)( maxWidth, it->commands().size() );
+for( it = itBegin; it != itEnd; ++it ) {
+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)( usage.size(), desc.size() ); ++i ) {
+std::string usageCol = i < usage.size() ? usage[i] : "";
+os << usageCol;
+if( i < desc.size() && !desc[i].empty() )
+os  << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' )
+<< desc[i];
+os << "\n";
+}
+}
+}
+std::string optUsage() const {
+std::ostringstream oss;
+optUsage( oss );
+return oss.str();
+}
+void argSynopsis( std::ostream& os ) const {
+for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) {
+if( i > 1 )
+os << " ";
+typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( i );
+if( it != m_positionalArgs.end() )
+os << "<" << it->second.placeholder << ">";
+else if( m_floatingArg.get() )
+os << "<" << m_floatingArg->placeholder << ">";
+else
+throw std::logic_error( "non consecutive positional arguments with no floating args" );
+}
+// !TBD No indication of mandatory args
+if( m_floatingArg.get() ) {
+if( m_highestSpecifiedArgPosition > 1 )
+os << " ";
+os << "[<" << m_floatingArg->placeholder << "> ...]";
+}
+}
+std::string argSynopsis() const {
+std::ostringstream oss;
+argSynopsis( oss );
+return oss.str();
+}
+void usage( std::ostream& os, std::string const& procName ) const {
+validate();
+os << "usage:\n  " << procName << " ";
+argSynopsis( os );
+if( !m_options.empty() ) {
+os << " [options]\n\nwhere options are: \n";
+optUsage( os, 2 );
+}
+os << "\n";
+}
+std::string usage( std::string const& procName ) const {
+std::ostringstream oss;
+usage( oss, procName );
+return oss.str();
+}
+ConfigT parse( std::vector<std::string> const& args ) const {
+ConfigT config;
+parseInto( args, config );
+return config;
+}
+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( args, tokens );
+return populate( tokens, config );
+}
+std::vector<Parser::Token> populate( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+validate();
+std::vector<Parser::Token> unusedTokens = populateOptions( tokens, config );
+unusedTokens = populateFixedArgs( unusedTokens, config );
+unusedTokens = populateFloatingArgs( unusedTokens, config );
+return unusedTokens;
+}
+std::vector<Parser::Token> populateOptions( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+std::vector<Parser::Token> unusedTokens;
+std::vector<std::string> errors;
+for( std::size_t i = 0; i < tokens.size(); ++i ) {
+Parser::Token const& token = tokens[i];
+typename std::vector<Arg>::const_iterator it = m_options.begin(), itEnd = m_options.end();
+for(; it != itEnd; ++it ) {
+Arg const& arg = *it;
+try {
+if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) ||
+( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) {
+if( arg.takesArg() ) {
+if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional )
+errors.push_back( "Expected argument to option: " + token.data );
+else
+arg.boundField.set( config, tokens[++i].data );
+}
+else {
+arg.boundField.set( config, "true" );
+}
+break;
+}
+}
+catch( std::exception& ex ) {
+errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" );
+}
+}
+if( it == itEnd ) {
+if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens )
+unusedTokens.push_back( token );
+else if( errors.empty() && m_throwOnUnrecognisedTokens )
+errors.push_back( "unrecognised option: " + token.data );
+}
+}
+if( !errors.empty() ) {
+std::ostringstream oss;
+for( std::vector<std::string>::const_iterator it = errors.begin(), itEnd = errors.end();
+it != itEnd;
+++it ) {
+if( it != errors.begin() )
+oss << "\n";
+oss << *it;
+}
+throw std::runtime_error( oss.str() );
+}
+return unusedTokens;
+}
+std::vector<Parser::Token> populateFixedArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+std::vector<Parser::Token> unusedTokens;
+int position = 1;
+for( std::size_t i = 0; i < tokens.size(); ++i ) {
+Parser::Token const& token = tokens[i];
+typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( position );
+if( it != m_positionalArgs.end() )
+it->second.boundField.set( config, token.data );
+else
+unusedTokens.push_back( token );
+if( token.type == Parser::Token::Positional )
+position++;
+}
+return unusedTokens;
+}
+std::vector<Parser::Token> populateFloatingArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+if( !m_floatingArg.get() )
+return tokens;
+std::vector<Parser::Token> unusedTokens;
+for( std::size_t i = 0; i < tokens.size(); ++i ) {
+Parser::Token const& token = tokens[i];
+if( token.type == Parser::Token::Positional )
+m_floatingArg->boundField.set( config, token.data );
+else
+unusedTokens.push_back( token );
+}
+return unusedTokens;
+}
+void validate() const
+{
+if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() )
+throw std::logic_error( "No options or arguments specified" );
+for( typename std::vector<Arg>::const_iterator  it = m_options.begin(),
+itEnd = m_options.end();
+it != itEnd; ++it )
+it->validate();
+}
+private:
+Detail::BoundArgFunction<ConfigT> m_boundProcessName;
+std::vector<Arg> m_options;
+std::map<int, Arg> m_positionalArgs;
+ArgAutoPtr m_floatingArg;
+int m_highestSpecifiedArgPosition;
+bool m_throwOnUnrecognisedTokens;
+};
+} // end namespace Clara
+STITCH_CLARA_CLOSE_NAMESPACE
+#undef STITCH_CLARA_OPEN_NAMESPACE
+#undef STITCH_CLARA_CLOSE_NAMESPACE
+#endif // TWOBLUECUBES_CLARA_H_INCLUDED
+#undef STITCH_CLARA_OPEN_NAMESPACE
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+#include <fstream>
+namespace Catch {
+inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; }
+inline void abortAfterX( ConfigData& config, int x ) {
+if( x < 1 )
+throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" );
+config.abortAfter = x;
+}
+inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); }
+inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); }
+inline void addWarning( ConfigData& config, std::string const& _warning ) {
+if( _warning == "NoAssertions" )
+config.warnings = static_cast<WarnAbout::What>( config.warnings | WarnAbout::NoAssertions );
+else
+throw std::runtime_error( "Unrecognised warning: '" + _warning + "'" );
+}
+inline void setOrder( ConfigData& config, std::string const& order ) {
+if( startsWith( "declared", order ) )
+config.runOrder = RunTests::InDeclarationOrder;
+else if( startsWith( "lexical", order ) )
+config.runOrder = RunTests::InLexicographicalOrder;
+else if( startsWith( "random", order ) )
+config.runOrder = RunTests::InRandomOrder;
+else
+throw std::runtime_error( "Unrecognised ordering: '" + order + "'" );
+}
+inline void setRngSeed( ConfigData& config, std::string const& seed ) {
+if( seed == "time" ) {
+config.rngSeed = static_cast<unsigned int>( std::time(0) );
+}
+else {
+std::stringstream ss;
+ss << seed;
+ss >> config.rngSeed;
+if( ss.fail() )
+throw std::runtime_error( "Argment to --rng-seed should be the word 'time' or a number" );
+}
+}
+inline void setVerbosity( ConfigData& config, int level ) {
+// !TBD: accept strings?
+config.verbosity = static_cast<Verbosity::Level>( level );
+}
+inline void setShowDurations( ConfigData& config, bool _showDurations ) {
+config.showDurations = _showDurations
+? 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() )
+throw std::domain_error( "Unable to load input file: " + _filename );
+std::string line;
+while( std::getline( f, line ) ) {
+line = trim(line);
+if( !line.empty() && !startsWith( line, "#" ) )
+addTestOrTags( config, "\"" + line + "\"," );
+}
+}
+inline Clara::CommandLine<ConfigData> makeCommandLineParser() {
+using namespace Clara;
+CommandLine<ConfigData> cli;
+cli.bindProcessName( &ConfigData::processName );
+cli["-?"]["-h"]["--help"]
+.describe( "display usage information" )
+.bind( &ConfigData::showHelp );
+cli["-l"]["--list-tests"]
+.describe( "list all/matching test cases" )
+.bind( &ConfigData::listTests );
+cli["-t"]["--list-tags"]
+.describe( "list all/matching tags" )
+.bind( &ConfigData::listTags );
+cli["-s"]["--success"]
+.describe( "include successful tests in output" )
+.bind( &ConfigData::showSuccessfulTests );
+cli["-b"]["--break"]
+.describe( "break into debugger on failure" )
+.bind( &ConfigData::shouldDebugBreak );
+cli["-e"]["--nothrow"]
+.describe( "skip exception tests" )
+.bind( &ConfigData::noThrow );
+cli["-i"]["--invisibles"]
+.describe( "show invisibles (tabs, newlines)" )
+.bind( &ConfigData::showInvisibles );
+cli["-o"]["--out"]
+.describe( "output filename" )
+.bind( &ConfigData::outputFilename, "filename" );
+cli["-r"]["--reporter"]
+//            .placeholder( "name[:filename]" )
+.describe( "reporter to use (defaults to console)" )
+.bind( &addReporterName, "name" );
+cli["-n"]["--name"]
+.describe( "suite name" )
+.bind( &ConfigData::name, "name" );
+cli["-a"]["--abort"]
+.describe( "abort at first failure" )
+.bind( &abortAfterFirst );
+cli["-x"]["--abortx"]
+.describe( "abort after x failures" )
+.bind( &abortAfterX, "no. failures" );
+cli["-w"]["--warn"]
+.describe( "enable warnings" )
+.bind( &addWarning, "warning name" );
+// - needs updating if reinstated
+//        cli.into( &setVerbosity )
+//            .describe( "level of verbosity (0=no output)" )
+//            .shortOpt( "v")
+//            .longOpt( "verbosity" )
+//            .placeholder( "level" );
+cli[_]
+.describe( "which test or tests to use" )
+.bind( &addTestOrTags, "test name, pattern or tags" );
+cli["-d"]["--durations"]
+.describe( "show test durations" )
+.bind( &setShowDurations, "yes|no" );
+cli["-f"]["--input-file"]
+.describe( "load test names to run from a file" )
+.bind( &loadTestNamesFromFile, "filename" );
+cli["-#"]["--filenames-as-tags"]
+.describe( "adds a tag for the filename" )
+.bind( &ConfigData::filenamesAsTags );
+// Less common commands which don't have a short form
+cli["--list-test-names-only"]
+.describe( "list all/matching test cases names only" )
+.bind( &ConfigData::listTestNamesOnly );
+cli["--list-reporters"]
+.describe( "list all reporters" )
+.bind( &ConfigData::listReporters );
+cli["--order"]
+.describe( "test case order (defaults to decl)" )
+.bind( &setOrder, "decl|lex|rand" );
+cli["--rng-seed"]
+.describe( "set a specific seed for random numbers" )
+.bind( &setRngSeed, "'time'|number" );
+cli["--force-colour"]
+.describe( "force colourised output (deprecated)" )
+.bind( &forceColour );
+cli["--use-colour"]
+.describe( "should output be colourised" )
+.bind( &setUseColour, "yes|no" );
+return cli;
+}
+} // end namespace Catch
+// #included from: internal/catch_list.hpp
+#define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
+// #included from: catch_text.h
+#define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
+#define TBC_TEXT_FORMAT_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
+#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Catch
+// #included from: ../external/tbc_text_format.h
+// Only use header guard if we are not using an outer namespace
+#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
+#  ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#   define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#  endif
+# else
+#  define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
+# endif
+#endif
+#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#include <string>
+#include <vector>
+#include <sstream>
+// Use optional outer namespace
+#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+#endif
+namespace Tbc {
+#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
+const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
+#else
+const unsigned int consoleWidth = 80;
+#endif
+struct TextAttributes {
+TextAttributes()
+:   initialIndent( std::string::npos ),
+indent( 0 ),
+width( consoleWidth-1 ),
+tabChar( '\t' )
+{}
+TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
+TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
+TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
+TextAttributes& setTabChar( char _value )               { tabChar = _value; return *this; }
+std::size_t initialIndent;  // indent of first line, or npos
+std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
+std::size_t width;          // maximum width of text, including indent. Longer text will wrap
+char tabChar;               // If this char is seen the indent is changed to current pos
+};
+class Text {
+public:
+Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
+: attr( _attr )
+{
+std::string wrappableChars = " [({.,/|\\-";
+std::size_t indent = _attr.initialIndent != std::string::npos
+? _attr.initialIndent
+: _attr.indent;
+std::string remainder = _str;
+while( !remainder.empty() ) {
+if( lines.size() >= 1000 ) {
+lines.push_back( "... message truncated due to excessive size" );
+return;
+}
+std::size_t tabPos = std::string::npos;
+std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
+std::size_t pos = remainder.find_first_of( '\n' );
+if( pos <= width ) {
+width = pos;
+}
+pos = remainder.find_last_of( _attr.tabChar, width );
+if( pos != std::string::npos ) {
+tabPos = pos;
+if( remainder[width] == '\n' )
+width--;
+remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
+}
+if( width == remainder.size() ) {
+spliceLine( indent, remainder, width );
+}
+else if( remainder[width] == '\n' ) {
+spliceLine( indent, remainder, width );
+if( width <= 1 || remainder.size() != 1 )
+remainder = remainder.substr( 1 );
+indent = _attr.indent;
+}
+else {
+pos = remainder.find_last_of( wrappableChars, width );
+if( pos != std::string::npos && pos > 0 ) {
+spliceLine( indent, remainder, pos );
+if( remainder[0] == ' ' )
+remainder = remainder.substr( 1 );
+}
+else {
+spliceLine( indent, remainder, width-1 );
+lines.back() += "-";
+}
+if( lines.size() == 1 )
+indent = _attr.indent;
+if( tabPos != std::string::npos )
+indent += tabPos;
+}
+}
+}
+void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
+lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
+_remainder = _remainder.substr( _pos );
+}
+typedef std::vector<std::string>::const_iterator const_iterator;
+const_iterator begin() const { return lines.begin(); }
+const_iterator end() const { return lines.end(); }
+std::string const& last() const { return lines.back(); }
+std::size_t size() const { return lines.size(); }
+std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+std::string toString() const {
+std::ostringstream oss;
+oss << *this;
+return oss.str();
+}
+inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+it != itEnd; ++it ) {
+if( it != _text.begin() )
+_stream << "\n";
+_stream << *it;
+}
+return _stream;
+}
+private:
+std::string str;
+TextAttributes attr;
+std::vector<std::string> lines;
+};
+} // end namespace Tbc
+#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+} // end outer namespace
+#endif
+#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace Catch {
+using Tbc::Text;
+using Tbc::TextAttributes;
+}
+// #included from: catch_console_colour.hpp
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+namespace Catch {
+struct Colour {
+enum Code {
+None = 0,
+White,
+Red,
+Green,
+Blue,
+Cyan,
+Yellow,
+Grey,
+Bright = 0x10,
+BrightRed = Bright | Red,
+BrightGreen = Bright | Green,
+LightGrey = Bright | Grey,
+BrightWhite = Bright | White,
+// By intention
+FileName = LightGrey,
+Warning = Yellow,
+ResultError = BrightRed,
+ResultSuccess = BrightGreen,
+ResultExpectedFailure = Warning,
+Error = BrightRed,
+Success = Green,
+OriginalExpression = Cyan,
+ReconstructedExpression = Yellow,
+SecondaryText = LightGrey,
+Headers = White
+};
+// Use constructed object for RAII guard
+Colour( Code _colourCode );
+Colour( Colour const& other );
+~Colour();
+// Use static method for one-shot changes
+static void use( Code _colourCode );
+private:
+bool m_moved;
+};
+inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; }
+} // end namespace Catch
+// #included from: catch_interfaces_reporter.h
+#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
+#include <string>
+#include <ostream>
+#include <map>
+#include <assert.h>
+namespace Catch
+{
+struct ReporterConfig {
+explicit ReporterConfig( Ptr<IConfig const> const& _fullConfig )
+:   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+ReporterConfig( Ptr<IConfig const> const& _fullConfig, std::ostream& _stream )
+:   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+std::ostream& stream() const    { return *m_stream; }
+Ptr<IConfig const> fullConfig() const { return m_fullConfig; }
+private:
+std::ostream* m_stream;
+Ptr<IConfig const> m_fullConfig;
+};
+struct ReporterPreferences {
+ReporterPreferences()
+: shouldRedirectStdOut( false )
+{}
+bool shouldRedirectStdOut;
+};
+template<typename T>
+struct LazyStat : Option<T> {
+LazyStat() : used( false ) {}
+LazyStat& operator=( T const& _value ) {
+Option<T>::operator=( _value );
+used = false;
+return *this;
+}
+void reset() {
+Option<T>::reset();
+used = false;
+}
+bool used;
+};
+struct TestRunInfo {
+TestRunInfo( std::string const& _name ) : name( _name ) {}
 std::string name;
 };
+struct GroupInfo {
+GroupInfo(  std::string const& _name,
+std::size_t _groupIndex,
+std::size_t _groupsCount )
+:   name( _name ),
+groupIndex( _groupIndex ),
+groupsCounts( _groupsCount )
+{}
+std::string name;
+std::size_t groupIndex;
+std::size_t groupsCounts;
+};
+struct AssertionStats {
+AssertionStats( AssertionResult const& _assertionResult,
+std::vector<MessageInfo> const& _infoMessages,
+Totals const& _totals )
+:   assertionResult( _assertionResult ),
+infoMessages( _infoMessages ),
+totals( _totals )
+{
+if( assertionResult.hasMessage() ) {
+// Copy message into messages list.
+// !TBD This should have been done earlier, somewhere
+MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+builder << assertionResult.getMessage();
+builder.m_info.message = builder.m_stream.str();
+infoMessages.push_back( builder.m_info );
+}
+}
+virtual ~AssertionStats();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+AssertionStats( AssertionStats const& )              = default;
+AssertionStats( AssertionStats && )                  = default;
+AssertionStats& operator = ( AssertionStats const& ) = default;
+AssertionStats& operator = ( AssertionStats && )     = default;
+#  endif
+AssertionResult assertionResult;
+std::vector<MessageInfo> infoMessages;
+Totals totals;
+};
+struct SectionStats {
+SectionStats(   SectionInfo const& _sectionInfo,
+Counts const& _assertions,
+double _durationInSeconds,
+bool _missingAssertions )
+:   sectionInfo( _sectionInfo ),
+assertions( _assertions ),
+durationInSeconds( _durationInSeconds ),
+missingAssertions( _missingAssertions )
+{}
+virtual ~SectionStats();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+SectionStats( SectionStats const& )              = default;
+SectionStats( SectionStats && )                  = default;
+SectionStats& operator = ( SectionStats const& ) = default;
+SectionStats& operator = ( SectionStats && )     = default;
+#  endif
+SectionInfo sectionInfo;
+Counts assertions;
+double durationInSeconds;
+bool missingAssertions;
+};
+struct TestCaseStats {
+TestCaseStats(  TestCaseInfo const& _testInfo,
+Totals const& _totals,
+std::string const& _stdOut,
+std::string const& _stdErr,
+bool _aborting )
+: testInfo( _testInfo ),
+totals( _totals ),
+stdOut( _stdOut ),
+stdErr( _stdErr ),
+aborting( _aborting )
+{}
+virtual ~TestCaseStats();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+TestCaseStats( TestCaseStats const& )              = default;
+TestCaseStats( TestCaseStats && )                  = default;
+TestCaseStats& operator = ( TestCaseStats const& ) = default;
+TestCaseStats& operator = ( TestCaseStats && )     = default;
+#  endif
+TestCaseInfo testInfo;
+Totals totals;
+std::string stdOut;
+std::string stdErr;
+bool aborting;
+};
+struct TestGroupStats {
+TestGroupStats( GroupInfo const& _groupInfo,
+Totals const& _totals,
+bool _aborting )
+:   groupInfo( _groupInfo ),
+totals( _totals ),
+aborting( _aborting )
+{}
+TestGroupStats( GroupInfo const& _groupInfo )
+:   groupInfo( _groupInfo ),
+aborting( false )
+{}
+virtual ~TestGroupStats();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+TestGroupStats( TestGroupStats const& )              = default;
+TestGroupStats( TestGroupStats && )                  = default;
+TestGroupStats& operator = ( TestGroupStats const& ) = default;
+TestGroupStats& operator = ( TestGroupStats && )     = default;
+#  endif
+GroupInfo groupInfo;
+Totals totals;
+bool aborting;
+};
+struct TestRunStats {
+TestRunStats(   TestRunInfo const& _runInfo,
+Totals const& _totals,
+bool _aborting )
+:   runInfo( _runInfo ),
+totals( _totals ),
+aborting( _aborting )
+{}
+virtual ~TestRunStats();
+#  ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS
+TestRunStats( TestRunStats const& _other )
+:   runInfo( _other.runInfo ),
+totals( _other.totals ),
+aborting( _other.aborting )
+{}
+#  else
+TestRunStats( TestRunStats const& )              = default;
+TestRunStats( TestRunStats && )                  = default;
+TestRunStats& operator = ( TestRunStats const& ) = default;
+TestRunStats& operator = ( TestRunStats && )     = default;
+#  endif
+TestRunInfo runInfo;
+Totals totals;
+bool aborting;
+};
+class MultipleReporters;
+struct IStreamingReporter : IShared {
+virtual ~IStreamingReporter();
+// Implementing class must also provide the following static method:
+// static std::string getDescription();
+virtual ReporterPreferences getPreferences() const = 0;
+virtual void noMatchingTestCases( std::string const& spec ) = 0;
+virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+// 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; }
+};
+struct IReporterFactory : IShared {
+virtual ~IReporterFactory();
+virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0;
+virtual std::string getDescription() const = 0;
+};
+struct IReporterRegistry {
+typedef std::map<std::string, Ptr<IReporterFactory> > FactoryMap;
+typedef std::vector<Ptr<IReporterFactory> > Listeners;
+virtual ~IReporterRegistry();
+virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const = 0;
+virtual FactoryMap const& getFactories() const = 0;
+virtual Listeners const& getListeners() const = 0;
+};
+Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter );
+}
+#include <limits>
+#include <algorithm>
+namespace Catch {
+inline std::size_t listTests( Config const& config ) {
+TestSpec testSpec = config.testSpec();
+if( config.testSpec().hasFilters() )
+Catch::cout() << "Matching test cases:\n";
+else {
+Catch::cout() << "All available test cases:\n";
+testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+}
+std::size_t matchedTests = 0;
+TextAttributes nameAttr, tagsAttr;
+nameAttr.setInitialIndent( 2 ).setIndent( 4 );
+tagsAttr.setIndent( 6 );
+std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+it != itEnd;
+++it ) {
+matchedTests++;
+TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
+Colour::Code colour = testCaseInfo.isHidden()
+? Colour::SecondaryText
+: Colour::None;
+Colour colourGuard( colour );
+Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl;
+if( !testCaseInfo.tags.empty() )
+Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl;
+}
+if( !config.testSpec().hasFilters() )
+Catch::cout() << pluralise( matchedTests, "test case" ) << "\n" << std::endl;
+else
+Catch::cout() << pluralise( matchedTests, "matching test case" ) << "\n" << std::endl;
+return matchedTests;
+}
+inline std::size_t listTestsNamesOnly( Config const& config ) {
+TestSpec testSpec = config.testSpec();
+if( !config.testSpec().hasFilters() )
+testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+std::size_t matchedTests = 0;
+std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+it != itEnd;
+++it ) {
+matchedTests++;
+TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
+Catch::cout() << testCaseInfo.name << std::endl;
+}
+return matchedTests;
+}
+struct TagInfo {
+TagInfo() : count ( 0 ) {}
+void add( std::string const& spelling ) {
+++count;
+spellings.insert( spelling );
+}
+std::string all() const {
+std::string out;
+for( std::set<std::string>::const_iterator it = spellings.begin(), itEnd = spellings.end();
+it != itEnd;
+++it )
+out += "[" + *it + "]";
+return out;
+}
+std::set<std::string> spellings;
+std::size_t count;
+};
+inline std::size_t listTags( Config const& config ) {
+TestSpec testSpec = config.testSpec();
+if( config.testSpec().hasFilters() )
+Catch::cout() << "Tags for matching test cases:\n";
+else {
+Catch::cout() << "All available tags:\n";
+testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+}
+std::map<std::string, TagInfo> tagCounts;
+std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+it != itEnd;
+++it ) {
+for( std::set<std::string>::const_iterator  tagIt = it->getTestCaseInfo().tags.begin(),
+tagItEnd = it->getTestCaseInfo().tags.end();
+tagIt != tagItEnd;
+++tagIt ) {
+std::string tagName = *tagIt;
+std::string lcaseTagName = toLower( tagName );
+std::map<std::string, TagInfo>::iterator countIt = tagCounts.find( lcaseTagName );
+if( countIt == tagCounts.end() )
+countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+countIt->second.add( tagName );
+}
+}
+for( std::map<std::string, TagInfo>::const_iterator countIt = tagCounts.begin(),
+countItEnd = tagCounts.end();
+countIt != countItEnd;
+++countIt ) {
+std::ostringstream oss;
+oss << "  " << std::setw(2) << countIt->second.count << "  ";
+Text wrapper( countIt->second.all(), TextAttributes()
+.setInitialIndent( 0 )
+.setIndent( oss.str().size() )
+.setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) );
+Catch::cout() << oss.str() << wrapper << "\n";
+}
+Catch::cout() << pluralise( tagCounts.size(), "tag" ) << "\n" << std::endl;
+return tagCounts.size();
+}
+inline std::size_t listReporters( Config const& /*config*/ ) {
+Catch::cout() << "Available reporters:\n";
+IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it;
+std::size_t maxNameLen = 0;
+for(it = itBegin; it != itEnd; ++it )
+maxNameLen = (std::max)( maxNameLen, it->first.size() );
+for(it = itBegin; it != itEnd; ++it ) {
+Text wrapper( it->second->getDescription(), TextAttributes()
+.setInitialIndent( 0 )
+.setIndent( 7+maxNameLen )
+.setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) );
+Catch::cout() << "  "
+<< it->first
+<< ":"
+<< std::string( maxNameLen - it->first.size() + 2, ' ' )
+<< wrapper << "\n";
+}
+Catch::cout() << std::endl;
+return factories.size();
+}
+inline Option<std::size_t> list( Config const& config ) {
+Option<std::size_t> listedCount;
+if( config.listTests() )
+listedCount = listedCount.valueOr(0) + listTests( config );
+if( config.listTestNamesOnly() )
+listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
+if( config.listTags() )
+listedCount = listedCount.valueOr(0) + listTags( config );
+if( config.listReporters() )
+listedCount = listedCount.valueOr(0) + listReporters( config );
+return listedCount;
+}
 } // end namespace Catch
-// #included from: catch_running_test.hpp
+// #included from: internal/catch_run_context.hpp
+#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
-// #included from: catch_section_info.hpp
+// #included from: catch_test_case_tracker.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
 #include <map>
 #include <string>
+#include <assert.h>
+#include <vector>
 namespace Catch {
+namespace TestCaseTracking {
-class SectionInfo {
+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;
+// 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:
-enum Status {
+static TrackerContext& instance() {
-Root,
+static TrackerContext s_instance;
-Unknown,
+return s_instance;
-Branch,
+}
-TestedBranch,
-TestedLeaf
+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;
+}
+void completeCycle() {
+m_runState = CompletedCycle;
+}
+bool completedCycle() const {
+return m_runState == CompletedCycle;
+}
+ITracker& currentTracker() {
+return *m_currentTracker;
+}
+void setCurrentTracker( ITracker* tracker ) {
+m_currentTracker = tracker;
+}
+};
+class TrackerBase : public ITracker {
+protected:
+enum CycleState {
+NotStarted,
+Executing,
+ExecutingChildren,
+NeedsAnotherRun,
+CompletedSuccessfully,
+Failed
 };
+class TrackerHasName {
-SectionInfo( SectionInfo* parent )
+std::string m_name;
-:   m_status( Unknown ),
+public:
-m_parent( parent )
+TrackerHasName( std::string const& name ) : m_name( name ) {}
+bool operator ()( Ptr<ITracker> const& tracker ) {
+return tracker->name() == m_name;
+}
+};
+typedef std::vector<Ptr<ITracker> > Children;
+std::string m_name;
+TrackerContext& m_ctx;
+ITracker* m_parent;
+Children m_children;
+CycleState m_runState;
+public:
+TrackerBase( std::string const& name, TrackerContext& ctx, ITracker* parent )
+:   m_name( name ),
+m_ctx( ctx ),
+m_parent( parent ),
+m_runState( NotStarted )
 {}
+virtual ~TrackerBase();
-SectionInfo()
-:   m_status( Root ),
+virtual std::string name() const CATCH_OVERRIDE {
-m_parent( NULL )
+return m_name;
+}
+virtual bool isComplete() const CATCH_OVERRIDE {
+return m_runState == CompletedSuccessfully || m_runState == Failed;
+}
+virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE {
+return m_runState == CompletedSuccessfully;
+}
+virtual bool isOpen() const CATCH_OVERRIDE {
+return m_runState != NotStarted && !isComplete();
+}
+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() )
+? it->get()
+: CATCH_NULL;
+}
+virtual ITracker& parent() CATCH_OVERRIDE {
+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;
+if( m_parent )
+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;
+case ExecutingChildren:
+if( m_children.empty() || m_children.back()->isComplete() )
+m_runState = CompletedSuccessfully;
+break;
+default:
+throw std::logic_error( "Unexpected state" );
+}
+moveToParent();
+m_ctx.completeCycle();
+}
+virtual void fail() CATCH_OVERRIDE {
+m_runState = Failed;
+if( m_parent )
+m_parent->markAsNeedingAnotherRun();
+moveToParent();
+m_ctx.completeCycle();
+}
+virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE {
+m_runState = NeedsAnotherRun;
+}
+private:
+void moveToParent() {
+assert( m_parent );
+m_ctx.setCurrentTracker( m_parent );
+}
+void moveToThis() {
+m_ctx.setCurrentTracker( this );
+}
+};
+class SectionTracker : public TrackerBase {
+public:
+SectionTracker( std::string const& name, TrackerContext& ctx, ITracker* parent )
+:   TrackerBase( name, ctx, parent )
 {}
+virtual ~SectionTracker();
-~SectionInfo() {
-deleteAllValues( m_subSections );
+virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; }
-}
+static SectionTracker& acquire( TrackerContext& ctx, std::string const& name ) {
-bool shouldRun() const {
+SectionTracker* section = CATCH_NULL;
-return m_status < TestedBranch;
-}
+ITracker& currentTracker = ctx.currentTracker();
+if( ITracker* childTracker = currentTracker.findChild( name ) ) {
-bool ran() {
+assert( childTracker );
-if( m_status < Branch ) {
+assert( childTracker->isSectionTracker() );
-m_status = TestedLeaf;
+section = static_cast<SectionTracker*>( childTracker );
-return true;
+}
-}
+else {
-return false;
+section = new SectionTracker( name, ctx, &currentTracker );
-}
+currentTracker.addChild( section );
+}
-void ranToCompletion() {
+if( !ctx.completedCycle() && !section->isComplete() ) {
-if( m_status == Branch && !hasUntestedSections() )
-m_status = TestedBranch;
+section->open();
 }
+return *section;
-SectionInfo* findSubSection( const std::string& name ) {
+}
-std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.find( name );
+};
-return it != m_subSections.end()
-? it->second
+class IndexTracker : public TrackerBase {
-: NULL;
+int m_size;
-}
+int m_index;
+public:
-SectionInfo* addSubSection( const std::string& name ) {
+IndexTracker( std::string const& name, TrackerContext& ctx, ITracker* parent, int size )
-SectionInfo* subSection = new SectionInfo( this );
+:   TrackerBase( name, ctx, parent ),
-m_subSections.insert( std::make_pair( name, subSection ) );
+m_size( size ),
-m_status = Branch;
+m_index( -1 )
-return subSection;
+{}
-}
+virtual ~IndexTracker();
-SectionInfo* getParent() {
+virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; }
-return m_parent;
-}
+static IndexTracker& acquire( TrackerContext& ctx, std::string const& name, int size ) {
+IndexTracker* tracker = CATCH_NULL;
-bool hasUntestedSections() const {
-if( m_status == Unknown )
+ITracker& currentTracker = ctx.currentTracker();
-return true;
+if( ITracker* childTracker = currentTracker.findChild( name ) ) {
+assert( childTracker );
-std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.begin();
+assert( childTracker->isIndexTracker() );
-std::map<std::string, SectionInfo*>::const_iterator itEnd = m_subSections.end();
+tracker = static_cast<IndexTracker*>( childTracker );
-for(; it != itEnd; ++it ) {
+}
-if( it->second->hasUntestedSections() )
+else {
-return true;
+tracker = new IndexTracker( name, ctx, &currentTracker, size );
-}
+currentTracker.addChild( tracker );
-return false;
+}
-}
+if( !ctx.completedCycle() && !tracker->isComplete() ) {
-private:
+if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
-Status m_status;
+tracker->moveNext();
-std::map<std::string, SectionInfo*> m_subSections;
+tracker->open();
-SectionInfo* m_parent;
+}
-};
-}
+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;
+using TestCaseTracking::IndexTracker;
+} // namespace Catch
+// #included from: catch_fatal_condition.hpp
+#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
 namespace Catch {
-class RunningTest {
+// Report the error condition then exit the process
+inline void fatal( std::string const& message, int exitCode ) {
-enum RunStatus {
+IContext& context = Catch::getCurrentContext();
-NothingRun,
+IResultCapture* resultCapture = context.getResultCapture();
-EncounteredASection,
+resultCapture->handleFatalErrorCondition( message );
-RanAtLeastOneSection,
-RanToCompletionWithSections,
+		if( Catch::alwaysTrue() ) // avoids "no return" warnings
-RanToCompletionWithNoSections
+exit( exitCode );
+}
+} // namespace Catch
+#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
+namespace Catch {
+struct FatalConditionHandler {
+		void reset() {}
+	};
+} // namespace Catch
+#else // Not Windows - assumed to be POSIX compatible //////////////////////////
+#include <signal.h>
+namespace Catch {
+struct SignalDefs { int id; const char* name; };
+extern SignalDefs signalDefs[];
+SignalDefs signalDefs[] = {
+{ SIGINT,  "SIGINT - Terminal interrupt signal" },
+{ SIGILL,  "SIGILL - Illegal instruction signal" },
+{ SIGFPE,  "SIGFPE - Floating point error signal" },
+{ SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+{ SIGTERM, "SIGTERM - Termination request signal" },
+{ SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
 };
-public:
+struct FatalConditionHandler {
-explicit RunningTest( const TestCaseInfo* info = NULL )
-:   m_info( info ),
+static void handleSignal( int sig ) {
-m_runStatus( RanAtLeastOneSection ),
+for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-m_currentSection( &m_rootSection ),
+if( sig == signalDefs[i].id )
-m_changed( false )
+fatal( signalDefs[i].name, -sig );
-{}
+fatal( "<unknown signal>", -sig );
+}
-bool wasSectionSeen() const {
-return  m_runStatus == RanAtLeastOneSection ||
+FatalConditionHandler() : m_isSet( true ) {
-m_runStatus == RanToCompletionWithSections;
+for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-}
+signal( signalDefs[i].id, handleSignal );
+}
+~FatalConditionHandler() {
+reset();
+}
 void reset() {
-m_runStatus = NothingRun;
+if( m_isSet ) {
-m_changed = false;
+for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i )
-m_lastSectionToRun = NULL;
+signal( signalDefs[i].id, SIG_DFL );
-}
+m_isSet = false;
+}
-void ranToCompletion() {
+}
-if( m_runStatus == RanAtLeastOneSection ||
-m_runStatus == EncounteredASection ) {
+bool m_isSet;
-m_runStatus = RanToCompletionWithSections;
+};
-if( m_lastSectionToRun ) {
-m_lastSectionToRun->ranToCompletion();
+} // namespace Catch
-m_changed = true;
-}
+#endif // not Windows
-}
-else {
-m_runStatus = RanToCompletionWithNoSections;
-}
-}
-bool addSection( const std::string& name ) {
-if( m_runStatus == NothingRun )
-m_runStatus = EncounteredASection;
-SectionInfo* thisSection = m_currentSection->findSubSection( name );
-if( !thisSection ) {
-thisSection = m_currentSection->addSubSection( name );
-m_changed = true;
-}
-if( !wasSectionSeen() && thisSection->shouldRun() ) {
-m_currentSection = thisSection;
-m_lastSectionToRun = NULL;
-return true;
-}
-return false;
-}
-void endSection( const std::string& ) {
-if( m_currentSection->ran() ) {
-m_runStatus = RanAtLeastOneSection;
-m_changed = true;
-}
-else if( m_runStatus == EncounteredASection ) {
-m_runStatus = RanAtLeastOneSection;
-m_lastSectionToRun = m_currentSection;
-}
-m_currentSection = m_currentSection->getParent();
-}
-const TestCaseInfo& getTestCaseInfo() const {
-return *m_info;
-}
-bool hasUntestedSections() const {
-return  m_runStatus == RanAtLeastOneSection ||
-( m_rootSection.hasUntestedSections() && m_changed );
-}
-private:
-const TestCaseInfo* m_info;
-RunStatus m_runStatus;
-SectionInfo m_rootSection;
-SectionInfo* m_currentSection;
-SectionInfo* m_lastSectionToRun;
-bool m_changed;
-};
-}
 #include <set>
 #include <string>
 namespace Catch {
 std::string& m_targetString;
 };
 ///////////////////////////////////////////////////////////////////////////
-class Runner : public IResultCapture, public IRunner {
+class RunContext : public IResultCapture, public IRunner {
-Runner( const Runner& );
+RunContext( RunContext const& );
-void operator =( const Runner& );
+void operator =( RunContext const& );
 public:
-explicit Runner( Config& config )
+explicit RunContext( Ptr<IConfig const> const& _config, Ptr<IStreamingReporter> const& reporter )
-:   m_context( getCurrentMutableContext() ),
+:   m_runInfo( _config->name() ),
-m_runningTest( NULL ),
+m_context( getCurrentMutableContext() ),
-m_config( config ),
+m_activeTestCase( CATCH_NULL ),
-m_reporter( config.getReporter() ),
+m_config( _config ),
-m_prevRunner( &m_context.getRunner() ),
+m_reporter( reporter )
-m_prevResultCapture( &m_context.getResultCapture() )
 {
 m_context.setRunner( this );
-m_context.setConfig( &m_config );
+m_context.setConfig( m_config );
 m_context.setResultCapture( this );
-m_reporter->StartTesting();
+m_reporter->testRunStarting( m_runInfo );
 }
-~Runner() {
+virtual ~RunContext() {
-m_reporter->EndTesting( m_totals );
+m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
-m_context.setRunner( m_prevRunner );
+}
-m_context.setConfig( NULL );
-m_context.setResultCapture( m_prevResultCapture );
+void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) {
-}
+m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) );
+}
-virtual void runAll( bool runHiddenTests = false ) {
+void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) {
-const std::vector<TestCaseInfo>& allTests = getCurrentContext().getTestCaseRegistry().getAllTests();
+m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) );
-for( std::size_t i=0; i < allTests.size(); ++i ) {
+}
-if( runHiddenTests || !allTests[i].isHidden() )
-{
+Totals runTest( TestCase const& testCase ) {
-if( aborting() ) {
-m_reporter->Aborted();
-break;
-}
-runTest( allTests[i] );
-}
-}
-}
-virtual std::size_t runMatching( const std::string& rawTestSpec ) {
-TestSpec testSpec( rawTestSpec );
-const std::vector<TestCaseInfo>& allTests = getCurrentContext().getTestCaseRegistry().getAllTests();
-std::size_t testsRun = 0;
-for( std::size_t i=0; i < allTests.size(); ++i ) {
-if( testSpec.matches( allTests[i].getName() ) ) {
-if( aborting() ) {
-m_reporter->Aborted();
-break;
-}
-runTest( allTests[i] );
-testsRun++;
-}
-}
-return testsRun;
-}
-void runTest( const TestCaseInfo& testInfo ) {
 Totals prevTotals = m_totals;
 std::string redirectedCout;
 std::string redirectedCerr;
-m_reporter->StartTestCase( testInfo );
+TestCaseInfo testInfo = testCase.getTestCaseInfo();
-m_runningTest = new RunningTest( &testInfo );
+m_reporter->testCaseStarting( testInfo );
+m_activeTestCase = &testCase;
 do {
+m_trackerContext.startRun();
 do {
-//                    m_reporter->StartGroup( "test case run" );
+m_trackerContext.startCycle();
-m_currentResult.setLineInfo( m_runningTest->getTestCaseInfo().getLineInfo() );
+m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, testInfo.name );
 runCurrentTest( redirectedCout, redirectedCerr );
-//                    m_reporter->EndGroup( "test case run", m_totals.delta( prevTotals ) );
 }
-while( m_runningTest->hasUntestedSections() && !aborting() );
+while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() );
 }
+// !TBD: deprecated - this will be replaced by indexed trackers
 while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() );
-delete m_runningTest;
-m_runningTest = NULL;
 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->EndTestCase( testInfo, deltaTotals, redirectedCout, redirectedCerr );
+m_reporter->testCaseEnded( TestCaseStats(   testInfo,
-}
+deltaTotals,
+redirectedCout,
-virtual Totals getTotals() const {
+redirectedCerr,
-return m_totals;
+aborting() ) );
-}
+m_activeTestCase = CATCH_NULL;
-const Config& config() const {
+m_testCaseTracker = CATCH_NULL;
+return deltaTotals;
+}
+Ptr<IConfig const> config() const {
 return m_config;
 }
 private: // IResultCapture
-virtual ResultAction::Value acceptResult( bool result ) {
+virtual void assertionEnded( AssertionResult const& result ) {
-return acceptResult( result ? ResultWas::Ok : ResultWas::ExpressionFailed );
-}
-virtual ResultAction::Value acceptResult( ResultWas::OfType result ) {
-m_currentResult.setResultType( result );
-return actOnCurrentResult();
-}
-virtual ResultAction::Value acceptExpression( const ResultInfoBuilder& resultInfo ) {
-m_currentResult = resultInfo;
-return actOnCurrentResult();
-}
-virtual void acceptMessage( const std::string& msg ) {
-m_currentResult.setMessage( msg );
-}
-virtual void testEnded( const ResultInfo& result ) {
 if( result.getResultType() == ResultWas::Ok ) {
 m_totals.assertions.passed++;
 }
-else if( !result.ok() ) {
+else if( !result.isOk() ) {
 m_totals.assertions.failed++;
+}
-std::vector<ResultInfo>::const_iterator it = m_info.begin();
-std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+if( m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) ) )
-for(; it != itEnd; ++it )
+m_messages.clear();
-m_reporter->Result( *it );
-m_info.clear();
+// Reset working state
-}
+m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
+m_lastResult = result;
-if( result.getResultType() == ResultWas::Info )
-m_info.push_back( result );
-else
-m_reporter->Result( result );
 }
 virtual bool sectionStarted (
-const std::string& name,
+SectionInfo const& sectionInfo,
-const std::string& description,
-const SourceLineInfo& lineInfo,
 Counts& assertions
 )
 {
 std::ostringstream oss;
-oss << name << "@" << lineInfo;
+oss << sectionInfo.name << "@" << sectionInfo.lineInfo;
-if( !m_runningTest->addSection( oss.str() ) )
+ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, oss.str() );
+if( !sectionTracker.isOpen() )
 return false;
+m_activeSections.push_back( &sectionTracker );
-m_currentResult.setLineInfo( lineInfo );
-m_reporter->StartSection( name, description );
+m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+m_reporter->sectionStarting( sectionInfo );
 assertions = m_totals.assertions;
 return true;
 }
+bool testForMissingAssertions( Counts& assertions ) {
-virtual void sectionEnded( const std::string& name, const Counts& prevAssertions ) {
+if( assertions.total() != 0 )
-m_runningTest->endSection( name );
+return false;
-m_reporter->EndSection( name, m_totals.assertions - prevAssertions );
+if( !m_config->warnAboutMissingAssertions() )
-}
+return false;
+if( m_trackerContext.currentTracker().hasChildren() )
-virtual void pushScopedInfo( ScopedInfo* scopedInfo ) {
+return false;
-m_scopedInfos.push_back( scopedInfo );
+m_totals.assertions.failed++;
-}
+assertions.failed++;
+return true;
-virtual void popScopedInfo( ScopedInfo* scopedInfo ) {
+}
-if( m_scopedInfos.back() == scopedInfo )
-m_scopedInfos.pop_back();
+virtual void sectionEnded( SectionEndInfo const& endInfo ) {
-}
+Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+bool missingAssertions = testForMissingAssertions( assertions );
-virtual bool shouldDebugBreak() const {
-return m_config.shouldDebugBreak();
+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();
+}
+virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) {
+if( m_unfinishedSections.empty() )
+m_activeSections.back()->fail();
+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 );
+}
+virtual void popScopedMessage( MessageInfo const& message ) {
+m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() );
 }
 virtual std::string getCurrentTestName() const {
-return m_runningTest
+return m_activeTestCase
-? m_runningTest->getTestCaseInfo().getName()
+? m_activeTestCase->getTestCaseInfo().name
 : "";
 }
-virtual const ResultInfo* getLastResult() const {
+virtual const AssertionResult* getLastResult() const {
 return &m_lastResult;
 }
+virtual void handleFatalErrorCondition( std::string const& message ) {
+ResultBuilder resultBuilder = makeUnexpectedResultBuilder();
+resultBuilder.setResultType( ResultWas::FatalErrorCondition );
+resultBuilder << message;
+resultBuilder.captureExpression();
+handleUnfinishedSections();
+// Recreate section for test case (as we will lose the one that was in scope)
+TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
+Counts assertions;
+assertions.failed = 1;
+SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false );
+m_reporter->sectionEnded( testCaseSectionStats );
+TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo();
+Totals deltaTotals;
+deltaTotals.testCases.failed = 1;
+m_reporter->testCaseEnded( TestCaseStats(   testInfo,
+deltaTotals,
+"",
+"",
+false ) );
+m_totals.testCases.failed++;
+testGroupEnded( "", m_totals, 1, 1 );
+m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) );
+}
+public:
+// !TBD We need to do this another way!
+bool aborting() const {
+return m_totals.assertions.failed == static_cast<std::size_t>( m_config->abortAfter() );
+}
 private:
-bool aborting() const {
-return m_totals.assertions.failed == static_cast<std::size_t>( m_config.getCutoff() );
-}
-ResultAction::Value actOnCurrentResult() {
-testEnded( m_currentResult );
-m_lastResult = m_currentResult;
-m_currentResult = ResultInfoBuilder();
-ResultAction::Value action = ResultAction::None;
-if( !m_lastResult.ok() ) {
-action = ResultAction::Failed;
-if( shouldDebugBreak() )
-action = (ResultAction::Value)( action | ResultAction::Debug );
-if( aborting() )
-action = (ResultAction::Value)( action | ResultAction::Abort );
-}
-return action;
-}
 void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) {
+TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
+m_reporter->sectionStarting( testCaseSection );
+Counts prevAssertions = m_totals.assertions;
+double duration = 0;
 try {
-m_runningTest->reset();
+m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
-if( m_reporter->shouldRedirectStdout() ) {
-StreamRedirect coutRedir( std::cout, redirectedCout );
+seedRng( *m_config );
-StreamRedirect cerrRedir( std::cerr, redirectedCerr );
-m_runningTest->getTestCaseInfo().invoke();
+Timer timer;
+timer.start();
+if( m_reporter->getPreferences().shouldRedirectStdOut ) {
+StreamRedirect coutRedir( Catch::cout(), redirectedCout );
+StreamRedirect cerrRedir( Catch::cerr(), redirectedCerr );
+invokeActiveTestCase();
 }
 else {
-m_runningTest->getTestCaseInfo().invoke();
+invokeActiveTestCase();
 }
-m_runningTest->ranToCompletion();
+duration = timer.getElapsedSeconds();
 }
 catch( TestFailureException& ) {
 // This just means the test was aborted due to failure
 }
 catch(...) {
-acceptMessage( getCurrentContext().getExceptionTranslatorRegistry().translateActiveException() );
+makeUnexpectedResultBuilder().useActiveException();
-acceptResult( ResultWas::ThrewException );
+}
-}
+m_testCaseTracker->close();
-m_info.clear();
+handleUnfinishedSections();
+m_messages.clear();
+Counts assertions = m_totals.assertions - prevAssertions;
+bool missingAssertions = testForMissingAssertions( assertions );
+if( testCaseInfo.okToFail() ) {
+std::swap( assertions.failedButOk, assertions.failed );
+m_totals.assertions.failed -= assertions.failedButOk;
+m_totals.assertions.failedButOk += assertions.failedButOk;
+}
+SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions );
+m_reporter->sectionEnded( testCaseSectionStats );
+}
+void invokeActiveTestCase() {
+FatalConditionHandler fatalConditionHandler; // Handle signals
+m_activeTestCase->invoke();
+fatalConditionHandler.reset();
 }
 private:
+ResultBuilder makeUnexpectedResultBuilder() const {
+return ResultBuilder(   m_lastAssertionInfo.macroName.c_str(),
+m_lastAssertionInfo.lineInfo,
+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.
+for( std::vector<SectionEndInfo>::const_reverse_iterator it = m_unfinishedSections.rbegin(),
+itEnd = m_unfinishedSections.rend();
+it != itEnd;
+++it )
+sectionEnded( *it );
+m_unfinishedSections.clear();
+}
+TestRunInfo m_runInfo;
 IMutableContext& m_context;
-RunningTest* m_runningTest;
+TestCase const* m_activeTestCase;
-ResultInfoBuilder m_currentResult;
+ITracker* m_testCaseTracker;
-ResultInfo m_lastResult;
+ITracker* m_currentSectionTracker;
+AssertionResult m_lastResult;
-const Config& m_config;
+Ptr<IConfig const> m_config;
 Totals m_totals;
-Ptr<IReporter> m_reporter;
+Ptr<IStreamingReporter> m_reporter;
-std::vector<ScopedInfo*> m_scopedInfos;
+std::vector<MessageInfo> m_messages;
-std::vector<ResultInfo> m_info;
+AssertionInfo m_lastAssertionInfo;
-IRunner* m_prevRunner;
+std::vector<SectionEndInfo> m_unfinishedSections;
-IResultCapture* m_prevResultCapture;
+std::vector<ITracker*> m_activeSections;
-};
+TrackerContext m_trackerContext;
+};
+IResultCapture& getResultCapture() {
+if( IResultCapture* capture = getCurrentContext().getResultCapture() )
+return *capture;
+else
+throw std::logic_error( "No result capture instance" );
+}
 } // end namespace Catch
-// #included from: catch_generators_impl.hpp
+// #included from: internal/catch_version.h
+#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
+namespace Catch {
+// Versioning information
+struct Version {
+Version(    unsigned int _majorVersion,
+unsigned int _minorVersion,
+unsigned int _patchNumber,
+std::string const& _branchName,
+unsigned int _buildNumber );
+unsigned int const majorVersion;
+unsigned int const minorVersion;
+unsigned int const patchNumber;
+// buildNumber is only used if branchName is not null
+std::string const branchName;
+unsigned int const buildNumber;
+friend std::ostream& operator << ( std::ostream& os, Version const& version );
+private:
+void operator=( Version const& );
+};
+extern Version libraryVersion;
+}
+#include <fstream>
+#include <stdlib.h>
+#include <limits>
+namespace Catch {
+Ptr<IStreamingReporter> createReporter( std::string const& reporterName, Ptr<Config> const& config ) {
+Ptr<IStreamingReporter> reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() );
+if( !reporter ) {
+std::ostringstream oss;
+oss << "No reporter registered with name: '" << reporterName << "'";
+throw std::domain_error( oss.str() );
+}
+return reporter;
+}
+Ptr<IStreamingReporter> makeReporter( Ptr<Config> const& config ) {
+std::vector<std::string> reporters = config->getReporterNames();
+if( reporters.empty() )
+reporters.push_back( "console" );
+Ptr<IStreamingReporter> reporter;
+for( std::vector<std::string>::const_iterator it = reporters.begin(), itEnd = reporters.end();
+it != itEnd;
+++it )
+reporter = addReporter( reporter, createReporter( *it, config ) );
+return reporter;
+}
+Ptr<IStreamingReporter> addListeners( Ptr<IConfig const> const& config, Ptr<IStreamingReporter> reporters ) {
+IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners();
+for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end();
+it != itEnd;
+++it )
+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;
+context.testGroupStarting( config->name(), 1, 1 );
+TestSpec testSpec = config->testSpec();
+if( !testSpec.hasFilters() )
+testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests
+std::vector<TestCase> const& allTestCases = getAllTestCasesSorted( *iconfig );
+for( std::vector<TestCase>::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end();
+it != itEnd;
+++it ) {
+if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) )
+totals += context.runTest( *it );
+else
+reporter->skipTest( *it );
+}
+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 )
+filename = filename.substr( lastSlash+1 );
+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 );
+}
+}
+class Session : NonCopyable {
+static bool alreadyInstantiated;
+public:
+struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; };
+Session()
+: m_cli( makeCommandLineParser() ) {
+if( alreadyInstantiated ) {
+std::string msg = "Only one instance of Catch::Session can ever be used";
+Catch::cerr() << msg << std::endl;
+throw std::logic_error( msg );
+}
+alreadyInstantiated = true;
+}
+~Session() {
+Catch::cleanUp();
+}
+void showHelp( std::string const& processName ) {
+Catch::cout() << "\nCatch v" << libraryVersion << "\n";
+m_cli.usage( Catch::cout(), processName );
+Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
+}
+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( Clara::argsToVector( argc, argv ), m_configData );
+if( m_configData.showHelp )
+showHelp( m_configData.processName );
+m_config.reset();
+}
+catch( std::exception& ex ) {
+{
+Colour colourGuard( Colour::Red );
+Catch::cerr()
+<< "\nError(s) in input:\n"
+<< Text( ex.what(), TextAttributes().setIndent(2) )
+<< "\n\n";
+}
+m_cli.usage( Catch::cout(), m_configData.processName );
+return (std::numeric_limits<int>::max)();
+}
+return 0;
+}
+void useConfigData( ConfigData const& _configData ) {
+m_configData = _configData;
+m_config.reset();
+}
+int run( int argc, char const* const* const argv ) {
+int returnCode = applyCommandLine( argc, argv );
+if( returnCode == 0 )
+returnCode = run();
+return returnCode;
+}
+int run() {
+if( m_configData.showHelp )
+return 0;
+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 );
+return static_cast<int>( runTests( m_config ).assertions.failed );
+}
+catch( std::exception& ex ) {
+Catch::cerr() << ex.what() << std::endl;
+return (std::numeric_limits<int>::max)();
+}
+}
+Clara::CommandLine<ConfigData> const& cli() const {
+return m_cli;
+}
+std::vector<Clara::Parser::Token> const& unusedTokens() const {
+return m_unusedTokens;
+}
+ConfigData& configData() {
+return m_configData;
+}
+Config& config() {
+if( !m_config )
+m_config = new Config( m_configData );
+return *m_config;
+}
+private:
+Clara::CommandLine<ConfigData> m_cli;
+std::vector<Clara::Parser::Token> m_unusedTokens;
+ConfigData m_configData;
+Ptr<Config> m_config;
+};
+bool Session::alreadyInstantiated = false;
+} // end namespace Catch
+// #included from: catch_registry_hub.hpp
+#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED
+// #included from: catch_test_case_registry_impl.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 #include <vector>
-#include <string>
+#include <set>
+#include <sstream>
+#include <iostream>
+#include <algorithm>
+#ifdef CATCH_CPP14_OR_GREATER
+#include <random>
+#endif
+namespace Catch {
+struct RandomNumberGenerator {
+typedef int result_type;
+result_type operator()( result_type n ) const { return std::rand() % n; }
+#ifdef CATCH_CPP14_OR_GREATER
+static constexpr result_type min() { return 0; }
+static constexpr result_type max() { return 1000000; }
+result_type operator()() const { return std::rand() % max(); }
+#endif
+template<typename V>
+static void shuffle( V& vector ) {
+RandomNumberGenerator rng;
+#ifdef CATCH_CPP14_OR_GREATER
+std::shuffle( vector.begin(), vector.end(), rng );
+#else
+std::random_shuffle( vector.begin(), vector.end(), rng );
+#endif
+}
+};
+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() );
+break;
+case RunTests::InRandomOrder:
+{
+seedRng( config );
+RandomNumberGenerator::shuffle( sorted );
+}
+break;
+case RunTests::InDeclarationOrder:
+// already in declaration order
+break;
+}
+return sorted;
+}
+bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+}
+void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+std::set<TestCase> seenFunctions;
+for( std::vector<TestCase>::const_iterator it = functions.begin(), itEnd = functions.end();
+it != itEnd;
+++it ) {
+std::pair<std::set<TestCase>::const_iterator, bool> prev = seenFunctions.insert( *it );
+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() );
+for( std::vector<TestCase>::const_iterator it = testCases.begin(), itEnd = testCases.end();
+it != itEnd;
+++it )
+if( matchTest( *it, testSpec, config ) )
+filtered.push_back( *it );
+return filtered;
+}
+std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+}
+class TestRegistry : public ITestCaseRegistry {
+public:
+TestRegistry()
+:   m_currentSortOrder( RunTests::InDeclarationOrder ),
+m_unnamedCount( 0 )
+{}
+virtual ~TestRegistry();
+virtual void registerTest( TestCase const& testCase ) {
+std::string name = testCase.getTestCaseInfo().name;
+if( name == "" ) {
+std::ostringstream oss;
+oss << "Anonymous test case " << ++m_unnamedCount;
+return registerTest( testCase.withName( oss.str() ) );
+}
+m_functions.push_back( testCase );
+}
+virtual std::vector<TestCase> const& getAllTests() const {
+return m_functions;
+}
+virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const {
+if( m_sortedFunctions.empty() )
+enforceNoDuplicateTestCases( m_functions );
+if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+m_sortedFunctions = sortTests( config, m_functions );
+m_currentSortOrder = config.runOrder();
+}
+return m_sortedFunctions;
+}
+private:
+std::vector<TestCase> m_functions;
+mutable RunTests::InWhatOrder m_currentSortOrder;
+mutable std::vector<TestCase> m_sortedFunctions;
+size_t m_unnamedCount;
+std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+};
+///////////////////////////////////////////////////////////////////////////
+class FreeFunctionTestCase : public SharedImpl<ITestCase> {
+public:
+FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {}
+virtual void invoke() const {
+m_fun();
+}
+private:
+virtual ~FreeFunctionTestCase();
+TestFunction m_fun;
+};
+inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) {
+std::string className = classOrQualifiedMethodName;
+if( startsWith( className, "&" ) )
+{
+std::size_t lastColons = className.rfind( "::" );
+std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+if( penultimateColons == std::string::npos )
+penultimateColons = 1;
+className = className.substr( penultimateColons, lastColons-penultimateColons );
+}
+return className;
+}
+void registerTestCase
+(   ITestCase* testCase,
+char const* classOrQualifiedMethodName,
+NameAndDesc const& nameAndDesc,
+SourceLineInfo const& lineInfo ) {
+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
+(   TestFunction function,
+SourceLineInfo const& lineInfo,
+NameAndDesc const& nameAndDesc ) {
+registerTestCaseFunction( function, lineInfo, nameAndDesc );
+}
+AutoReg::~AutoReg() {}
+} // end namespace Catch
+// #included from: catch_reporter_registry.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED
 #include <map>
 namespace Catch {
-struct GeneratorInfo {
+class ReporterRegistry : public IReporterRegistry {
-GeneratorInfo( std::size_t size )
-:   m_size( size ),
-m_currentIndex( 0 )
-{}
-bool moveNext() {
-if( ++m_currentIndex == m_size ) {
-m_currentIndex = 0;
-return false;
-}
-return true;
-}
-std::size_t getCurrentIndex() const {
-return m_currentIndex;
-}
-std::size_t m_size;
-std::size_t m_currentIndex;
-};
-///////////////////////////////////////////////////////////////////////////
-class GeneratorsForTest {
 public:
-~GeneratorsForTest() {
-deleteAll( m_generatorsInOrder );
+virtual ~ReporterRegistry() CATCH_OVERRIDE {}
-}
+virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const CATCH_OVERRIDE {
-GeneratorInfo& getGeneratorInfo( const std::string& fileInfo, std::size_t size ) {
+FactoryMap::const_iterator it =  m_factories.find( name );
-std::map<std::string, GeneratorInfo*>::const_iterator it = m_generatorsByName.find( fileInfo );
+if( it == m_factories.end() )
-if( it == m_generatorsByName.end() ) {
+return CATCH_NULL;
-GeneratorInfo* info = new GeneratorInfo( size );
+return it->second->create( ReporterConfig( config ) );
-m_generatorsByName.insert( std::make_pair( fileInfo, info ) );
+}
-m_generatorsInOrder.push_back( info );
-return *info;
+void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) {
-}
+m_factories.insert( std::make_pair( name, factory ) );
-return *it->second;
+}
-}
+void registerListener( Ptr<IReporterFactory> const& factory ) {
+m_listeners.push_back( factory );
-bool moveNext() {
+}
-std::vector<GeneratorInfo*>::const_iterator it = m_generatorsInOrder.begin();
-std::vector<GeneratorInfo*>::const_iterator itEnd = m_generatorsInOrder.end();
+virtual FactoryMap const& getFactories() const CATCH_OVERRIDE {
-for(; it != itEnd; ++it ) {
+return m_factories;
-if( (*it)->moveNext() )
+}
-return true;
+virtual Listeners const& getListeners() const CATCH_OVERRIDE {
-}
+return m_listeners;
-return false;
 }
 private:
-std::map<std::string, GeneratorInfo*> m_generatorsByName;
+FactoryMap m_factories;
-std::vector<GeneratorInfo*> m_generatorsInOrder;
+Listeners m_listeners;
 };
+}
-} // end namespace Catch
-#define INTERNAL_CATCH_LINESTR2( line ) #line
-#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line )
-#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
-// #included from: catch_console_colour_impl.hpp
-// #included from: catch_console_colour.hpp
-namespace Catch {
-struct ConsoleColourImpl;
-class TextColour : NonCopyable {
-public:
-enum Colours {
-None,
-FileName,
-ResultError,
-ResultSuccess,
-Error,
-Success,
-OriginalExpression,
-ReconstructedExpression
-};
-TextColour( Colours colour = None );
-void set( Colours colour );
-~TextColour();
-private:
-ConsoleColourImpl* m_impl;
-};
-} // end namespace Catch
-#ifdef CATCH_PLATFORM_WINDOWS
-#include <windows.h>
-namespace Catch {
-namespace {
-WORD mapConsoleColour( TextColour::Colours colour ) {
-switch( colour ) {
-case TextColour::FileName:
-return FOREGROUND_INTENSITY;                    // greyed out
-case TextColour::ResultError:
-return FOREGROUND_RED | FOREGROUND_INTENSITY;   // bright red
-case TextColour::ResultSuccess:
-return FOREGROUND_GREEN | FOREGROUND_INTENSITY; // bright green
-case TextColour::Error:
-return FOREGROUND_RED;                          // dark red
-case TextColour::Success:
-return FOREGROUND_GREEN;                        // dark green
-case TextColour::OriginalExpression:
-return FOREGROUND_BLUE | FOREGROUND_GREEN;      // turquoise
-case TextColour::ReconstructedExpression:
-return FOREGROUND_RED | FOREGROUND_GREEN;       // greeny-yellow
-default: return 0;
-}
-}
-}
-struct ConsoleColourImpl {
-ConsoleColourImpl()
-:   hStdout( GetStdHandle(STD_OUTPUT_HANDLE) ),
-wOldColorAttrs( 0 )
-{
-GetConsoleScreenBufferInfo( hStdout, &csbiInfo );
-wOldColorAttrs = csbiInfo.wAttributes;
-}
-~ConsoleColourImpl() {
-SetConsoleTextAttribute( hStdout, wOldColorAttrs );
-}
-void set( TextColour::Colours colour ) {
-WORD consoleColour = mapConsoleColour( colour );
-if( consoleColour > 0 )
-SetConsoleTextAttribute( hStdout, consoleColour );
-}
-HANDLE hStdout;
-CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-WORD wOldColorAttrs;
-};
-TextColour::TextColour( Colours colour )
-: m_impl( new ConsoleColourImpl() )
-{
-if( colour )
-m_impl->set( colour );
-}
-TextColour::~TextColour() {
-delete m_impl;
-}
-void TextColour::set( Colours colour ) {
-m_impl->set( colour );
-}
-} // end namespace Catch
-#else
-namespace Catch {
-TextColour::TextColour( Colours ){}
-TextColour::~TextColour(){}
-void TextColour::set( Colours ){}
-} // end namespace Catch
-#endif
 // #included from: catch_exception_translator_registry.hpp
+#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 #ifdef __OBJC__
 #import "Foundation/Foundation.h"
 #endif
 namespace Catch {
 class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+public:
 ~ExceptionTranslatorRegistry() {
 deleteAll( m_translators );
 }
-virtual void registerTranslator( IExceptionTranslator* translator ) {
+virtual void registerTranslator( const IExceptionTranslator* translator ) {
 m_translators.push_back( translator );
 }
 virtual std::string translateActiveException() const {
 try {
 #ifdef __OBJC__
 // In Objective-C try objective-c exceptions first
 @try {
-throw;
+return tryTranslators();
 }
 @catch (NSException *exception) {
-return toString( [exception description] );
+return Catch::toString( [exception description] );
 }
 #else
+return tryTranslators();
+#endif
+}
+catch( TestFailureException& ) {
 throw;
-#endif
 }
 catch( std::exception& ex ) {
 return ex.what();
 }
 catch( std::string& msg ) {
 }
 catch( const char* msg ) {
 return msg;
 }
 catch(...) {
-return tryTranslators( m_translators.begin() );
-}
-}
-std::string tryTranslators( std::vector<IExceptionTranslator*>::const_iterator it ) const {
-if( it == m_translators.end() )
 return "Unknown exception";
+}
-try {
+}
-return (*it)->translate();
-}
+std::string tryTranslators() const {
-catch(...) {
+if( m_translators.empty() )
-return tryTranslators( it+1 );
+throw;
-}
+else
+return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
 }
 private:
-std::vector<IExceptionTranslator*> m_translators;
+std::vector<const IExceptionTranslator*> m_translators;
 };
 }
-// #included from: catch_reporter_registry.hpp
-#include <map>
 namespace Catch {
-class ReporterRegistry : public IReporterRegistry {
+namespace {
-public:
+class RegistryHub : public IRegistryHub, public IMutableRegistryHub {
-~ReporterRegistry() {
+RegistryHub( RegistryHub const& );
-deleteAllValues( m_factories );
+void operator=( RegistryHub const& );
-}
+public: // IRegistryHub
-virtual IReporter* create( const std::string& name, const IReporterConfig& config ) const {
+RegistryHub() {
-FactoryMap::const_iterator it =  m_factories.find( name );
+}
-if( it == m_factories.end() )
+virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE {
-return NULL;
+return m_reporterRegistry;
-return it->second->create( config );
+}
-}
+virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE {
+return m_testCaseRegistry;
-void registerReporter( const std::string& name, IReporterFactory* factory ) {
+}
-m_factories.insert( std::make_pair( name, factory ) );
+virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE {
-}
+return m_exceptionTranslatorRegistry;
+}
-const FactoryMap& getFactories() const {
-return m_factories;
+public: // IMutableRegistryHub
-}
+virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
+m_reporterRegistry.registerReporter( name, factory );
-private:
+}
-FactoryMap m_factories;
+virtual void registerListener( Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
-};
+m_reporterRegistry.registerListener( factory );
 }
+virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE {
+m_testCaseRegistry.registerTest( testInfo );
+}
+virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE {
+m_exceptionTranslatorRegistry.registerTranslator( translator );
+}
+private:
+TestRegistry m_testCaseRegistry;
+ReporterRegistry m_reporterRegistry;
+ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+};
+// Single, global, instance
+inline RegistryHub*& getTheRegistryHub() {
+static RegistryHub* theRegistryHub = CATCH_NULL;
+if( !theRegistryHub )
+theRegistryHub = new RegistryHub();
+return theRegistryHub;
+}
+}
+IRegistryHub& getRegistryHub() {
+return *getTheRegistryHub();
+}
+IMutableRegistryHub& getMutableRegistryHub() {
+return *getTheRegistryHub();
+}
+void cleanUp() {
+delete getTheRegistryHub();
+getTheRegistryHub() = CATCH_NULL;
+cleanUpContext();
+}
+std::string translateActiveException() {
+return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+}
+} // end namespace Catch
+// #included from: catch_notimplemented_exception.hpp
+#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED
+#include <ostream>
+namespace Catch {
+NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo )
+:   m_lineInfo( lineInfo ) {
+std::ostringstream oss;
+oss << lineInfo << ": function ";
+oss << "not implemented";
+m_what = oss.str();
+}
+const char* NotImplementedException::what() const CATCH_NOEXCEPT {
+return m_what.c_str();
+}
+} // end namespace Catch
+// #included from: catch_context_impl.hpp
+#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
 // #included from: catch_stream.hpp
+#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
 #include <stdexcept>
 #include <cstdio>
+#include <iostream>
 namespace Catch {
 template<typename WriterF, size_t bufferSize=256>
 class StreamBufImpl : public StreamBufBase {
 public:
 StreamBufImpl() {
 setp( data, data + sizeof(data) );
 }
-~StreamBufImpl() {
+~StreamBufImpl() CATCH_NOEXCEPT {
 sync();
 }
 private:
-int	overflow( int c ) {
+int overflow( int c ) {
 sync();
 if( c != EOF ) {
 if( pbase() == epptr() )
 m_writer( std::string( 1, static_cast<char>( c ) ) );
 sputc( static_cast<char>( c ) );
 }
 return 0;
 }
-int	sync() {
+int sync() {
 if( pbase() != pptr() ) {
 m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
 setp( pbase(), epptr() );
 }
 return 0;
 }
 };
 ///////////////////////////////////////////////////////////////////////////
+FileStream::FileStream( std::string const& filename ) {
+m_ofs.open( filename.c_str() );
+if( m_ofs.fail() ) {
+std::ostringstream oss;
+oss << "Unable to open file: '" << filename << "'";
+throw std::domain_error( oss.str() );
+}
+}
+std::ostream& FileStream::stream() const {
+return m_ofs;
+}
 struct OutputDebugWriter {
-void operator()( const std::string &str ) {
+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()
+:   m_os( Catch::cout().rdbuf() )
+{}
+std::ostream& CoutStream::stream() const {
+return m_os;
+}
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+std::ostream& cout() {
+return std::cout;
+}
+std::ostream& cerr() {
+return std::cerr;
+}
+#endif
 }
 namespace Catch {
+class Context : public IMutableContext {
+Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {}
+Context( Context const& );
+void operator=( Context const& );
+public: // IContext
+virtual IResultCapture* getResultCapture() {
+return m_resultCapture;
+}
+virtual IRunner* getRunner() {
+return m_runner;
+}
+virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) {
+return getGeneratorsForCurrentTest()
+.getGeneratorInfo( fileInfo, totalSize )
+.getCurrentIndex();
+}
+virtual bool advanceGeneratorsForCurrentTest() {
+IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
+return generators && generators->moveNext();
+}
+virtual Ptr<IConfig const> getConfig() const {
+return m_config;
+}
+public: // IMutableContext
+virtual void setResultCapture( IResultCapture* resultCapture ) {
+m_resultCapture = resultCapture;
+}
+virtual void setRunner( IRunner* runner ) {
+m_runner = runner;
+}
+virtual void setConfig( Ptr<IConfig const> const& config ) {
+m_config = config;
+}
+friend IMutableContext& getCurrentMutableContext();
+private:
+IGeneratorsForTest* findGeneratorsForCurrentTest() {
+std::string testName = getResultCapture()->getCurrentTestName();
+std::map<std::string, IGeneratorsForTest*>::const_iterator it =
+m_generatorsByTestName.find( testName );
+return it != m_generatorsByTestName.end()
+? it->second
+: CATCH_NULL;
+}
+IGeneratorsForTest& getGeneratorsForCurrentTest() {
+IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
+if( !generators ) {
+std::string testName = getResultCapture()->getCurrentTestName();
+generators = createGeneratorsForTest();
+m_generatorsByTestName.insert( std::make_pair( testName, generators ) );
+}
+return *generators;
+}
+private:
+Ptr<IConfig const> m_config;
+IRunner* m_runner;
+IResultCapture* m_resultCapture;
+std::map<std::string, IGeneratorsForTest*> m_generatorsByTestName;
+};
 namespace {
-Context* currentContext = NULL;
+Context* currentContext = CATCH_NULL;
 }
 IMutableContext& getCurrentMutableContext() {
 if( !currentContext )
 currentContext = new Context();
 return *currentContext;
 }
 IContext& getCurrentContext() {
 return getCurrentMutableContext();
 }
-Context::Context()
+void cleanUpContext() {
-:   m_reporterRegistry( new ReporterRegistry ),
+delete currentContext;
-m_testCaseRegistry( new TestRegistry ),
+currentContext = CATCH_NULL;
-m_exceptionTranslatorRegistry( new ExceptionTranslatorRegistry ),
+}
-m_config( NULL )
+}
+// #included from: catch_console_colour_impl.hpp
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
+namespace Catch {
+namespace {
+struct IColourImpl {
+virtual ~IColourImpl() {}
+virtual void use( Colour::Code _colourCode ) = 0;
+};
+struct NoColourImpl : IColourImpl {
+void use( Colour::Code ) {}
+static IColourImpl* instance() {
+static NoColourImpl s_instance;
+return &s_instance;
+}
+};
+} // anon namespace
+} // namespace Catch
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+namespace Catch {
+namespace {
+class Win32ColourImpl : public IColourImpl {
+public:
+Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+{
+CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+}
+virtual void use( Colour::Code _colourCode ) {
+switch( _colourCode ) {
+case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+case Colour::Grey:      return setTextAttribute( 0 );
+case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+case Colour::Bright: throw std::logic_error( "not a colour" );
+}
+}
+private:
+void setTextAttribute( WORD _textAttribute ) {
+SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+}
+HANDLE stdoutHandle;
+WORD originalForegroundAttributes;
+WORD originalBackgroundAttributes;
+};
+IColourImpl* platformColourInstance() {
+static Win32ColourImpl 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
+} // end namespace Catch
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+#include <unistd.h>
+namespace Catch {
+namespace {
+// use POSIX/ ANSI console terminal codes
+// Thanks to Adam Strzelecki for original contribution
+// (http://github.com/nanoant)
+// https://github.com/philsquared/Catch/pull/131
+class PosixColourImpl : public IColourImpl {
+public:
+virtual void use( Colour::Code _colourCode ) {
+switch( _colourCode ) {
+case Colour::None:
+case Colour::White:     return setColour( "[0m" );
+case Colour::Red:       return setColour( "[0;31m" );
+case Colour::Green:     return setColour( "[0;32m" );
+case Colour::Blue:      return setColour( "[0:34m" );
+case Colour::Cyan:      return setColour( "[0;36m" );
+case Colour::Yellow:    return setColour( "[0;33m" );
+case Colour::Grey:      return setColour( "[1;30m" );
+case Colour::LightGrey:     return setColour( "[0;37m" );
+case Colour::BrightRed:     return setColour( "[1;31m" );
+case Colour::BrightGreen:   return setColour( "[1;32m" );
+case Colour::BrightWhite:   return setColour( "[1;37m" );
+case Colour::Bright: throw std::logic_error( "not a colour" );
+}
+}
+static IColourImpl* instance() {
+static PosixColourImpl s_instance;
+return &s_instance;
+}
+private:
+void setColour( const char* _escapeCode ) {
+Catch::cout() << '\033' << _escapeCode;
+}
+};
+IColourImpl* platformColourInstance() {
+Ptr<IConfig const> config = getCurrentContext().getConfig();
+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();
+}
+} // end anon namespace
+} // end namespace Catch
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+namespace Catch {
+static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+} // end namespace Catch
+#endif // Windows/ ANSI/ None
+namespace Catch {
+Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); }
+Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast<Colour&>( _other ).m_moved = true; }
+Colour::~Colour(){ if( !m_moved ) use( None ); }
+void Colour::use( Code _colourCode ) {
+static IColourImpl* impl = platformColourInstance();
+impl->use( _colourCode );
+}
+} // end namespace Catch
+// #included from: catch_generators_impl.hpp
+#define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED
+#include <vector>
+#include <string>
+#include <map>
+namespace Catch {
+struct GeneratorInfo : IGeneratorInfo {
+GeneratorInfo( std::size_t size )
+:   m_size( size ),
+m_currentIndex( 0 )
+{}
+bool moveNext() {
+if( ++m_currentIndex == m_size ) {
+m_currentIndex = 0;
+return false;
+}
+return true;
+}
+std::size_t getCurrentIndex() const {
+return m_currentIndex;
+}
+std::size_t m_size;
+std::size_t m_currentIndex;
+};
+///////////////////////////////////////////////////////////////////////////
+class GeneratorsForTest : public IGeneratorsForTest {
+public:
+~GeneratorsForTest() {
+deleteAll( m_generatorsInOrder );
+}
+IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) {
+std::map<std::string, IGeneratorInfo*>::const_iterator it = m_generatorsByName.find( fileInfo );
+if( it == m_generatorsByName.end() ) {
+IGeneratorInfo* info = new GeneratorInfo( size );
+m_generatorsByName.insert( std::make_pair( fileInfo, info ) );
+m_generatorsInOrder.push_back( info );
+return *info;
+}
+return *it->second;
+}
+bool moveNext() {
+std::vector<IGeneratorInfo*>::const_iterator it = m_generatorsInOrder.begin();
+std::vector<IGeneratorInfo*>::const_iterator itEnd = m_generatorsInOrder.end();
+for(; it != itEnd; ++it ) {
+if( (*it)->moveNext() )
+return true;
+}
+return false;
+}
+private:
+std::map<std::string, IGeneratorInfo*> m_generatorsByName;
+std::vector<IGeneratorInfo*> m_generatorsInOrder;
+};
+IGeneratorsForTest* createGeneratorsForTest()
+{
+return new GeneratorsForTest();
+}
+} // end namespace Catch
+// #included from: catch_assertionresult.hpp
+#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED
+namespace Catch {
+AssertionInfo::AssertionInfo(   std::string const& _macroName,
+SourceLineInfo const& _lineInfo,
+std::string const& _capturedExpression,
+ResultDisposition::Flags _resultDisposition )
+:   macroName( _macroName ),
+lineInfo( _lineInfo ),
+capturedExpression( _capturedExpression ),
+resultDisposition( _resultDisposition )
 {}
-void Context::cleanUp() {
+AssertionResult::AssertionResult() {}
-delete currentContext;
-currentContext = NULL;
+AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-}
+:   m_info( info ),
+m_resultData( data )
-void Context::setRunner( IRunner* runner ) {
+{}
-m_runner = runner;
-}
+AssertionResult::~AssertionResult() {}
-void Context::setResultCapture( IResultCapture* resultCapture ) {
+// Result was a success
-m_resultCapture = resultCapture;
+bool AssertionResult::succeeded() const {
-}
+return Catch::isOk( m_resultData.resultType );
+}
-const IConfig* Context::getConfig() const {
-return m_config;
+// Result was a success, or failure is suppressed
-}
+bool AssertionResult::isOk() const {
-void Context::setConfig( const IConfig* config ) {
+return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-m_config = config;
+}
-}
+ResultWas::OfType AssertionResult::getResultType() const {
-IResultCapture& Context::getResultCapture() {
+return m_resultData.resultType;
-return *m_resultCapture;
+}
-}
+bool AssertionResult::hasExpression() const {
-IRunner& Context::getRunner() {
+return !m_info.capturedExpression.empty();
-return *m_runner;
+}
-}
+bool AssertionResult::hasMessage() const {
-IReporterRegistry& Context::getReporterRegistry() {
+return !m_resultData.message.empty();
-return *m_reporterRegistry.get();
+}
-}
+std::string AssertionResult::getExpression() const {
-ITestCaseRegistry& Context::getTestCaseRegistry() {
+if( isFalseTest( m_info.resultDisposition ) )
-return *m_testCaseRegistry.get();
+return "!" + m_info.capturedExpression;
-}
+else
+return m_info.capturedExpression;
-IExceptionTranslatorRegistry& Context::getExceptionTranslatorRegistry() {
+}
-return *m_exceptionTranslatorRegistry.get();
+std::string AssertionResult::getExpressionInMacro() const {
-}
+if( m_info.macroName.empty() )
+return m_info.capturedExpression;
-std::streambuf* Context::createStreamBuf( const std::string& streamName ) {
+else
-if( streamName == "stdout" ) return std::cout.rdbuf();
+return m_info.macroName + "( " + m_info.capturedExpression + " )";
-if( streamName == "stderr" ) return std::cerr.rdbuf();
+}
-if( streamName == "debug" ) return new StreamBufImpl<OutputDebugWriter>;
+bool AssertionResult::hasExpandedExpression() const {
-throw std::domain_error( "Unknown stream: " + streamName );
+return hasExpression() && getExpandedExpression() != getExpression();
 }
-GeneratorsForTest* Context::findGeneratorsForCurrentTest() {
+std::string AssertionResult::getExpandedExpression() const {
-std::string testName = getResultCapture().getCurrentTestName();
+return m_resultData.reconstructedExpression;
+}
-std::map<std::string, GeneratorsForTest*>::const_iterator it =
-m_generatorsByTestName.find( testName );
+std::string AssertionResult::getMessage() const {
-return it != m_generatorsByTestName.end()
+return m_resultData.message;
-? it->second
+}
-: NULL;
+SourceLineInfo AssertionResult::getSourceInfo() const {
-}
+return m_info.lineInfo;
+}
-GeneratorsForTest& Context::getGeneratorsForCurrentTest() {
-GeneratorsForTest* generators = findGeneratorsForCurrentTest();
+std::string AssertionResult::getTestMacroName() const {
-if( !generators ) {
+return m_info.macroName;
-std::string testName = getResultCapture().getCurrentTestName();
+}
-generators = new GeneratorsForTest();
-m_generatorsByTestName.insert( std::make_pair( testName, generators ) );
+} // end namespace Catch
-}
-return *generators;
+// #included from: catch_test_case_info.hpp
-}
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
-size_t Context::getGeneratorIndex( const std::string& fileInfo, size_t totalSize ) {
+namespace Catch {
-return getGeneratorsForCurrentTest()
-.getGeneratorInfo( fileInfo, totalSize )
+inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-.getCurrentIndex();
+if( startsWith( tag, "." ) ||
-}
+tag == "hide" ||
+tag == "!hide" )
-bool Context::advanceGeneratorsForCurrentTest() {
+return TestCaseInfo::IsHidden;
-GeneratorsForTest* generators = findGeneratorsForCurrentTest();
+else if( tag == "!throws" )
-return generators && generators->moveNext();
+return TestCaseInfo::Throws;
-}
+else if( tag == "!shouldfail" )
+return TestCaseInfo::ShouldFail;
+else if( tag == "!mayfail" )
+return TestCaseInfo::MayFail;
+else
+return TestCaseInfo::None;
+}
+inline bool isReservedTag( std::string const& tag ) {
+return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
+}
+inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+if( isReservedTag( tag ) ) {
+{
+Colour colourGuard( Colour::Red );
+Catch::cerr()
+<< "Tag name [" << tag << "] not allowed.\n"
+<< "Tag names starting with non alpha-numeric characters are reserved\n";
+}
+{
+Colour colourGuard( Colour::FileName );
+Catch::cerr() << _lineInfo << std::endl;
+}
+exit(1);
+}
+}
+TestCase makeTestCase(  ITestCase* _testCase,
+std::string const& _className,
+std::string const& _name,
+std::string const& _descOrTags,
+SourceLineInfo const& _lineInfo )
+{
+bool isHidden( startsWith( _name, "./" ) ); // Legacy support
+// Parse out tags
+std::set<std::string> tags;
+std::string desc, tag;
+bool inTag = false;
+for( std::size_t i = 0; i < _descOrTags.size(); ++i ) {
+char c = _descOrTags[i];
+if( !inTag ) {
+if( c == '[' )
+inTag = true;
+else
+desc += c;
+}
+else {
+if( c == ']' ) {
+TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+if( prop == TestCaseInfo::IsHidden )
+isHidden = true;
+else if( prop == TestCaseInfo::None )
+enforceNotReservedTag( tag, _lineInfo );
+tags.insert( tag );
+tag.clear();
+inTag = false;
+}
+else
+tag += c;
+}
+}
+if( isHidden ) {
+tags.insert( "hide" );
+tags.insert( "." );
+}
+TestCaseInfo info( _name, _className, desc, tags, _lineInfo );
+return TestCase( _testCase, info );
+}
+void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags )
+{
+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 << "]";
+std::string lcaseTag = toLower( *it );
+testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+testCaseInfo.lcaseTags.insert( lcaseTag );
+}
+testCaseInfo.tagsAsString = oss.str();
+}
+TestCaseInfo::TestCaseInfo( std::string const& _name,
+std::string const& _className,
+std::string const& _description,
+std::set<std::string> const& _tags,
+SourceLineInfo const& _lineInfo )
+:   name( _name ),
+className( _className ),
+description( _description ),
+lineInfo( _lineInfo ),
+properties( None )
+{
+setTags( *this, _tags );
+}
+TestCaseInfo::TestCaseInfo( TestCaseInfo const& other )
+:   name( other.name ),
+className( other.className ),
+description( other.description ),
+tags( other.tags ),
+lcaseTags( other.lcaseTags ),
+tagsAsString( other.tagsAsString ),
+lineInfo( other.lineInfo ),
+properties( other.properties )
+{}
+bool TestCaseInfo::isHidden() const {
+return ( properties & IsHidden ) != 0;
+}
+bool TestCaseInfo::throws() const {
+return ( properties & Throws ) != 0;
+}
+bool TestCaseInfo::okToFail() const {
+return ( properties & (ShouldFail | MayFail ) ) != 0;
+}
+bool TestCaseInfo::expectedToFail() const {
+return ( properties & (ShouldFail ) ) != 0;
+}
+TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
+TestCase::TestCase( TestCase const& other )
+:   TestCaseInfo( other ),
+test( other.test )
+{}
+TestCase TestCase::withName( std::string const& _newName ) const {
+TestCase other( *this );
+other.name = _newName;
+return other;
+}
+void TestCase::swap( TestCase& other ) {
+test.swap( other.test );
+name.swap( other.name );
+className.swap( other.className );
+description.swap( other.description );
+tags.swap( other.tags );
+lcaseTags.swap( other.lcaseTags );
+tagsAsString.swap( other.tagsAsString );
+std::swap( TestCaseInfo::properties, static_cast<TestCaseInfo&>( other ).properties );
+std::swap( lineInfo, other.lineInfo );
+}
+void TestCase::invoke() const {
+test->invoke();
+}
+bool TestCase::operator == ( TestCase const& other ) const {
+return  test.get() == other.test.get() &&
+name == other.name &&
+className == other.className;
+}
+bool TestCase::operator < ( TestCase const& other ) const {
+return name < other.name;
+}
+TestCase& TestCase::operator = ( TestCase const& other ) {
+TestCase temp( other );
+swap( temp );
+return *this;
+}
+TestCaseInfo const& TestCase::getTestCaseInfo() const
+{
+return *this;
+}
+} // end namespace Catch
+// #included from: catch_version.hpp
+#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
+namespace Catch {
+Version::Version
+(   unsigned int _majorVersion,
+unsigned int _minorVersion,
+unsigned int _patchNumber,
+std::string const& _branchName,
+unsigned int _buildNumber )
+:   majorVersion( _majorVersion ),
+minorVersion( _minorVersion ),
+patchNumber( _patchNumber ),
+branchName( _branchName ),
+buildNumber( _buildNumber )
+{}
+std::ostream& operator << ( std::ostream& os, Version const& version ) {
+os  << version.majorVersion << "."
+<< version.minorVersion << "."
+<< version.patchNumber;
+if( !version.branchName.empty() ) {
+os  << "-" << version.branchName
+<< "." << version.buildNumber;
+}
+return os;
+}
+Version libraryVersion( 1, 5, 6, "", 0 );
 }
-// #included from: internal/catch_commandline.hpp
+// #included from: catch_message.hpp
+#define TWOBLUECUBES_CATCH_MESSAGE_HPP_INCLUDED
 namespace Catch {
-class Command {
+MessageInfo::MessageInfo(   std::string const& _macroName,
+SourceLineInfo const& _lineInfo,
+ResultWas::OfType _type )
+:   macroName( _macroName ),
+lineInfo( _lineInfo ),
+type( _type ),
+sequence( ++globalCount )
+{}
+// This may need protecting if threading support is added
+unsigned int MessageInfo::globalCount = 0;
+////////////////////////////////////////////////////////////////////////////
+ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+: m_info( builder.m_info )
+{
+m_info.message = builder.m_stream.str();
+getResultCapture().pushScopedMessage( m_info );
+}
+ScopedMessage::ScopedMessage( ScopedMessage const& other )
+: m_info( other.m_info )
+{}
+ScopedMessage::~ScopedMessage() {
+getResultCapture().popScopedMessage( m_info );
+}
+} // end namespace Catch
+// #included from: catch_legacy_reporter_adapter.hpp
+#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED
+// #included from: catch_legacy_reporter_adapter.h
+#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED
+namespace Catch
+{
+// Deprecated
+struct IReporter : IShared {
+virtual ~IReporter();
+virtual bool shouldRedirectStdout() const = 0;
+virtual void StartTesting() = 0;
+virtual void EndTesting( Totals const& totals ) = 0;
+virtual void StartGroup( std::string const& groupName ) = 0;
+virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0;
+virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0;
+virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0;
+virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0;
+virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0;
+virtual void NoAssertionsInSection( std::string const& sectionName ) = 0;
+virtual void NoAssertionsInTestCase( std::string const& testName ) = 0;
+virtual void Aborted() = 0;
+virtual void Result( AssertionResult const& result ) = 0;
+};
+class LegacyReporterAdapter : public SharedImpl<IStreamingReporter>
+{
 public:
-Command(){}
+LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter );
+virtual ~LegacyReporterAdapter();
-explicit Command( const std::string& name ) : m_name( name ) {}
+virtual ReporterPreferences getPreferences() const;
-Command& operator += ( const std::string& arg ) {
+virtual void noMatchingTestCases( std::string const& );
-m_args.push_back( arg );
+virtual void testRunStarting( TestRunInfo const& );
-return *this;
+virtual void testGroupStarting( GroupInfo const& groupInfo );
-}
+virtual void testCaseStarting( TestCaseInfo const& testInfo );
-Command& operator += ( const Command& other ) {
+virtual void sectionStarting( SectionInfo const& sectionInfo );
-std::copy( other.m_args.begin(), other.m_args.end(), std::back_inserter( m_args ) );
+virtual void assertionStarting( AssertionInfo const& );
-if( m_name.empty() )
+virtual bool assertionEnded( AssertionStats const& assertionStats );
-m_name = other.m_name;
+virtual void sectionEnded( SectionStats const& sectionStats );
-return *this;
+virtual void testCaseEnded( TestCaseStats const& testCaseStats );
-}
+virtual void testGroupEnded( TestGroupStats const& testGroupStats );
-Command operator + ( const Command& other ) {
+virtual void testRunEnded( TestRunStats const& testRunStats );
-Command newCommand( *this );
+virtual void skipTest( TestCaseInfo const& );
-newCommand += other;
-return newCommand;
+private:
-}
+Ptr<IReporter> m_legacyReporter;
+};
-operator SafeBool::type() const {
+}
-return SafeBool::makeSafe( !m_name.empty() );
-}
+namespace Catch
+{
-std::string name() const { return m_name; }
+LegacyReporterAdapter::LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter )
-std::string operator[]( std::size_t i ) const { return m_args[i]; }
+:   m_legacyReporter( legacyReporter )
-std::size_t argsCount() const { return m_args.size(); }
+{}
+LegacyReporterAdapter::~LegacyReporterAdapter() {}
-void raiseError( const std::string& message ) const {
+ReporterPreferences LegacyReporterAdapter::getPreferences() const {
+ReporterPreferences prefs;
+prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout();
+return prefs;
+}
+void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {}
+void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) {
+m_legacyReporter->StartTesting();
+}
+void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) {
+m_legacyReporter->StartGroup( groupInfo.name );
+}
+void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) {
+m_legacyReporter->StartTestCase( testInfo );
+}
+void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) {
+m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description );
+}
+void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) {
+// Not on legacy interface
+}
+bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) {
+if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
+for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
+it != itEnd;
+++it ) {
+if( it->type == ResultWas::Info ) {
+ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal );
+rb << it->message;
+rb.setResultType( ResultWas::Info );
+AssertionResult result = rb.build();
+m_legacyReporter->Result( result );
+}
+}
+}
+m_legacyReporter->Result( assertionStats.assertionResult );
+return true;
+}
+void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) {
+if( sectionStats.missingAssertions )
+m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name );
+m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions );
+}
+void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+m_legacyReporter->EndTestCase
+(   testCaseStats.testInfo,
+testCaseStats.totals,
+testCaseStats.stdOut,
+testCaseStats.stdErr );
+}
+void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+if( testGroupStats.aborting )
+m_legacyReporter->Aborted();
+m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals );
+}
+void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) {
+m_legacyReporter->EndTesting( testRunStats.totals );
+}
+void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) {
+}
+}
+// #included from: catch_timer.hpp
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++11-long-long"
+#endif
+#ifdef CATCH_PLATFORM_WINDOWS
+#include <windows.h>
+#else
+#include <sys/time.h>
+#endif
+namespace Catch {
+namespace {
+#ifdef CATCH_PLATFORM_WINDOWS
+uint64_t getCurrentTicks() {
+static uint64_t hz=0, hzo=0;
+if (!hz) {
+QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
+QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
+}
+uint64_t t;
+QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
+return ((t-hzo)*1000000)/hz;
+}
+#else
+uint64_t getCurrentTicks() {
+timeval t;
+gettimeofday(&t,CATCH_NULL);
+return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
+}
+#endif
+}
+void Timer::start() {
+m_ticks = getCurrentTicks();
+}
+unsigned int Timer::getElapsedMicroseconds() const {
+return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
+}
+unsigned int Timer::getElapsedMilliseconds() const {
+return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+}
+double Timer::getElapsedSeconds() const {
+return getElapsedMicroseconds()/1000000.0;
+}
+} // namespace Catch
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+// #included from: catch_common.hpp
+#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED
+namespace Catch {
+bool startsWith( std::string const& s, std::string const& prefix ) {
+return s.size() >= prefix.size() && s.substr( 0, prefix.size() ) == prefix;
+}
+bool endsWith( std::string const& s, std::string const& suffix ) {
+return s.size() >= suffix.size() && s.substr( s.size()-suffix.size(), suffix.size() ) == suffix;
+}
+bool contains( std::string const& s, std::string const& infix ) {
+return s.find( infix ) != std::string::npos;
+}
+void toLowerInPlace( std::string& s ) {
+std::transform( s.begin(), s.end(), s.begin(), ::tolower );
+}
+std::string toLower( std::string const& s ) {
+std::string lc = s;
+toLowerInPlace( lc );
+return lc;
+}
+std::string trim( std::string const& str ) {
+static char const* whitespaceChars = "\n\r\t ";
+std::string::size_type start = str.find_first_not_of( whitespaceChars );
+std::string::size_type end = str.find_last_not_of( whitespaceChars );
+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 );
+while( i != std::string::npos ) {
+replaced = true;
+str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+if( i < str.size()-withThis.size() )
+i = str.find( replaceThis, i+withThis.size() );
+else
+i = std::string::npos;
+}
+return replaced;
+}
+pluralise::pluralise( std::size_t count, std::string const& label )
+:   m_count( count ),
+m_label( label )
+{}
+std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+os << pluraliser.m_count << " " << pluraliser.m_label;
+if( pluraliser.m_count != 1 )
+os << "s";
+return os;
+}
+SourceLineInfo::SourceLineInfo() : line( 0 ){}
+SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line )
+:   file( _file ),
+line( _line )
+{}
+SourceLineInfo::SourceLineInfo( SourceLineInfo const& other )
+:   file( other.file ),
+line( other.line )
+{}
+bool SourceLineInfo::empty() const {
+return file.empty();
+}
+bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const {
+return line == other.line && file == other.file;
+}
+bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const {
+return line < other.line || ( line == other.line  && file < other.file );
+}
+void seedRng( IConfig const& config ) {
+if( config.rngSeed() != 0 )
+std::srand( config.rngSeed() );
+}
+unsigned int rngSeed() {
+return getCurrentContext().getConfig()->rngSeed();
+}
+std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+os << info.file << "(" << info.line << ")";
+#else
+os << info.file << ":" << info.line;
+#endif
+return os;
+}
+void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) {
+std::ostringstream oss;
+oss << locationInfo << ": Internal Catch error: '" << message << "'";
+if( alwaysTrue() )
+throw std::logic_error( oss.str() );
+}
+}
+// #included from: catch_section.hpp
+#define TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED
+namespace Catch {
+SectionInfo::SectionInfo
+(   SourceLineInfo const& _lineInfo,
+std::string const& _name,
+std::string const& _description )
+:   name( _name ),
+description( _description ),
+lineInfo( _lineInfo )
+{}
+Section::Section( SectionInfo const& info )
+:   m_info( info ),
+m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+{
+m_timer.start();
+}
+Section::~Section() {
+if( m_sectionIncluded ) {
+SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
+if( std::uncaught_exception() )
+getResultCapture().sectionEndedEarly( endInfo );
+else
+getResultCapture().sectionEnded( endInfo );
+}
+}
+// This indicates whether the section should be executed or not
+Section::operator bool() const {
+return m_sectionIncluded;
+}
+} // end namespace Catch
+// #included from: catch_debugger.hpp
+#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED
+#include <iostream>
+#ifdef CATCH_PLATFORM_MAC
+#include <assert.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/sysctl.h>
+namespace Catch{
+// The following function is taken directly from the following technical note:
+// http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+// Returns true if the current process is being debugged (either
+// running under the debugger or has a debugger attached post facto).
+bool isDebuggerActive(){
+int                 mib[4];
+struct kinfo_proc   info;
+size_t              size;
+// Initialize the flags so that, if sysctl fails for some bizarre
+// reason, we get a predictable result.
+info.kp_proc.p_flag = 0;
+// Initialize mib, which tells sysctl the info we want, in this case
+// we're looking for information about a specific process ID.
+mib[0] = CTL_KERN;
+mib[1] = KERN_PROC;
+mib[2] = KERN_PROC_PID;
+mib[3] = getpid();
+// Call sysctl.
+size = sizeof(info);
+if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) {
+Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+return false;
+}
+// We're being debugged if the P_TRACED flag is set.
+return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+}
+} // namespace Catch
+#elif defined(_MSC_VER)
+extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+namespace Catch {
+bool isDebuggerActive() {
+return IsDebuggerPresent() != 0;
+}
+}
+#elif defined(__MINGW32__)
+extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+namespace Catch {
+bool isDebuggerActive() {
+return IsDebuggerPresent() != 0;
+}
+}
+#else
+namespace Catch {
+inline bool isDebuggerActive() { return false; }
+}
+#endif // Platform
+#ifdef CATCH_PLATFORM_WINDOWS
+extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
+namespace Catch {
+void writeToDebugConsole( std::string const& text ) {
+::OutputDebugStringA( text.c_str() );
+}
+}
+#else
+namespace Catch {
+void writeToDebugConsole( std::string const& text ) {
+// !TBD: Need a version for Mac/ XCode and other IDEs
+Catch::cout() << text;
+}
+}
+#endif // Platform
+// #included from: catch_tostring.hpp
+#define TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED
+namespace Catch {
+namespace Detail {
+const std::string unprintableString = "{?}";
+namespace {
+const int hexThreshold = 255;
+struct Endianness {
+enum Arch { Big, Little };
+static Arch which() {
+union _{
+int asInt;
+char asChar[sizeof (int)];
+} u;
+u.asInt = 1;
+return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+}
+};
+}
+std::string rawMemoryToString( const void *object, std::size_t size )
+{
+// Reverse order for little endian architectures
+int i = 0, end = static_cast<int>( size ), inc = 1;
+if( Endianness::which() == Endianness::Little ) {
+i = end-1;
+end = inc = -1;
+}
+unsigned char const *bytes = static_cast<unsigned char const *>(object);
+std::ostringstream os;
+os << "0x" << std::setfill('0') << std::hex;
+for( ; i != end; i += inc )
+os << std::setw(2) << static_cast<unsigned>(bytes[i]);
+return os.str();
+}
+}
+std::string toString( std::string const& value ) {
+std::string s = value;
+if( getCurrentContext().getConfig()->showInvisibles() ) {
+for(size_t i = 0; i < s.size(); ++i ) {
+std::string subs;
+switch( s[i] ) {
+case '\n': subs = "\\n"; break;
+case '\t': subs = "\\t"; break;
+default: break;
+}
+if( !subs.empty() ) {
+s = s.substr( 0, i ) + subs + s.substr( i+1 );
+++i;
+}
+}
+}
+return "\"" + s + "\"";
+}
+std::string toString( std::wstring const& value ) {
+std::string s;
+s.reserve( value.size() );
+for(size_t i = 0; i < value.size(); ++i )
+s += value[i] <= 0xff ? static_cast<char>( value[i] ) : '?';
+return Catch::toString( s );
+}
+std::string toString( const char* const value ) {
+return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
+}
+std::string toString( char* const value ) {
+return Catch::toString( static_cast<const char*>( value ) );
+}
+std::string toString( const wchar_t* const value )
+{
+	return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
+}
+std::string toString( wchar_t* const value )
+{
+	return Catch::toString( static_cast<const wchar_t*>( value ) );
+}
+std::string toString( int value ) {
+std::ostringstream oss;
+oss << value;
+if( value > Detail::hexThreshold )
+oss << " (0x" << std::hex << value << ")";
+return oss.str();
+}
+std::string toString( unsigned long value ) {
+std::ostringstream oss;
+oss << value;
+if( value > Detail::hexThreshold )
+oss << " (0x" << std::hex << value << ")";
+return oss.str();
+}
+std::string toString( unsigned int value ) {
+return Catch::toString( static_cast<unsigned long>( value ) );
+}
+template<typename T>
+std::string fpToString( T value, int precision ) {
+std::ostringstream oss;
+oss << std::setprecision( precision )
+<< std::fixed
+<< value;
+std::string d = oss.str();
+std::size_t i = d.find_last_not_of( '0' );
+if( i != std::string::npos && i != d.size()-1 ) {
+if( d[i] == '.' )
+i++;
+d = d.substr( 0, i+1 );
+}
+return d;
+}
+std::string toString( const double value ) {
+return fpToString( value, 10 );
+}
+std::string toString( const float value ) {
+return fpToString( value, 5 ) + "f";
+}
+std::string toString( bool value ) {
+return value ? "true" : "false";
+}
+std::string toString( char value ) {
+return value < ' '
+? toString( static_cast<unsigned int>( value ) )
+: Detail::makeString( value );
+}
+std::string toString( signed char value ) {
+return toString( static_cast<char>( value ) );
+}
+std::string toString( unsigned char value ) {
+return toString( static_cast<char>( value ) );
+}
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+std::string toString( long long value ) {
+std::ostringstream oss;
+oss << value;
+if( value > Detail::hexThreshold )
+oss << " (0x" << std::hex << value << ")";
+return oss.str();
+}
+std::string toString( unsigned long long value ) {
+std::ostringstream oss;
+oss << value;
+if( value > Detail::hexThreshold )
+oss << " (0x" << std::hex << value << ")";
+return oss.str();
+}
+#endif
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+std::string toString( std::nullptr_t ) {
+return "nullptr";
+}
+#endif
+#ifdef __OBJC__
+std::string toString( NSString const * const& nsstring ) {
+if( !nsstring )
+return "nil";
+return "@" + toString([nsstring UTF8String]);
+}
+std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) {
+if( !nsstring )
+return "nil";
+return "@" + toString([nsstring UTF8String]);
+}
+std::string toString( NSObject* const& nsObject ) {
+return toString( [nsObject description] );
+}
+#endif
+} // end namespace Catch
+// #included from: catch_result_builder.hpp
+#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED
+namespace Catch {
+std::string capturedExpressionWithSecondArgument( std::string const& capturedExpression, std::string const& secondArg ) {
+return secondArg.empty() || secondArg == "\"\""
+? capturedExpression
+: capturedExpression + ", " + secondArg;
+}
+ResultBuilder::ResultBuilder(   char const* macroName,
+SourceLineInfo const& lineInfo,
+char const* capturedExpression,
+ResultDisposition::Flags resultDisposition,
+char const* secondArg )
+:   m_assertionInfo( macroName, lineInfo, capturedExpressionWithSecondArgument( capturedExpression, secondArg ), resultDisposition ),
+m_shouldDebugBreak( false ),
+m_shouldThrow( false )
+{}
+ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) {
+m_data.resultType = result;
+return *this;
+}
+ResultBuilder& ResultBuilder::setResultType( bool result ) {
+m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed;
+return *this;
+}
+ResultBuilder& ResultBuilder::setLhs( std::string const& lhs ) {
+m_exprComponents.lhs = lhs;
+return *this;
+}
+ResultBuilder& ResultBuilder::setRhs( std::string const& rhs ) {
+m_exprComponents.rhs = rhs;
+return *this;
+}
+ResultBuilder& ResultBuilder::setOp( std::string const& op ) {
+m_exprComponents.op = op;
+return *this;
+}
+void ResultBuilder::endExpression() {
+m_exprComponents.testFalse = isFalseTest( m_assertionInfo.resultDisposition );
+captureExpression();
+}
+void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) {
+m_assertionInfo.resultDisposition = resultDisposition;
+m_stream.oss << Catch::translateActiveException();
+captureResult( ResultWas::ThrewException );
+}
+void ResultBuilder::captureResult( ResultWas::OfType resultType ) {
+setResultType( resultType );
+captureExpression();
+}
+void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) {
+if( expectedMessage.empty() )
+captureExpectedException( Matchers::Impl::Generic::AllOf<std::string>() );
+else
+captureExpectedException( Matchers::Equals( expectedMessage ) );
+}
+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;
+data.reconstructedExpression = actualMessage;
+}
+AssertionResult result( m_assertionInfo, data );
+handleResult( result );
+}
+void ResultBuilder::captureExpression() {
+AssertionResult result = build();
+handleResult( result );
+}
+void ResultBuilder::handleResult( AssertionResult const& result )
+{
+getResultCapture().assertionEnded( result );
+if( !result.isOk() ) {
+if( getCurrentContext().getConfig()->shouldDebugBreak() )
+m_shouldDebugBreak = true;
+if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
+m_shouldThrow = true;
+}
+}
+void ResultBuilder::react() {
+if( m_shouldThrow )
+throw Catch::TestFailureException();
+}
+bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; }
+bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); }
+AssertionResult ResultBuilder::build() const
+{
+assert( m_data.resultType != ResultWas::Unknown );
+AssertionResultData data = m_data;
+// Flip bool results if testFalse is set
+if( m_exprComponents.testFalse ) {
+if( data.resultType == ResultWas::Ok )
+data.resultType = ResultWas::ExpressionFailed;
+else if( data.resultType == ResultWas::ExpressionFailed )
+data.resultType = ResultWas::Ok;
+}
+data.message = m_stream.oss.str();
+data.reconstructedExpression = reconstructExpression();
+if( m_exprComponents.testFalse ) {
+if( m_exprComponents.op == "" )
+data.reconstructedExpression = "!" + data.reconstructedExpression;
+else
+data.reconstructedExpression = "!(" + data.reconstructedExpression + ")";
+}
+return AssertionResult( m_assertionInfo, data );
+}
+std::string ResultBuilder::reconstructExpression() const {
+if( m_exprComponents.op == "" )
+return m_exprComponents.lhs.empty() ? m_assertionInfo.capturedExpression : m_exprComponents.op + m_exprComponents.lhs;
+else if( m_exprComponents.op == "matches" )
+return m_exprComponents.lhs + " " + m_exprComponents.rhs;
+else if( m_exprComponents.op != "!" ) {
+if( m_exprComponents.lhs.size() + m_exprComponents.rhs.size() < 40 &&
+m_exprComponents.lhs.find("\n") == std::string::npos &&
+m_exprComponents.rhs.find("\n") == std::string::npos )
+return m_exprComponents.lhs + " " + m_exprComponents.op + " " + m_exprComponents.rhs;
+else
+return m_exprComponents.lhs + "\n" + m_exprComponents.op + "\n" + m_exprComponents.rhs;
+}
+else
+return "{can't expand - use " + m_assertionInfo.macroName + "_FALSE( " + m_assertionInfo.capturedExpression.substr(1) + " ) instead of " + m_assertionInfo.macroName + "( " + m_assertionInfo.capturedExpression + " ) for better diagnostics}";
+}
+} // end namespace Catch
+// #included from: catch_tag_alias_registry.hpp
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+// #included from: catch_tag_alias_registry.h
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
+#include <map>
+namespace Catch {
+class TagAliasRegistry : public ITagAliasRegistry {
+public:
+virtual ~TagAliasRegistry();
+virtual Option<TagAlias> find( std::string const& alias ) const;
+virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const;
+void add( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+static TagAliasRegistry& get();
+private:
+std::map<std::string, TagAlias> m_registry;
+};
+} // end namespace Catch
+#include <map>
+#include <iostream>
+namespace Catch {
+TagAliasRegistry::~TagAliasRegistry() {}
+Option<TagAlias> TagAliasRegistry::find( std::string const& alias ) const {
+std::map<std::string, TagAlias>::const_iterator it = m_registry.find( alias );
+if( it != m_registry.end() )
+return it->second;
+else
+return Option<TagAlias>();
+}
+std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+std::string expandedTestSpec = unexpandedTestSpec;
+for( std::map<std::string, TagAlias>::const_iterator it = m_registry.begin(), itEnd = m_registry.end();
+it != itEnd;
+++it ) {
+std::size_t pos = expandedTestSpec.find( it->first );
+if( pos != std::string::npos ) {
+expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+it->second.tag +
+expandedTestSpec.substr( pos + it->first.size() );
+}
+}
+return expandedTestSpec;
+}
+void TagAliasRegistry::add( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
+if( !startsWith( alias, "[@" ) || !endsWith( alias, "]" ) ) {
 std::ostringstream oss;
-oss << "Error while parsing " << m_name << ". " << message << ".";
+oss << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" << lineInfo;
-if( m_args.size() > 0 )
+throw std::domain_error( oss.str().c_str() );
-oss << " Arguments where:";
+}
-for( std::size_t i = 0; i < m_args.size(); ++i )
+if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) {
-oss << " " << m_args[i];
+std::ostringstream oss;
-throw std::domain_error( oss.str() );
+oss << "error: tag alias, \"" << alias << "\" already registered.\n"
-}
+<< "\tFirst seen at " << find(alias)->lineInfo << "\n"
+<< "\tRedefined at " << lineInfo;
-private:
+throw std::domain_error( oss.str().c_str() );
+}
-std::string m_name;
+}
-std::vector<std::string> m_args;
-};
+TagAliasRegistry& TagAliasRegistry::get() {
+static TagAliasRegistry instance;
-class CommandParser {
+return instance;
+}
+ITagAliasRegistry::~ITagAliasRegistry() {}
+ITagAliasRegistry const& ITagAliasRegistry::get() { return TagAliasRegistry::get(); }
+RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
+try {
+TagAliasRegistry::get().add( alias, tag, lineInfo );
+}
+catch( std::exception& ex ) {
+Colour colourGuard( Colour::Red );
+Catch::cerr() << ex.what() << std::endl;
+exit(1);
+}
+}
+} // end namespace Catch
+// #included from: ../reporters/catch_reporter_multi.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED
+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;
+++it )
+(*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;
+++it )
+(*it)->testRunStarting( testRunInfo );
+}
+virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*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;
+++it )
+(*it)->testCaseStarting( testInfo );
+}
+virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*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;
+++it )
+(*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;
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+clearBuffer |= (*it)->assertionEnded( assertionStats );
+return clearBuffer;
+}
+virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*it)->sectionEnded( sectionStats );
+}
+virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*it)->testCaseEnded( testCaseStats );
+}
+virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*it)->testGroupEnded( testGroupStats );
+}
+virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+it != itEnd;
+++it )
+(*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 = existingReporter->tryAsMulti();
+if( !multi ) {
+multi = new MultipleReporters;
+resultingReporter = Ptr<IStreamingReporter>( multi );
+if( existingReporter )
+multi->add( existingReporter );
+}
+else
+resultingReporter = existingReporter;
+multi->add( additionalReporter );
+}
+else
+resultingReporter = additionalReporter;
+return resultingReporter;
+}
+} // end namespace Catch
+// #included from: ../reporters/catch_reporter_xml.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
+// #included from: catch_reporter_bases.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
+#include <cstring>
+namespace Catch {
+struct StreamingReporterBase : SharedImpl<IStreamingReporter> {
+StreamingReporterBase( ReporterConfig const& _config )
+:   m_config( _config.fullConfig() ),
+stream( _config.stream() )
+{
+m_reporterPrefs.shouldRedirectStdOut = false;
+}
+virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
+return m_reporterPrefs;
+}
+virtual ~StreamingReporterBase() CATCH_OVERRIDE;
+virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {}
+virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE {
+currentTestRunInfo = _testRunInfo;
+}
+virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE {
+currentGroupInfo = _groupInfo;
+}
+virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE {
+currentTestCaseInfo = _testInfo;
+}
+virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
+m_sectionStack.push_back( _sectionInfo );
+}
+virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE {
+m_sectionStack.pop_back();
+}
+virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE {
+currentTestCaseInfo.reset();
+}
+virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE {
+currentGroupInfo.reset();
+}
+virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE {
+currentTestCaseInfo.reset();
+currentGroupInfo.reset();
+currentTestRunInfo.reset();
+}
+virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {
+// Don't do anything with this by default.
+// It can optionally be overridden in the derived class.
+}
+Ptr<IConfig const> m_config;
+std::ostream& stream;
+LazyStat<TestRunInfo> currentTestRunInfo;
+LazyStat<GroupInfo> currentGroupInfo;
+LazyStat<TestCaseInfo> currentTestCaseInfo;
+std::vector<SectionInfo> m_sectionStack;
+ReporterPreferences m_reporterPrefs;
+};
+struct CumulativeReporterBase : SharedImpl<IStreamingReporter> {
+template<typename T, typename ChildNodeT>
+struct Node : SharedImpl<> {
+explicit Node( T const& _value ) : value( _value ) {}
+virtual ~Node() {}
+typedef std::vector<Ptr<ChildNodeT> > ChildNodes;
+T value;
+ChildNodes children;
+};
+struct SectionNode : SharedImpl<> {
+explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {}
+virtual ~SectionNode();
+bool operator == ( SectionNode const& other ) const {
+return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+}
+bool operator == ( Ptr<SectionNode> const& other ) const {
+return operator==( *other );
+}
+SectionStats stats;
+typedef std::vector<Ptr<SectionNode> > ChildSections;
+typedef std::vector<AssertionStats> Assertions;
+ChildSections childSections;
+Assertions assertions;
+std::string stdOut;
+std::string stdErr;
+};
+struct BySectionInfo {
+BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+			BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+bool operator() ( Ptr<SectionNode> const& node ) const {
+return node->stats.sectionInfo.lineInfo == m_other.lineInfo;
+}
+private:
+			void operator=( BySectionInfo const& );
+SectionInfo const& m_other;
+};
+typedef Node<TestCaseStats, SectionNode> TestCaseNode;
+typedef Node<TestGroupStats, TestCaseNode> TestGroupNode;
+typedef Node<TestRunStats, TestGroupNode> TestRunNode;
+CumulativeReporterBase( ReporterConfig const& _config )
+:   m_config( _config.fullConfig() ),
+stream( _config.stream() )
+{
+m_reporterPrefs.shouldRedirectStdOut = false;
+}
+~CumulativeReporterBase();
+virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
+return m_reporterPrefs;
+}
+virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {}
+virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {}
+virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {}
+virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
+SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+Ptr<SectionNode> node;
+if( m_sectionStack.empty() ) {
+if( !m_rootSection )
+m_rootSection = new SectionNode( incompleteStats );
+node = m_rootSection;
+}
+else {
+SectionNode& parentNode = *m_sectionStack.back();
+SectionNode::ChildSections::const_iterator it =
+std::find_if(   parentNode.childSections.begin(),
+parentNode.childSections.end(),
+BySectionInfo( sectionInfo ) );
+if( it == parentNode.childSections.end() ) {
+node = new SectionNode( incompleteStats );
+parentNode.childSections.push_back( node );
+}
+else
+node = *it;
+}
+m_sectionStack.push_back( node );
+m_deepestSection = node;
+}
+virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
+virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
+assert( !m_sectionStack.empty() );
+SectionNode& sectionNode = *m_sectionStack.back();
+sectionNode.assertions.push_back( assertionStats );
+return true;
+}
+virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+assert( !m_sectionStack.empty() );
+SectionNode& node = *m_sectionStack.back();
+node.stats = sectionStats;
+m_sectionStack.pop_back();
+}
+virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+Ptr<TestCaseNode> node = new TestCaseNode( testCaseStats );
+assert( m_sectionStack.size() == 0 );
+node->children.push_back( m_rootSection );
+m_testCases.push_back( node );
+m_rootSection.reset();
+assert( m_deepestSection );
+m_deepestSection->stdOut = testCaseStats.stdOut;
+m_deepestSection->stdErr = testCaseStats.stdErr;
+}
+virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+Ptr<TestGroupNode> node = new TestGroupNode( testGroupStats );
+node->children.swap( m_testCases );
+m_testGroups.push_back( node );
+}
+virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+Ptr<TestRunNode> node = new TestRunNode( testRunStats );
+node->children.swap( m_testGroups );
+m_testRuns.push_back( node );
+testRunEndedCumulative();
+}
+virtual void testRunEndedCumulative() = 0;
+virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {}
+Ptr<IConfig const> m_config;
+std::ostream& stream;
+std::vector<AssertionStats> m_assertions;
+std::vector<std::vector<Ptr<SectionNode> > > m_sections;
+std::vector<Ptr<TestCaseNode> > m_testCases;
+std::vector<Ptr<TestGroupNode> > m_testGroups;
+std::vector<Ptr<TestRunNode> > m_testRuns;
+Ptr<SectionNode> m_rootSection;
+Ptr<SectionNode> m_deepestSection;
+std::vector<Ptr<SectionNode> > m_sectionStack;
+ReporterPreferences m_reporterPrefs;
+};
+template<char C>
+char const* getLineOfChars() {
+static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+if( !*line ) {
+memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+}
+return line;
+}
+struct TestEventListenerBase : StreamingReporterBase {
+TestEventListenerBase( ReporterConfig const& _config )
+:   StreamingReporterBase( _config )
+{}
+virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
+virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE {
+return false;
+}
+};
+} // end namespace Catch
+// #included from: ../internal/catch_reporter_registrars.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+namespace Catch {
+template<typename T>
+class LegacyReporterRegistrar {
+class ReporterFactory : public IReporterFactory {
+virtual IStreamingReporter* create( ReporterConfig const& config ) const {
+return new LegacyReporterAdapter( new T( config ) );
+}
+virtual std::string getDescription() const {
+return T::getDescription();
+}
+};
 public:
-CommandParser( int argc, char const * const * argv ) : m_argc( static_cast<std::size_t>( argc ) ), m_argv( argv ) {}
+LegacyReporterRegistrar( std::string const& name ) {
-Command find( const std::string& arg1,  const std::string& arg2, const std::string& arg3 ) const {
+getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
-return find( arg1 ) + find( arg2 ) + find( arg3 );
+}
-}
+};
-Command find( const std::string& shortArg, const std::string& longArg ) const {
-return find( shortArg ) + find( longArg );
-}
-Command find( const std::string& arg ) const {
-for( std::size_t i = 0; i < m_argc; ++i  )
-if( m_argv[i] == arg )
-return getArgs( i );
-return Command();
-}
-private:
-Command getArgs( std::size_t from ) const {
-Command command( m_argv[from] );
-for( std::size_t i = from+1; i < m_argc && m_argv[i][0] != '-'; ++i  )
-command += m_argv[i];
-return command;
-}
-std::size_t m_argc;
-char const * const * m_argv;
-};
-inline bool parseIntoConfig( const CommandParser& parser, Config& config ) {
-try {
-if( Command cmd = parser.find( "-l", "--list" ) ) {
-if( cmd.argsCount() > 2 )
-cmd.raiseError( "Expected upto 2 arguments" );
-List::What listSpec = List::All;
-if( cmd.argsCount() >= 1 ) {
-if( cmd[0] == "tests" )
-listSpec = List::Tests;
-else if( cmd[0] == "reporters" )
-listSpec = List::Reports;
-else
-cmd.raiseError( "Expected [tests] or [reporters]" );
-}
-if( cmd.argsCount() >= 2 ) {
-if( cmd[1] == "xml" )
-listSpec = static_cast<List::What>( listSpec | List::AsXml );
-else if( cmd[1] == "text" )
-listSpec = static_cast<List::What>( listSpec | List::AsText );
-else
-cmd.raiseError( "Expected [xml] or [text]" );
-}
-config.setListSpec( static_cast<List::What>( config.getListSpec() | listSpec ) );
-}
-if( Command cmd = parser.find( "-t", "--test" ) ) {
-if( cmd.argsCount() == 0 )
-cmd.raiseError( "Expected at least one argument" );
-for( std::size_t i = 0; i < cmd.argsCount(); ++i )
-config.addTestSpec( cmd[i] );
-}
-if( Command cmd = parser.find( "-r", "--reporter" ) ) {
-if( cmd.argsCount() != 1 )
-cmd.raiseError( "Expected one argument" );
-config.setReporter( cmd[0] );
-}
-if( Command cmd = parser.find( "-o", "--out" ) ) {
-if( cmd.argsCount() == 0 )
-cmd.raiseError( "Expected filename" );
-if( cmd[0][0] == '%' )
-config.useStream( cmd[0].substr( 1 ) );
-else
-config.setFilename( cmd[0] );
-}
-if( Command cmd = parser.find( "-s", "--success" ) ) {
-if( cmd.argsCount() != 0 )
-cmd.raiseError( "Does not accept arguments" );
-config.setIncludeWhichResults( Include::SuccessfulResults );
-}
-if( Command cmd = parser.find( "-b", "--break" ) ) {
-if( cmd.argsCount() != 0 )
-cmd.raiseError( "Does not accept arguments" );
-config.setShouldDebugBreak( true );
-}
-if( Command cmd = parser.find( "-n", "--name" ) ) {
-if( cmd.argsCount() != 1 )
-cmd.raiseError( "Expected a name" );
-config.setName( cmd[0] );
-}
-if( Command cmd = parser.find( "-h", "-?", "--help" ) ) {
-if( cmd.argsCount() != 0 )
-cmd.raiseError( "Does not accept arguments" );
-config.setShowHelp( true );
-}
-if( Command cmd = parser.find( "-a", "--abort" ) ) {
-if( cmd.argsCount() > 1 )
-cmd.raiseError( "Only accepts 0-1 arguments" );
-int threshold = 1;
-if( cmd.argsCount() == 1 )
-{
-std::stringstream ss;
-ss << cmd[0];
-ss >> threshold;
-}
-config.setCutoff( threshold );
-}
-if( Command cmd = parser.find( "-nt", "--nothrow" ) ) {
-if( cmd.argsCount() != 0 )
-cmd.raiseError( "Does not accept arguments" );
-config.setAllowThrows( false );
-}
-}
-catch( std::exception& ex ) {
-config.setError( ex.what() );
-return false;
-}
-return true;
-}
-} // end namespace Catch
-// #included from: internal/catch_list.hpp
-#include <limits>
-namespace Catch {
-inline int List( Config& config ) {
-IContext& context = getCurrentContext();
-if( config.listWhat() & List::Reports ) {
-std::cout << "Available reports:\n";
-IReporterRegistry::FactoryMap::const_iterator it = context.getReporterRegistry().getFactories().begin();
-IReporterRegistry::FactoryMap::const_iterator itEnd = context.getReporterRegistry().getFactories().end();
-for(; it != itEnd; ++it ) {
-// !TBD: consider listAs()
-std::cout << "\t" << it->first << "\n\t\t'" << it->second->getDescription() << "'\n";
-}
-std::cout << std::endl;
-}
-if( config.listWhat() & List::Tests ) {
-std::cout << "Available tests:\n";
-std::vector<TestCaseInfo>::const_iterator it = context.getTestCaseRegistry().getAllTests().begin();
-std::vector<TestCaseInfo>::const_iterator itEnd = context.getTestCaseRegistry().getAllTests().end();
-for(; it != itEnd; ++it ) {
-// !TBD: consider listAs()
-std::cout << "\t" << it->getName() << "\n\t\t '" << it->getDescription() << "'\n";
-}
-std::cout << std::endl;
-}
-if( ( config.listWhat() & List::All ) == 0 ) {
-std::cerr << "Unknown list type" << std::endl;
-return (std::numeric_limits<int>::max)();
-}
-if( config.getReporter().get() )
-std::cerr << "Reporters ignored when listing" << std::endl;
-if( !config.testsSpecified() )
-std::cerr << "Test specs ignored when listing" << std::endl;
-return 0;
-}
-} // end namespace Catch
-// #included from: reporters/catch_reporter_basic.hpp
-// #included from: ../internal/catch_reporter_registrars.hpp
-namespace Catch {
 template<typename T>
 class ReporterRegistrar {
-class ReporterFactory : public IReporterFactory {
+class ReporterFactory : public SharedImpl<IReporterFactory> {
-virtual IReporter* create( const IReporterConfig& config ) const {
+// *** Please Note ***:
+// - If you end up here looking at a compiler error because it's trying to register
+// your custom reporter class be aware that the native reporter interface has changed
+// to IStreamingReporter. The "legacy" interface, IReporter, is still supported via
+// an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter.
+// However please consider updating to the new interface as the old one is now
+// deprecated and will probably be removed quite soon!
+// Please contact me via github if you have any questions at all about this.
+// In fact, ideally, please contact me anyway to let me know you've hit this - as I have
+// no idea who is actually using custom reporters at all (possibly no-one!).
+// The new interface is designed to minimise exposure to interface changes in the future.
+virtual IStreamingReporter* create( ReporterConfig const& config ) const {
 return new T( config );
 }
 virtual std::string getDescription() const {
 return T::getDescription();
 }
 };
 public:
-ReporterRegistrar( const std::string& name ) {
+ReporterRegistrar( std::string const& name ) {
-getCurrentContext().getReporterRegistry().registerReporter( name, new ReporterFactory() );
+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 );
+}
+virtual std::string getDescription() const {
+return "";
+}
+};
+public:
+ListenerRegistrar() {
+getMutableRegistryHub().registerListener( new ListenerFactory() );
 }
 };
 }
+#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
+namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
 #define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
-Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
+namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
-namespace Catch {
+#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \
+namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; }
-struct pluralise {
-pluralise( std::size_t count, const std::string& label )
-:   m_count( count ),
-m_label( label )
-{}
-friend std::ostream& operator << ( std::ostream& os, const pluralise& pluraliser ) {
-os << pluraliser.m_count << " " << pluraliser.m_label;
-if( pluraliser.m_count != 1 )
-os << "s";
-return os;
-}
-std::size_t m_count;
-std::string m_label;
-};
-class BasicReporter : public SharedImpl<IReporter> {
-struct SpanInfo {
-SpanInfo()
-:   emitted( false )
-{}
-SpanInfo( const std::string& spanName )
-:   name( spanName ),
-emitted( false )
-{}
-SpanInfo( const SpanInfo& other )
-:   name( other.name ),
-emitted( other.emitted )
-{}
-std::string name;
-bool emitted;
-};
-public:
-BasicReporter( const IReporterConfig& config )
-:   m_config( config ),
-m_firstSectionInTestCase( true ),
-m_aborted( false )
-{}
-static std::string getDescription() {
-return "Reports test results as lines of text";
-}
-private:
-void ReportCounts( const std::string& label, const Counts& counts, const std::string& allPrefix = "All " ) {
-if( counts.passed )
-m_config.stream() << counts.failed << " of " << counts.total() << " " << label << "s failed";
-else
-m_config.stream() << ( counts.failed > 1 ? allPrefix : "" ) << pluralise( counts.failed, label ) << " failed";
-}
-void ReportCounts( const Totals& totals, const std::string& allPrefix = "All " ) {
-if( totals.assertions.total() == 0 ) {
-m_config.stream() << "No tests ran";
-}
-else if( totals.assertions.failed ) {
-TextColour colour( TextColour::ResultError );
-ReportCounts( "test case", totals.testCases, allPrefix );
-if( totals.testCases.failed > 0 ) {
-m_config.stream() << " (";
-ReportCounts( "assertion", totals.assertions, allPrefix );
-m_config.stream() << ")";
-}
-}
-else {
-TextColour colour( TextColour::ResultSuccess );
-m_config.stream()   << allPrefix << "tests passed ("
-<< pluralise( totals.assertions.passed, "assertion" ) << " in "
-<< pluralise( totals.testCases.passed, "test case" ) << ")";
-}
-}
-private: // IReporter
-virtual bool shouldRedirectStdout() const {
-return false;
-}
-virtual void StartTesting() {
-m_testingSpan = SpanInfo();
-}
-virtual void Aborted() {
-m_aborted = true;
-}
-virtual void EndTesting( const Totals& totals ) {
-// Output the overall test results even if "Started Testing" was not emitted
-if( m_aborted ) {
-m_config.stream() << "\n[Testing aborted. ";
-ReportCounts( totals, "The first " );
-}
-else {
-m_config.stream() << "\n[Testing completed. ";
-ReportCounts( totals );
-}
-m_config.stream() << "]\n" << std::endl;
-}
-virtual void StartGroup( const std::string& groupName ) {
-m_groupSpan = groupName;
-}
-virtual void EndGroup( const std::string& groupName, const Totals& totals ) {
-if( m_groupSpan.emitted && !groupName.empty() ) {
-m_config.stream() << "[End of group: '" << groupName << "'. ";
-ReportCounts( totals );
-m_config.stream() << "]\n" << std::endl;
-m_groupSpan = SpanInfo();
-}
-}
-virtual void StartTestCase( const TestCaseInfo& testInfo ) {
-m_testSpan = testInfo.getName();
-}
-virtual void StartSection( const std::string& sectionName, const std::string& ) {
-m_sectionSpans.push_back( SpanInfo( sectionName ) );
-}
-virtual void EndSection( const std::string& sectionName, const Counts& assertions ) {
-SpanInfo& sectionSpan = m_sectionSpans.back();
-if( sectionSpan.emitted && !sectionSpan.name.empty() ) {
-m_config.stream() << "[End of section: '" << sectionName << "' ";
-if( assertions.failed ) {
-TextColour colour( TextColour::ResultError );
-ReportCounts( "assertion", assertions);
-}
-else {
-TextColour colour( TextColour::ResultSuccess );
-m_config.stream()   << ( assertions.passed > 1 ? "All " : "" )
-<< pluralise( assertions.passed, "assertion" ) << "passed" ;
-}
-m_config.stream() << "]\n" << std::endl;
-}
-m_sectionSpans.pop_back();
-}
-virtual void Result( const ResultInfo& resultInfo ) {
-if( !m_config.includeSuccessfulResults() && resultInfo.getResultType() == ResultWas::Ok )
-return;
-StartSpansLazily();
-if( !resultInfo.getFilename().empty() ) {
-TextColour colour( TextColour::FileName );
-m_config.stream() << SourceLineInfo( resultInfo.getFilename(), resultInfo.getLine() );
-}
-if( resultInfo.hasExpression() ) {
-TextColour colour( TextColour::OriginalExpression );
-m_config.stream() << resultInfo.getExpression();
-if( resultInfo.ok() ) {
-TextColour successColour( TextColour::Success );
-m_config.stream() << " succeeded";
-}
-else {
-TextColour errorColour( TextColour::Error );
-m_config.stream() << " failed";
-}
-}
-switch( resultInfo.getResultType() ) {
-case ResultWas::ThrewException:
-{
-TextColour colour( TextColour::Error );
-if( resultInfo.hasExpression() )
-m_config.stream() << " with unexpected";
-else
-m_config.stream() << "Unexpected";
-m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'";
-}
-break;
-case ResultWas::DidntThrowException:
-{
-TextColour colour( TextColour::Error );
-if( resultInfo.hasExpression() )
-m_config.stream() << " because no exception was thrown where one was expected";
-else
-m_config.stream() << "No exception thrown where one was expected";
-}
-break;
-case ResultWas::Info:
-streamVariableLengthText( "info", resultInfo.getMessage() );
-break;
-case ResultWas::Warning:
-m_config.stream() << "warning:\n'" << resultInfo.getMessage() << "'";
-break;
-case ResultWas::ExplicitFailure:
-{
-TextColour colour( TextColour::Error );
-m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
-}
-break;
-case ResultWas::Unknown: // These cases are here to prevent compiler warnings
-case ResultWas::Ok:
-case ResultWas::FailureBit:
-case ResultWas::ExpressionFailed:
-case ResultWas::Exception:
-default:
-if( !resultInfo.hasExpression() ) {
-if( resultInfo.ok() ) {
-TextColour colour( TextColour::Success );
-m_config.stream() << " succeeded";
-}
-else {
-TextColour colour( TextColour::Error );
-m_config.stream() << " failed";
-}
-}
-break;
-}
-if( resultInfo.hasExpandedExpression() ) {
-m_config.stream() << " for: ";
-TextColour colour( TextColour::ReconstructedExpression );
-m_config.stream() << resultInfo.getExpandedExpression();
-}
-m_config.stream() << std::endl;
-}
-virtual void EndTestCase(   const TestCaseInfo& testInfo,
-const Totals& totals,
-const std::string& stdOut,
-const std::string& stdErr ) {
-if( !stdOut.empty() ) {
-StartSpansLazily();
-streamVariableLengthText( "stdout", stdOut );
-}
-if( !stdErr.empty() ) {
-StartSpansLazily();
-streamVariableLengthText( "stderr", stdErr );
-}
-if( m_testSpan.emitted ) {
-m_config.stream() << "[Finished: '" << testInfo.getName() << "' ";
-ReportCounts( totals );
-m_config.stream() << "]" << std::endl;
-}
-}
-private: // helpers
-void StartSpansLazily() {
-if( !m_testingSpan.emitted ) {
-if( m_config.getName().empty() )
-m_config.stream() << "[Started testing]" << std::endl;
-else
-m_config.stream() << "[Started testing: " << m_config.getName() << "]" << std::endl;
-m_testingSpan.emitted = true;
-}
-if( !m_groupSpan.emitted && !m_groupSpan.name.empty() ) {
-m_config.stream() << "[Started group: '" << m_groupSpan.name << "']" << std::endl;
-m_groupSpan.emitted = true;
-}
-if( !m_testSpan.emitted ) {
-m_config.stream() << std::endl << "[Running: " << m_testSpan.name << "]" << std::endl;
-m_testSpan.emitted = true;
-}
-if( !m_sectionSpans.empty() ) {
-SpanInfo& sectionSpan = m_sectionSpans.back();
-if( !sectionSpan.emitted && !sectionSpan.name.empty() ) {
-if( m_firstSectionInTestCase ) {
-m_config.stream() << "\n";
-m_firstSectionInTestCase = false;
-}
-std::vector<SpanInfo>::iterator it = m_sectionSpans.begin();
-std::vector<SpanInfo>::iterator itEnd = m_sectionSpans.end();
-for(; it != itEnd; ++it ) {
-SpanInfo& prevSpan = *it;
-if( !prevSpan.emitted && !prevSpan.name.empty() ) {
-m_config.stream() << "[Started section: '" << prevSpan.name << "']" << std::endl;
-prevSpan.emitted = true;
-}
-}
-}
-}
-}
-void streamVariableLengthText( const std::string& prefix, const std::string& text ) {
-std::string trimmed = trim( text );
-if( trimmed.find_first_of( "\r\n" ) == std::string::npos ) {
-m_config.stream() << "[" << prefix << ": " << trimmed << "]\n";
-}
-else {
-m_config.stream() << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed
-<< "\n[end of " << prefix << "] <<<<<<<<<<<<<<<<<<<<<<<<\n";
-}
-}
-private:
-const IReporterConfig& m_config;
-bool m_firstSectionInTestCase;
-SpanInfo m_testingSpan;
-SpanInfo m_groupSpan;
-SpanInfo m_testSpan;
-std::vector<SpanInfo> m_sectionSpans;
-bool m_aborted;
-};
-} // end namespace Catch
-// #included from: reporters/catch_reporter_xml.hpp
 // #included from: ../internal/catch_xmlwriter.hpp
+#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
 #include <sstream>
 #include <string>
 #include <vector>
+#include <iomanip>
 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] == ']' )
+os << "&gt;";
+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' )
+os << "&#x" << std::uppercase << std::hex << static_cast<int>( c );
+else
+os << c;
+}
+}
+}
+friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+xmlEncode.encodeTo( os );
+return os;
+}
+private:
+std::string m_str;
+ForWhat m_forWhat;
+};
 class XmlWriter {
 public:
 class ScopedElement {
 public:
 ScopedElement( XmlWriter* writer )
 :   m_writer( writer )
 {}
-ScopedElement( const ScopedElement& other )
+ScopedElement( ScopedElement const& other )
 :   m_writer( other.m_writer ){
-other.m_writer = NULL;
+other.m_writer = CATCH_NULL;
 }
 ~ScopedElement() {
 if( m_writer )
 m_writer->endElement();
 }
-ScopedElement& writeText( const std::string& text ) {
+ScopedElement& writeText( std::string const& text, bool indent = true ) {
-m_writer->writeText( text );
+m_writer->writeText( text, indent );
 return *this;
 }
 template<typename T>
-ScopedElement& writeAttribute( const std::string& name, const T& attribute ) {
+ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
 m_writer->writeAttribute( name, attribute );
 return *this;
 }
 private:
 };
 XmlWriter()
 :   m_tagIsOpen( false ),
 m_needsNewline( false ),
-m_os( &std::cout )
+m_os( &Catch::cout() )
 {}
 XmlWriter( std::ostream& os )
 :   m_tagIsOpen( false ),
 m_needsNewline( false ),
 ~XmlWriter() {
 while( !m_tags.empty() )
 endElement();
 }
-XmlWriter& operator = ( const XmlWriter& other ) {
+XmlWriter& startElement( std::string const& name ) {
-XmlWriter temp( other );
-swap( temp );
-return *this;
-}
-void swap( XmlWriter& other ) {
-std::swap( m_tagIsOpen, other.m_tagIsOpen );
-std::swap( m_needsNewline, other.m_needsNewline );
-std::swap( m_tags, other.m_tags );
-std::swap( m_indent, other.m_indent );
-std::swap( m_os, other.m_os );
-}
-XmlWriter& startElement( const std::string& name ) {
 ensureTagClosed();
 newlineIfNecessary();
 stream() << m_indent << "<" << name;
 m_tags.push_back( name );
 m_indent += "  ";
 m_tagIsOpen = true;
 return *this;
 }
-ScopedElement scopedElement( const std::string& name ) {
+ScopedElement scopedElement( std::string const& name ) {
 ScopedElement scoped( this );
 startElement( name );
 return scoped;
 }
 }
 m_tags.pop_back();
 return *this;
 }
-XmlWriter& writeAttribute( const std::string& name, const std::string& attribute ) {
+XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) {
-if( !name.empty() && !attribute.empty() ) {
+if( !name.empty() && !attribute.empty() )
-stream() << " " << name << "=\"";
+stream() << " " << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << "\"";
-writeEncodedText( attribute );
-stream() << "\"";
-}
 return *this;
 }
-XmlWriter& writeAttribute( const std::string& name, bool attribute ) {
+XmlWriter& writeAttribute( std::string const& name, bool attribute ) {
 stream() << " " << name << "=\"" << ( attribute ? "true" : "false" ) << "\"";
 return *this;
 }
 template<typename T>
-XmlWriter& writeAttribute( const std::string& name, const T& attribute ) {
+XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-if( !name.empty() )
+std::ostringstream oss;
-stream() << " " << name << "=\"" << attribute << "\"";
+oss << attribute;
-return *this;
+return writeAttribute( name, oss.str() );
 }
-XmlWriter& writeText( const std::string& text ) {
+XmlWriter& writeText( std::string const& text, bool indent = true ) {
 if( !text.empty() ){
 bool tagWasOpen = m_tagIsOpen;
 ensureTagClosed();
-if( tagWasOpen )
+if( tagWasOpen && indent )
 stream() << m_indent;
-writeEncodedText( text );
+stream() << XmlEncode( text );
 m_needsNewline = true;
 }
 return *this;
 }
-XmlWriter& writeComment( const std::string& text ) {
+XmlWriter& writeComment( std::string const& text ) {
 ensureTagClosed();
 stream() << m_indent << "<!--" << text << "-->";
 m_needsNewline = true;
 return *this;
 }
 ensureTagClosed();
 stream() << "\n";
 return *this;
 }
+void setStream( std::ostream& os ) {
+m_os = &os;
+}
 private:
+XmlWriter( XmlWriter const& );
+void operator=( XmlWriter const& );
 std::ostream& stream() {
 return *m_os;
 }
 void newlineIfNecessary() {
 if( m_needsNewline ) {
 stream() << "\n";
 m_needsNewline = false;
 }
-}
-void writeEncodedText( const std::string& text ) {
-static const char* charsToEncode = "<&\"";
-std::string mtext = text;
-std::string::size_type pos = mtext.find_first_of( charsToEncode );
-while( pos != std::string::npos ) {
-stream() << mtext.substr( 0, pos );
-switch( mtext[pos] ) {
-case '<':
-stream() << "&lt;";
-break;
-case '&':
-stream() << "&amp;";
-break;
-case '\"':
-stream() << "&quot;";
-break;
-}
-mtext = mtext.substr( pos+1 );
-pos = mtext.find_first_of( charsToEncode );
-}
-stream() << mtext;
 }
 bool m_tagIsOpen;
 bool m_needsNewline;
 std::vector<std::string> m_tags;
 std::string m_indent;
 std::ostream* m_os;
 };
 }
+// #included from: catch_reenable_warnings.h
+#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
 namespace Catch {
-class XmlReporter : public SharedImpl<IReporter> {
+class XmlReporter : public StreamingReporterBase {
 public:
-XmlReporter( const IReporterConfig& config ) : m_config( config ) {}
+XmlReporter( ReporterConfig const& _config )
+:   StreamingReporterBase( _config ),
+m_sectionDepth( 0 )
+{
+m_reporterPrefs.shouldRedirectStdOut = true;
+}
+virtual ~XmlReporter() CATCH_OVERRIDE;
 static std::string getDescription() {
 return "Reports test results as an XML document";
 }
-private: // IReporter
+public: // StreamingReporterBase
-virtual bool shouldRedirectStdout() const {
+virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE {
-return true;
+StreamingReporterBase::noMatchingTestCases( s );
 }
-virtual void StartTesting() {
+virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE {
-m_xml = XmlWriter( m_config.stream() );
+StreamingReporterBase::testRunStarting( testInfo );
+m_xml.setStream( stream );
 m_xml.startElement( "Catch" );
-if( !m_config.getName().empty() )
+if( !m_config->name().empty() )
-m_xml.writeAttribute( "name", m_config.getName() );
+m_xml.writeAttribute( "name", m_config->name() );
 }
-virtual void EndTesting( const Totals& totals ) {
+virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
-m_xml.scopedElement( "OverallResults" )
+StreamingReporterBase::testGroupStarting( groupInfo );
-.writeAttribute( "successes", totals.assertions.passed )
-.writeAttribute( "failures", totals.assertions.failed );
-m_xml.endElement();
-}
-virtual void StartGroup( const std::string& groupName ) {
 m_xml.startElement( "Group" )
-.writeAttribute( "name", groupName );
+.writeAttribute( "name", groupInfo.name );
 }
-virtual void EndGroup( const std::string&, const Totals& totals ) {
+virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
-m_xml.scopedElement( "OverallResults" )
+StreamingReporterBase::testCaseStarting(testInfo);
-.writeAttribute( "successes", totals.assertions.passed )
+m_xml.startElement( "TestCase" ).writeAttribute( "name", trim( testInfo.name ) );
-.writeAttribute( "failures", totals.assertions.failed );
-m_xml.endElement();
+if ( m_config->showDurations() == ShowDurations::Always )
-}
+m_testCaseTimer.start();
+}
-virtual void StartSection( const std::string& sectionName, const std::string& description ) {
-m_xml.startElement( "Section" )
+virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
-.writeAttribute( "name", sectionName )
+StreamingReporterBase::sectionStarting( sectionInfo );
-.writeAttribute( "description", description );
+if( m_sectionDepth++ > 0 ) {
-}
+m_xml.startElement( "Section" )
+.writeAttribute( "name", trim( sectionInfo.name ) )
-virtual void EndSection( const std::string& /*sectionName*/, const Counts& assertions ) {
+.writeAttribute( "description", sectionInfo.description );
-m_xml.scopedElement( "OverallResults" )
+}
-.writeAttribute( "successes", assertions.passed )
+}
-.writeAttribute( "failures", assertions.failed );
-m_xml.endElement();
+virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { }
-}
+virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) {
+const AssertionResult& assertionResult = assertionStats.assertionResult;
-m_xml.startElement( "TestCase" ).writeAttribute( "name", testInfo.getName() );
-m_currentTestSuccess = true;
+// 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();
-virtual void Result( const Catch::ResultInfo& resultInfo ) {
+it != itEnd;
-if( !m_config.includeSuccessfulResults() && resultInfo.getResultType() == ResultWas::Ok )
+++it ) {
-return;
+if( it->type == ResultWas::Info ) {
+m_xml.scopedElement( "Info" )
-if( resultInfo.hasExpression() ) {
+.writeText( it->message );
+} else if ( it->type == ResultWas::Warning ) {
+m_xml.scopedElement( "Warning" )
+.writeText( it->message );
+}
+}
+}
+// Drop out if result was successful but we're not printing them.
+if( !m_config->includeSuccessfulResults() && isOk(assertionResult.getResultType()) )
+return true;
+// Print the expression if there is one.
+if( assertionResult.hasExpression() ) {
 m_xml.startElement( "Expression" )
-.writeAttribute( "success", resultInfo.ok() )
+.writeAttribute( "success", assertionResult.succeeded() )
-.writeAttribute( "filename", resultInfo.getFilename() )
+					.writeAttribute( "type", assertionResult.getTestMacroName() )
-.writeAttribute( "line", resultInfo.getLine() );
+.writeAttribute( "filename", assertionResult.getSourceInfo().file )
+.writeAttribute( "line", assertionResult.getSourceInfo().line );
 m_xml.scopedElement( "Original" )
-.writeText( resultInfo.getExpression() );
+.writeText( assertionResult.getExpression() );
 m_xml.scopedElement( "Expanded" )
-.writeText( resultInfo.getExpandedExpression() );
+.writeText( assertionResult.getExpandedExpression() );
-m_currentTestSuccess &= resultInfo.ok();
+}
-}
+// And... Print a result applicable to each result type.
-switch( resultInfo.getResultType() ) {
+switch( assertionResult.getResultType() ) {
 case ResultWas::ThrewException:
 m_xml.scopedElement( "Exception" )
-.writeAttribute( "filename", resultInfo.getFilename() )
+.writeAttribute( "filename", assertionResult.getSourceInfo().file )
-.writeAttribute( "line", resultInfo.getLine() )
+.writeAttribute( "line", assertionResult.getSourceInfo().line )
-.writeText( resultInfo.getMessage() );
+.writeText( assertionResult.getMessage() );
-m_currentTestSuccess = false;
+break;
+case ResultWas::FatalErrorCondition:
+m_xml.scopedElement( "Fatal Error Condition" )
+.writeAttribute( "filename", assertionResult.getSourceInfo().file )
+.writeAttribute( "line", assertionResult.getSourceInfo().line )
+.writeText( assertionResult.getMessage() );
 break;
 case ResultWas::Info:
 m_xml.scopedElement( "Info" )
-.writeText( resultInfo.getMessage() );
+.writeText( assertionResult.getMessage() );
 break;
 case ResultWas::Warning:
-m_xml.scopedElement( "Warning" )
+// Warning will already have been written
-.writeText( resultInfo.getMessage() );
 break;
 case ResultWas::ExplicitFailure:
 m_xml.scopedElement( "Failure" )
-.writeText( resultInfo.getMessage() );
+.writeText( assertionResult.getMessage() );
-m_currentTestSuccess = false;
 break;
-case ResultWas::Unknown:
-case ResultWas::Ok:
-case ResultWas::FailureBit:
-case ResultWas::ExpressionFailed:
-case ResultWas::Exception:
-case ResultWas::DidntThrowException:
 default:
 break;
 }
-if( resultInfo.hasExpression() )
+if( assertionResult.hasExpression() )
 m_xml.endElement();
-}
+return true;
-virtual void Aborted() {
+}
-// !TBD
-}
+virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+StreamingReporterBase::sectionEnded( sectionStats );
-virtual void EndTestCase( const Catch::TestCaseInfo&, const Totals&, const std::string&, const std::string& ) {
+if( --m_sectionDepth > 0 ) {
-m_xml.scopedElement( "OverallResult" ).writeAttribute( "success", m_currentTestSuccess );
+XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+e.writeAttribute( "successes", sectionStats.assertions.passed );
+e.writeAttribute( "failures", sectionStats.assertions.failed );
+e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+if ( m_config->showDurations() == ShowDurations::Always )
+e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+m_xml.endElement();
+}
+}
+virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+StreamingReporterBase::testCaseEnded( testCaseStats );
+XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+if ( m_config->showDurations() == ShowDurations::Always )
+e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
 m_xml.endElement();
 }
+virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+StreamingReporterBase::testGroupEnded( testGroupStats );
+// TODO: Check testGroupStats.aborting and act accordingly.
+m_xml.scopedElement( "OverallResults" )
+.writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+.writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+.writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+m_xml.endElement();
+}
+virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+StreamingReporterBase::testRunEnded( testRunStats );
+m_xml.scopedElement( "OverallResults" )
+.writeAttribute( "successes", testRunStats.totals.assertions.passed )
+.writeAttribute( "failures", testRunStats.totals.assertions.failed )
+.writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+m_xml.endElement();
+}
 private:
-const IReporterConfig& m_config;
+Timer m_testCaseTimer;
-bool m_currentTestSuccess;
 XmlWriter m_xml;
-};
+int m_sectionDepth;
+};
+INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
 } // end namespace Catch
-// #included from: reporters/catch_reporter_junit.hpp
+// #included from: ../reporters/catch_reporter_junit.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
+#include <assert.h>
 namespace Catch {
-class JunitReporter : public SharedImpl<IReporter> {
+class JunitReporter : public CumulativeReporterBase {
-struct TestStats {
-std::string m_element;
-std::string m_resultType;
-std::string m_message;
-std::string m_content;
-};
-struct TestCaseStats {
-TestCaseStats( const std::string& name = std::string() ) :m_name( name ){}
-double      m_timeInSeconds;
-std::string m_status;
-std::string m_className;
-std::string m_name;
-std::vector<TestStats> m_testStats;
-};
-struct Stats {
-Stats( const std::string& name = std::string() )
-:   m_testsCount( 0 ),
-m_failuresCount( 0 ),
-m_disabledCount( 0 ),
-m_errorsCount( 0 ),
-m_timeInSeconds( 0 ),
-m_name( name )
-{}
-std::size_t m_testsCount;
-std::size_t m_failuresCount;
-std::size_t m_disabledCount;
-std::size_t m_errorsCount;
-double      m_timeInSeconds;
-std::string m_name;
-std::vector<TestCaseStats> m_testCaseStats;
-};
 public:
-JunitReporter( const IReporterConfig& config )
+JunitReporter( ReporterConfig const& _config )
-:   m_config( config ),
+:   CumulativeReporterBase( _config ),
-m_testSuiteStats( "AllTests" ),
+xml( _config.stream() )
-m_currentStats( &m_testSuiteStats )
+{
-{}
+m_reporterPrefs.shouldRedirectStdOut = true;
+}
+virtual ~JunitReporter() CATCH_OVERRIDE;
 static std::string getDescription() {
 return "Reports test results in an XML format that looks like Ant's junitreport target";
 }
-private: // IReporter
+virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {}
-virtual bool shouldRedirectStdout() const {
+virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE {
-return true;
+CumulativeReporterBase::testRunStarting( runInfo );
-}
+xml.startElement( "testsuites" );
+}
-virtual void StartTesting(){}
+virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
-virtual void StartGroup( const std::string& groupName ) {
+suiteTimer.start();
-m_statsForSuites.push_back( Stats( groupName ) );
+stdOutForSuite.str("");
-m_currentStats = &m_statsForSuites.back();
+stdErrForSuite.str("");
-}
+unexpectedExceptions = 0;
+CumulativeReporterBase::testGroupStarting( groupInfo );
-virtual void EndGroup( const std::string&, const Totals& totals ) {
+}
-m_currentStats->m_testsCount = totals.assertions.total();
-m_currentStats = &m_testSuiteStats;
+virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
-}
+if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException )
+unexpectedExceptions++;
-virtual void StartSection( const std::string&, const std::string& ){}
+return CumulativeReporterBase::assertionEnded( assertionStats );
+}
-virtual void EndSection( const std::string&, const Counts& ){}
+virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
-virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) {
+stdOutForSuite << testCaseStats.stdOut;
-m_currentStats->m_testCaseStats.push_back( TestCaseStats( testInfo.getName() ) );
+stdErrForSuite << testCaseStats.stdErr;
-}
+CumulativeReporterBase::testCaseEnded( testCaseStats );
+}
-virtual void Result( const Catch::ResultInfo& resultInfo ) {
-if( resultInfo.getResultType() != ResultWas::Ok || m_config.includeSuccessfulResults() ) {
+virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
-TestCaseStats& testCaseStats = m_currentStats->m_testCaseStats.back();
+double suiteTime = suiteTimer.getElapsedSeconds();
-TestStats stats;
+CumulativeReporterBase::testGroupEnded( testGroupStats );
-std::ostringstream oss;
+writeGroup( *m_testGroups.back(), suiteTime );
-if( !resultInfo.getMessage().empty() )
+}
-oss << resultInfo.getMessage() << " at ";
-oss << SourceLineInfo( resultInfo.getFilename(), resultInfo.getLine() );
+virtual void testRunEndedCumulative() CATCH_OVERRIDE {
-stats.m_content = oss.str();
+xml.endElement();
-stats.m_message = resultInfo.getExpandedExpression();
+}
-stats.m_resultType = resultInfo.getTestMacroName();
+void writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-switch( resultInfo.getResultType() ) {
+XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+TestGroupStats const& stats = groupNode.value;
+xml.writeAttribute( "name", stats.groupInfo.name );
+xml.writeAttribute( "errors", unexpectedExceptions );
+xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+xml.writeAttribute( "tests", stats.totals.assertions.total() );
+xml.writeAttribute( "hostname", "tbd" ); // !TBD
+if( m_config->showDurations() == ShowDurations::Never )
+xml.writeAttribute( "time", "" );
+else
+xml.writeAttribute( "time", suiteTime );
+xml.writeAttribute( "timestamp", "tbd" ); // !TBD
+// Write test cases
+for( TestGroupNode::ChildNodes::const_iterator
+it = groupNode.children.begin(), itEnd = groupNode.children.end();
+it != itEnd;
+++it )
+writeTestCase( **it );
+xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false );
+xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false );
+}
+void writeTestCase( TestCaseNode const& testCaseNode ) {
+TestCaseStats const& stats = testCaseNode.value;
+// All test cases have exactly one section - which represents the
+// test case itself. That section may have 0-n nested sections
+assert( testCaseNode.children.size() == 1 );
+SectionNode const& rootSection = *testCaseNode.children.front();
+std::string className = stats.testInfo.className;
+if( className.empty() ) {
+if( rootSection.childSections.empty() )
+className = "global";
+}
+writeSection( className, "", rootSection );
+}
+void writeSection(  std::string const& className,
+std::string const& rootName,
+SectionNode const& sectionNode ) {
+std::string name = trim( sectionNode.stats.sectionInfo.name );
+if( !rootName.empty() )
+name = rootName + "/" + name;
+if( !sectionNode.assertions.empty() ||
+!sectionNode.stdOut.empty() ||
+!sectionNode.stdErr.empty() ) {
+XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+if( className.empty() ) {
+xml.writeAttribute( "classname", name );
+xml.writeAttribute( "name", "root" );
+}
+else {
+xml.writeAttribute( "classname", className );
+xml.writeAttribute( "name", name );
+}
+xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) );
+writeAssertions( sectionNode );
+if( !sectionNode.stdOut.empty() )
+xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
+if( !sectionNode.stdErr.empty() )
+xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
+}
+for( SectionNode::ChildSections::const_iterator
+it = sectionNode.childSections.begin(),
+itEnd = sectionNode.childSections.end();
+it != itEnd;
+++it )
+if( className.empty() )
+writeSection( name, "", **it );
+else
+writeSection( className, name, **it );
+}
+void writeAssertions( SectionNode const& sectionNode ) {
+for( SectionNode::Assertions::const_iterator
+it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end();
+it != itEnd;
+++it )
+writeAssertion( *it );
+}
+void writeAssertion( AssertionStats const& stats ) {
+AssertionResult const& result = stats.assertionResult;
+if( !result.isOk() ) {
+std::string elementName;
+switch( result.getResultType() ) {
 case ResultWas::ThrewException:
-stats.m_element = "error";
+case ResultWas::FatalErrorCondition:
-m_currentStats->m_errorsCount++;
+elementName = "error";
-break;
-case ResultWas::Info:
-stats.m_element = "info"; // !TBD ?
-break;
-case ResultWas::Warning:
-stats.m_element = "warning"; // !TBD ?
 break;
 case ResultWas::ExplicitFailure:
-stats.m_element = "failure";
+elementName = "failure";
-m_currentStats->m_failuresCount++;
 break;
 case ResultWas::ExpressionFailed:
-stats.m_element = "failure";
+elementName = "failure";
-m_currentStats->m_failuresCount++;
 break;
+case ResultWas::DidntThrowException:
+elementName = "failure";
+break;
+// We should never see these here:
+case ResultWas::Info:
+case ResultWas::Warning:
 case ResultWas::Ok:
-stats.m_element = "success";
-break;
 case ResultWas::Unknown:
 case ResultWas::FailureBit:
 case ResultWas::Exception:
-case ResultWas::DidntThrowException:
+elementName = "internalError";
-default:
-stats.m_element = "unknown";
 break;
 }
-testCaseStats.m_testStats.push_back( stats );
-}
+XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-}
+xml.writeAttribute( "message", result.getExpandedExpression() );
-virtual void EndTestCase( const Catch::TestCaseInfo&, const Totals&, const std::string& stdOut, const std::string& stdErr ) {
+xml.writeAttribute( "type", result.getTestMacroName() );
-if( !stdOut.empty() )
-m_stdOut << stdOut << "\n";
+std::ostringstream oss;
-if( !stdErr.empty() )
+if( !result.getMessage().empty() )
-m_stdErr << stdErr << "\n";
+oss << result.getMessage() << "\n";
-}
+for( std::vector<MessageInfo>::const_iterator
+it = stats.infoMessages.begin(),
-virtual void Aborted() {
+itEnd = stats.infoMessages.end();
-// !TBD
+it != itEnd;
-}
+++it )
+if( it->type == ResultWas::Info )
-virtual void EndTesting( const Totals& ) {
+oss << it->message << "\n";
-std::ostream& str = m_config.stream();
+oss << "at " << result.getSourceInfo();
+xml.writeText( oss.str(), false );
+}
+}
+XmlWriter xml;
+Timer suiteTimer;
+std::ostringstream stdOutForSuite;
+std::ostringstream stdErrForSuite;
+unsigned int unexpectedExceptions;
+};
+INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+} // end namespace Catch
+// #included from: ../reporters/catch_reporter_console.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+namespace Catch {
+struct ConsoleReporter : StreamingReporterBase {
+ConsoleReporter( ReporterConfig const& _config )
+:   StreamingReporterBase( _config ),
+m_headerPrinted( false )
+{}
+virtual ~ConsoleReporter() CATCH_OVERRIDE;
+static std::string getDescription() {
+return "Reports test results as plain lines of text";
+}
+virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
+stream << "No test cases matched '" << spec << "'" << std::endl;
+}
+virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {
+}
+virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE {
+AssertionResult const& result = _assertionStats.assertionResult;
+bool printInfoMessages = true;
+// Drop out if result was successful and we're not printing those
+if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+if( result.getResultType() != ResultWas::Warning )
+return false;
+printInfoMessages = false;
+}
+lazyPrint();
+AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+printer.print();
+stream << std::endl;
+return true;
+}
+virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
+m_headerPrinted = false;
+StreamingReporterBase::sectionStarting( _sectionInfo );
+}
+virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE {
+if( _sectionStats.missingAssertions ) {
+lazyPrint();
+Colour colour( Colour::ResultError );
+if( m_sectionStack.size() > 1 )
+stream << "\nNo assertions in section";
+else
+stream << "\nNo assertions in test case";
+stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+}
+if( m_headerPrinted ) {
+if( m_config->showDurations() == ShowDurations::Always )
+stream << "Completed in " << _sectionStats.durationInSeconds << "s" << std::endl;
+m_headerPrinted = false;
+}
+else {
+if( m_config->showDurations() == ShowDurations::Always )
+stream << _sectionStats.sectionInfo.name << " completed in " << _sectionStats.durationInSeconds << "s" << std::endl;
+}
+StreamingReporterBase::sectionEnded( _sectionStats );
+}
+virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE {
+StreamingReporterBase::testCaseEnded( _testCaseStats );
+m_headerPrinted = false;
+}
+virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE {
+if( currentGroupInfo.used ) {
+printSummaryDivider();
+stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+printTotals( _testGroupStats.totals );
+stream << "\n" << std::endl;
+}
+StreamingReporterBase::testGroupEnded( _testGroupStats );
+}
+virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE {
+printTotalsDivider( _testRunStats.totals );
+printTotals( _testRunStats.totals );
+stream << std::endl;
+StreamingReporterBase::testRunEnded( _testRunStats );
+}
+private:
+class AssertionPrinter {
+void operator= ( AssertionPrinter const& );
+public:
+AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
+:   stream( _stream ),
+stats( _stats ),
+result( _stats.assertionResult ),
+colour( Colour::None ),
+message( result.getMessage() ),
+messages( _stats.infoMessages ),
+printInfoMessages( _printInfoMessages )
 {
-XmlWriter xml( str );
+switch( result.getResultType() ) {
+case ResultWas::Ok:
-if( m_statsForSuites.size() > 0 )
+colour = Colour::Success;
-xml.startElement( "testsuites" );
+passOrFail = "PASSED";
+//if( result.hasMessage() )
-std::vector<Stats>::const_iterator it = m_statsForSuites.begin();
+if( _stats.infoMessages.size() == 1 )
-std::vector<Stats>::const_iterator itEnd = m_statsForSuites.end();
+messageLabel = "with message";
+if( _stats.infoMessages.size() > 1 )
-for(; it != itEnd; ++it ) {
+messageLabel = "with messages";
-XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+break;
-xml.writeAttribute( "name", it->m_name );
+case ResultWas::ExpressionFailed:
-xml.writeAttribute( "errors", it->m_errorsCount );
+if( result.isOk() ) {
-xml.writeAttribute( "failures", it->m_failuresCount );
+colour = Colour::Success;
-xml.writeAttribute( "tests", it->m_testsCount );
+passOrFail = "FAILED - but was ok";
-xml.writeAttribute( "hostname", "tbd" );
+}
-xml.writeAttribute( "time", "tbd" );
+else {
-xml.writeAttribute( "timestamp", "tbd" );
+colour = Colour::Error;
+passOrFail = "FAILED";
-OutputTestCases( xml, *it );
+}
+if( _stats.infoMessages.size() == 1 )
+messageLabel = "with message";
+if( _stats.infoMessages.size() > 1 )
+messageLabel = "with messages";
+break;
+case ResultWas::ThrewException:
+colour = Colour::Error;
+passOrFail = "FAILED";
+messageLabel = "due to unexpected exception with message";
+break;
+case ResultWas::FatalErrorCondition:
+colour = Colour::Error;
+passOrFail = "FAILED";
+messageLabel = "due to a fatal error condition";
+break;
+case ResultWas::DidntThrowException:
+colour = Colour::Error;
+passOrFail = "FAILED";
+messageLabel = "because no exception was thrown where one was expected";
+break;
+case ResultWas::Info:
+messageLabel = "info";
+break;
+case ResultWas::Warning:
+messageLabel = "warning";
+break;
+case ResultWas::ExplicitFailure:
+passOrFail = "FAILED";
+colour = Colour::Error;
+if( _stats.infoMessages.size() == 1 )
+messageLabel = "explicitly with message";
+if( _stats.infoMessages.size() > 1 )
+messageLabel = "explicitly with messages";
+break;
+// These cases are here to prevent compiler warnings
+case ResultWas::Unknown:
+case ResultWas::FailureBit:
+case ResultWas::Exception:
+passOrFail = "** internal error **";
+colour = Colour::Error;
+break;
 }
+}
-xml.scopedElement( "system-out" ).writeText( trim( m_stdOut.str() ) );
-xml.scopedElement( "system-err" ).writeText( trim( m_stdErr.str() ) );
+void print() const {
-}
+printSourceInfo();
-}
+if( stats.totals.assertions.total() > 0 ) {
+if( result.isOk() )
-void OutputTestCases( XmlWriter& xml, const Stats& stats ) {
+stream << "\n";
-std::vector<TestCaseStats>::const_iterator it = stats.m_testCaseStats.begin();
+printResultType();
-std::vector<TestCaseStats>::const_iterator itEnd = stats.m_testCaseStats.end();
+printOriginalExpression();
-for(; it != itEnd; ++it ) {
+printReconstructedExpression();
-xml.writeBlankLine();
-xml.writeComment( "Test case" );
-XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-xml.writeAttribute( "classname", it->m_className );
-xml.writeAttribute( "name", it->m_name );
-xml.writeAttribute( "time", "tbd" );
-OutputTestResult( xml, *it );
-}
-}
-void OutputTestResult( XmlWriter& xml, const TestCaseStats& stats ) {
-std::vector<TestStats>::const_iterator it = stats.m_testStats.begin();
-std::vector<TestStats>::const_iterator itEnd = stats.m_testStats.end();
-for(; it != itEnd; ++it ) {
-if( it->m_element != "success" ) {
-XmlWriter::ScopedElement e = xml.scopedElement( it->m_element );
-xml.writeAttribute( "message", it->m_message );
-xml.writeAttribute( "type", it->m_resultType );
-if( !it->m_content.empty() )
-xml.writeText( it->m_content );
 }
-}
+else {
+stream << "\n";
+}
+printMessage();
+}
+private:
+void printResultType() const {
+if( !passOrFail.empty() ) {
+Colour colourGuard( colour );
+stream << passOrFail << ":\n";
+}
+}
+void printOriginalExpression() const {
+if( result.hasExpression() ) {
+Colour colourGuard( Colour::OriginalExpression );
+stream  << "  ";
+stream << result.getExpressionInMacro();
+stream << "\n";
+}
+}
+void printReconstructedExpression() const {
+if( result.hasExpandedExpression() ) {
+stream << "with expansion:\n";
+Colour colourGuard( Colour::ReconstructedExpression );
+stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << "\n";
+}
+}
+void printMessage() const {
+if( !messageLabel.empty() )
+stream << messageLabel << ":" << "\n";
+for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
+it != itEnd;
+++it ) {
+// If this assertion is a warning ignore any INFO messages
+if( printInfoMessages || it->type != ResultWas::Info )
+stream << Text( it->message, TextAttributes().setIndent(2) ) << "\n";
+}
+}
+void printSourceInfo() const {
+Colour colourGuard( Colour::FileName );
+stream << result.getSourceInfo() << ": ";
+}
+std::ostream& stream;
+AssertionStats const& stats;
+AssertionResult const& result;
+Colour::Code colour;
+std::string passOrFail;
+std::string messageLabel;
+std::string message;
+std::vector<MessageInfo> messages;
+bool printInfoMessages;
+};
+void lazyPrint() {
+if( !currentTestRunInfo.used )
+lazyPrintRunInfo();
+if( !currentGroupInfo.used )
+lazyPrintGroupInfo();
+if( !m_headerPrinted ) {
+printTestCaseAndSectionHeader();
+m_headerPrinted = true;
+}
+}
+void lazyPrintRunInfo() {
+stream  << "\n" << getLineOfChars<'~'>() << "\n";
+Colour colour( Colour::SecondaryText );
+stream  << currentTestRunInfo->name
+<< " is a Catch v"  << libraryVersion << " host application.\n"
+<< "Run with -? for options\n\n";
+if( m_config->rngSeed() != 0 )
+stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+currentTestRunInfo.used = true;
+}
+void lazyPrintGroupInfo() {
+if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) {
+printClosedHeader( "Group: " + currentGroupInfo->name );
+currentGroupInfo.used = true;
+}
+}
+void printTestCaseAndSectionHeader() {
+assert( !m_sectionStack.empty() );
+printOpenHeader( currentTestCaseInfo->name );
+if( m_sectionStack.size() > 1 ) {
+Colour colourGuard( Colour::Headers );
+std::vector<SectionInfo>::const_iterator
+it = m_sectionStack.begin()+1, // Skip first section (test case)
+itEnd = m_sectionStack.end();
+for( ; it != itEnd; ++it )
+printHeaderString( it->name, 2 );
+}
+SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
+if( !lineInfo.empty() ){
+stream << getLineOfChars<'-'>() << "\n";
+Colour colourGuard( Colour::FileName );
+stream << lineInfo << "\n";
+}
+stream << getLineOfChars<'.'>() << "\n" << std::endl;
+}
+void printClosedHeader( std::string const& _name ) {
+printOpenHeader( _name );
+stream << getLineOfChars<'.'>() << "\n";
+}
+void printOpenHeader( std::string const& _name ) {
+stream  << getLineOfChars<'-'>() << "\n";
+{
+Colour colourGuard( Colour::Headers );
+printHeaderString( _name );
+}
+}
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void printHeaderString( std::string const& _string, std::size_t indent = 0 ) {
+std::size_t i = _string.find( ": " );
+if( i != std::string::npos )
+i+=2;
+else
+i = 0;
+stream << Text( _string, TextAttributes()
+.setIndent( indent+i)
+.setInitialIndent( indent ) ) << "\n";
+}
+struct SummaryColumn {
+SummaryColumn( std::string const& _label, Colour::Code _colour )
+:   label( _label ),
+colour( _colour )
+{}
+SummaryColumn addRow( std::size_t count ) {
+std::ostringstream oss;
+oss << count;
+std::string row = oss.str();
+for( std::vector<std::string>::iterator it = rows.begin(); it != rows.end(); ++it ) {
+while( it->size() < row.size() )
+*it = " " + *it;
+while( it->size() > row.size() )
+row = " " + row;
+}
+rows.push_back( row );
+return *this;
+}
+std::string label;
+Colour::Code colour;
+std::vector<std::string> rows;
+};
+void printTotals( Totals const& totals ) {
+if( totals.testCases.total() == 0 ) {
+stream << Colour( Colour::Warning ) << "No tests ran\n";
+}
+else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) {
+stream << Colour( Colour::ResultSuccess ) << "All tests passed";
+stream << " ("
+<< pluralise( totals.assertions.passed, "assertion" ) << " in "
+<< pluralise( totals.testCases.passed, "test case" ) << ")"
+<< "\n";
+}
+else {
+std::vector<SummaryColumn> columns;
+columns.push_back( SummaryColumn( "", Colour::None )
+.addRow( totals.testCases.total() )
+.addRow( totals.assertions.total() ) );
+columns.push_back( SummaryColumn( "passed", Colour::Success )
+.addRow( totals.testCases.passed )
+.addRow( totals.assertions.passed ) );
+columns.push_back( SummaryColumn( "failed", Colour::ResultError )
+.addRow( totals.testCases.failed )
+.addRow( totals.assertions.failed ) );
+columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure )
+.addRow( totals.testCases.failedButOk )
+.addRow( totals.assertions.failedButOk ) );
+printSummaryRow( "test cases", columns, 0 );
+printSummaryRow( "assertions", columns, 1 );
+}
+}
+void printSummaryRow( std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row ) {
+for( std::vector<SummaryColumn>::const_iterator it = cols.begin(); it != cols.end(); ++it ) {
+std::string value = it->rows[row];
+if( it->label.empty() ) {
+stream << label << ": ";
+if( value != "0" )
+stream << value;
+else
+stream << Colour( Colour::Warning ) << "- none -";
+}
+else if( value != "0" ) {
+stream  << Colour( Colour::LightGrey ) << " | ";
+stream  << Colour( it->colour )
+<< value << " " << it->label;
+}
+}
+stream << "\n";
+}
+static std::size_t makeRatio( std::size_t number, std::size_t total ) {
+std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0;
+return ( ratio == 0 && number > 0 ) ? 1 : ratio;
+}
+static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) {
+if( i > j && i > k )
+return i;
+else if( j > k )
+return j;
+else
+return k;
+}
+void printTotalsDivider( Totals const& totals ) {
+if( totals.testCases.total() > 0 ) {
+std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() );
+std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() );
+std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() );
+while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 )
+findMax( failedRatio, failedButOkRatio, passedRatio )++;
+while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 )
+findMax( failedRatio, failedButOkRatio, passedRatio )--;
+stream << Colour( Colour::Error ) << std::string( failedRatio, '=' );
+stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' );
+if( totals.testCases.allPassed() )
+stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' );
+else
+stream << Colour( Colour::Success ) << std::string( passedRatio, '=' );
+}
+else {
+stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' );
+}
+stream << "\n";
+}
+void printSummaryDivider() {
+stream << getLineOfChars<'-'>() << "\n";
 }
 private:
-const IReporterConfig& m_config;
+bool m_headerPrinted;
-bool m_currentTestSuccess;
+};
-Stats m_testSuiteStats;
+INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter )
-Stats* m_currentStats;
-std::vector<Stats> m_statsForSuites;
-std::ostringstream m_stdOut;
-std::ostringstream m_stdErr;
-};
 } // end namespace Catch
-#include <fstream>
+// #included from: ../reporters/catch_reporter_compact.hpp
-#include <stdlib.h>
+#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
-#include <limits>
 namespace Catch {
-INTERNAL_CATCH_REGISTER_REPORTER( "basic", BasicReporter )
+struct CompactReporter : StreamingReporterBase {
-INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+CompactReporter( ReporterConfig const& _config )
+: StreamingReporterBase( _config )
-inline int Main( Config& config ) {
+{}
-// Handle list request
+virtual ~CompactReporter();
-if( config.listWhat() != List::None )
-return List( config );
+static std::string getDescription() {
+return "Reports test results on a single line, suitable for IDEs";
-// Open output file, if specified
+}
-std::ofstream ofs;
-if( !config.getFilename().empty() ) {
+virtual ReporterPreferences getPreferences() const {
-ofs.open( config.getFilename().c_str() );
+ReporterPreferences prefs;
-if( ofs.fail() ) {
+prefs.shouldRedirectStdOut = false;
-std::cerr << "Unable to open file: '" << config.getFilename() << "'" << std::endl;
+return prefs;
-return (std::numeric_limits<int>::max)();
+}
-}
-config.setStreamBuf( ofs.rdbuf() );
+virtual void noMatchingTestCases( std::string const& spec ) {
-}
+stream << "No test cases matched '" << spec << "'" << std::endl;
+}
-int result = 0;
+virtual void assertionStarting( AssertionInfo const& ) {
-// Scope here for the Runner so it can use the context before it is cleaned-up
+}
-{
-Runner runner( config );
+virtual bool assertionEnded( AssertionStats const& _assertionStats ) {
+AssertionResult const& result = _assertionStats.assertionResult;
-// Run test specs specified on the command line - or default to all
-if( !config.testsSpecified() ) {
+bool printInfoMessages = true;
-config.getReporter()->StartGroup( "" );
-runner.runAll();
+// Drop out if result was successful and we're not printing those
-config.getReporter()->EndGroup( "", runner.getTotals() );
+if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+if( result.getResultType() != ResultWas::Warning )
+return false;
+printInfoMessages = false;
+}
+AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+printer.print();
+stream << std::endl;
+return true;
+}
+virtual void testRunEnded( TestRunStats const& _testRunStats ) {
+printTotals( _testRunStats.totals );
+stream << "\n" << std::endl;
+StreamingReporterBase::testRunEnded( _testRunStats );
+}
+private:
+class AssertionPrinter {
+void operator= ( AssertionPrinter const& );
+public:
+AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
+: stream( _stream )
+, stats( _stats )
+, result( _stats.assertionResult )
+, messages( _stats.infoMessages )
+, itMessage( _stats.infoMessages.begin() )
+, printInfoMessages( _printInfoMessages )
+{}
+void print() {
+printSourceInfo();
+itMessage = messages.begin();
+switch( result.getResultType() ) {
+case ResultWas::Ok:
+printResultType( Colour::ResultSuccess, passedString() );
+printOriginalExpression();
+printReconstructedExpression();
+if ( ! result.hasExpression() )
+printRemainingMessages( Colour::None );
+else
+printRemainingMessages();
+break;
+case ResultWas::ExpressionFailed:
+if( result.isOk() )
+printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) );
+else
+printResultType( Colour::Error, failedString() );
+printOriginalExpression();
+printReconstructedExpression();
+printRemainingMessages();
+break;
+case ResultWas::ThrewException:
+printResultType( Colour::Error, failedString() );
+printIssue( "unexpected exception with message:" );
+printMessage();
+printExpressionWas();
+printRemainingMessages();
+break;
+case ResultWas::FatalErrorCondition:
+printResultType( Colour::Error, failedString() );
+printIssue( "fatal error condition with message:" );
+printMessage();
+printExpressionWas();
+printRemainingMessages();
+break;
+case ResultWas::DidntThrowException:
+printResultType( Colour::Error, failedString() );
+printIssue( "expected exception, got none" );
+printExpressionWas();
+printRemainingMessages();
+break;
+case ResultWas::Info:
+printResultType( Colour::None, "info" );
+printMessage();
+printRemainingMessages();
+break;
+case ResultWas::Warning:
+printResultType( Colour::None, "warning" );
+printMessage();
+printRemainingMessages();
+break;
+case ResultWas::ExplicitFailure:
+printResultType( Colour::Error, failedString() );
+printIssue( "explicitly" );
+printRemainingMessages( Colour::None );
+break;
+// These cases are here to prevent compiler warnings
+case ResultWas::Unknown:
+case ResultWas::FailureBit:
+case ResultWas::Exception:
+printResultType( Colour::Error, "** internal error **" );
+break;
+}
+}
+private:
+// Colour::LightGrey
+static Colour::Code dimColour() { return Colour::FileName; }
+#ifdef CATCH_PLATFORM_MAC
+static const char* failedString() { return "FAILED"; }
+static const char* passedString() { return "PASSED"; }
+#else
+static const char* failedString() { return "failed"; }
+static const char* passedString() { return "passed"; }
+#endif
+void printSourceInfo() const {
+Colour colourGuard( Colour::FileName );
+stream << result.getSourceInfo() << ":";
+}
+void printResultType( Colour::Code colour, std::string passOrFail ) const {
+if( !passOrFail.empty() ) {
+{
+Colour colourGuard( colour );
+stream << " " << passOrFail;
+}
+stream << ":";
+}
+}
+void printIssue( std::string issue ) const {
+stream << " " << issue;
+}
+void printExpressionWas() {
+if( result.hasExpression() ) {
+stream << ";";
+{
+Colour colour( dimColour() );
+stream << " expression was:";
+}
+printOriginalExpression();
+}
+}
+void printOriginalExpression() const {
+if( result.hasExpression() ) {
+stream << " " << result.getExpression();
+}
+}
+void printReconstructedExpression() const {
+if( result.hasExpandedExpression() ) {
+{
+Colour colour( dimColour() );
+stream << " for: ";
+}
+stream << result.getExpandedExpression();
+}
+}
+void printMessage() {
+if ( itMessage != messages.end() ) {
+stream << " '" << itMessage->message << "'";
+++itMessage;
+}
+}
+void printRemainingMessages( Colour::Code colour = dimColour() ) {
+if ( itMessage == messages.end() )
+return;
+// using messages.end() directly yields compilation error:
+std::vector<MessageInfo>::const_iterator itEnd = messages.end();
+const std::size_t N = static_cast<std::size_t>( std::distance( itMessage, itEnd ) );
+{
+Colour colourGuard( colour );
+stream << " with " << pluralise( N, "message" ) << ":";
+}
+for(; itMessage != itEnd; ) {
+// If this assertion is a warning ignore any INFO messages
+if( printInfoMessages || itMessage->type != ResultWas::Info ) {
+stream << " '" << itMessage->message << "'";
+if ( ++itMessage != itEnd ) {
+Colour colourGuard( dimColour() );
+stream << " and";
+}
+}
+}
+}
+private:
+std::ostream& stream;
+AssertionStats const& stats;
+AssertionResult const& result;
+std::vector<MessageInfo> messages;
+std::vector<MessageInfo>::const_iterator itMessage;
+bool printInfoMessages;
+};
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+std::string bothOrAll( std::size_t count ) const {
+return count == 1 ? "" : count == 2 ? "both " : "all " ;
+}
+void printTotals( const Totals& totals ) const {
+if( totals.testCases.total() == 0 ) {
+stream << "No tests ran.";
+}
+else if( totals.testCases.failed == totals.testCases.total() ) {
+Colour colour( Colour::ResultError );
+const std::string qualify_assertions_failed =
+totals.assertions.failed == totals.assertions.total() ?
+bothOrAll( totals.assertions.failed ) : "";
+stream <<
+"Failed " << bothOrAll( totals.testCases.failed )
+<< pluralise( totals.testCases.failed, "test case"  ) << ", "
+"failed " << qualify_assertions_failed <<
+pluralise( totals.assertions.failed, "assertion" ) << ".";
+}
+else if( totals.assertions.total() == 0 ) {
+stream <<
+"Passed " << bothOrAll( totals.testCases.total() )
+<< pluralise( totals.testCases.total(), "test case" )
+<< " (no assertions).";
+}
+else if( totals.assertions.failed ) {
+Colour colour( Colour::ResultError );
+stream <<
+"Failed " << pluralise( totals.testCases.failed, "test case"  ) << ", "
+"failed " << pluralise( totals.assertions.failed, "assertion" ) << ".";
 }
 else {
-// !TBD We should get all the testcases upfront, report any missing,
+Colour colour( Colour::ResultSuccess );
-// then just run them
+stream <<
-std::vector<std::string>::const_iterator it = config.getTestSpecs().begin();
+"Passed " << bothOrAll( totals.testCases.passed )
-std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end();
+<< pluralise( totals.testCases.passed, "test case"  ) <<
-for(; it != itEnd; ++it ) {
+" with "  << pluralise( totals.assertions.passed, "assertion" ) << ".";
-Totals prevTotals = runner.getTotals();
+}
-config.getReporter()->StartGroup( *it );
+}
-if( runner.runMatching( *it ) == 0 ) {
+};
-// Use reporter?
-//                    std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl;
+INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-}
-config.getReporter()->EndGroup( *it, runner.getTotals() - prevTotals );
-}
-}
-result = static_cast<int>( runner.getTotals().assertions.failed );
-}
-Catch::Context::cleanUp();
-return result;
-}
-inline void showUsage( std::ostream& os ) {
-os  << "\t-l, --list <tests | reporters> [xml]\n"
-<< "\t-t, --test <testspec> [<testspec>...]\n"
-<< "\t-r, --reporter <reporter name>\n"
-<< "\t-o, --out <file name>|<%stream name>\n"
-<< "\t-s, --success\n"
-<< "\t-b, --break\n"
-<< "\t-n, --name <name>\n"
-<< "\t-a, --abort [#]\n\n"
-<< "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
-}
-inline void showHelp( std::string exeName ) {
-std::string::size_type pos = exeName.find_last_of( "/\\" );
-if( pos != std::string::npos ) {
-exeName = exeName.substr( pos+1 );
-}
-std::cout << exeName << " is a CATCH host application. Options are as follows:\n\n";
-showUsage( std::cout );
-}
-inline int Main( int argc, char* const argv[], Config& config ) {
-parseIntoConfig( CommandParser( argc, argv ), config );
-if( !config.getMessage().empty() ) {
-std::cerr << config.getMessage() <<  + "\n\nUsage: ...\n\n";
-showUsage( std::cerr );
-Catch::Context::cleanUp();
-return (std::numeric_limits<int>::max)();
-}
-// Handle help
-if( config.showHelp() ) {
-showHelp( argv[0] );
-Catch::Context::cleanUp();
-return 0;
-}
-return Main( config );
-}
-inline int Main( int argc, char* const argv[] ) {
-Config config;
-// !TBD: This doesn't always work, for some reason
-//        if( isDebuggerActive() )
-//            config.useStream( "debug" );
-return Main( argc, argv, config );
-}
 } // end namespace Catch
+namespace Catch {
+// These are all here to avoid warnings about not having any out of line
+// virtual methods
+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() {}
+ITestCase::~ITestCase() {}
+ITestCaseRegistry::~ITestCaseRegistry() {}
+IRegistryHub::~IRegistryHub() {}
+IMutableRegistryHub::~IMutableRegistryHub() {}
+IExceptionTranslator::~IExceptionTranslator() {}
+IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {}
+IReporter::~IReporter() {}
+IReporterFactory::~IReporterFactory() {}
+IReporterRegistry::~IReporterRegistry() {}
+IStreamingReporter::~IStreamingReporter() {}
+AssertionStats::~AssertionStats() {}
+SectionStats::~SectionStats() {}
+TestCaseStats::~TestCaseStats() {}
+TestGroupStats::~TestGroupStats() {}
+TestRunStats::~TestRunStats() {}
+CumulativeReporterBase::SectionNode::~SectionNode() {}
+CumulativeReporterBase::~CumulativeReporterBase() {}
+StreamingReporterBase::~StreamingReporterBase() {}
+ConsoleReporter::~ConsoleReporter() {}
+CompactReporter::~CompactReporter() {}
+IRunner::~IRunner() {}
+IMutableContext::~IMutableContext() {}
+IConfig::~IConfig() {}
+XmlReporter::~XmlReporter() {}
+JunitReporter::~JunitReporter() {}
+TestRegistry::~TestRegistry() {}
+FreeFunctionTestCase::~FreeFunctionTestCase() {}
+IGeneratorInfo::~IGeneratorInfo() {}
+IGeneratorsForTest::~IGeneratorsForTest() {}
+WildcardPattern::~WildcardPattern() {}
+TestSpec::Pattern::~Pattern() {}
+TestSpec::NamePattern::~NamePattern() {}
+TestSpec::TagPattern::~TagPattern() {}
+TestSpec::ExcludedPattern::~ExcludedPattern() {}
+Matchers::Impl::StdString::Equals::~Equals() {}
+Matchers::Impl::StdString::Contains::~Contains() {}
+Matchers::Impl::StdString::StartsWith::~StartsWith() {}
+Matchers::Impl::StdString::EndsWith::~EndsWith() {}
+void Config::dummy() {}
+namespace TestCaseTracking {
+ITracker::~ITracker() {}
+TrackerBase::~TrackerBase() {}
+SectionTracker::~SectionTracker() {}
+IndexTracker::~IndexTracker() {}
+}
+}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #endif
 #ifdef CATCH_CONFIG_MAIN
 // #included from: internal/catch_default_main.hpp
+#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
 #ifndef __OBJC__
 // Standard C/C++ main entry point
-int main (int argc, char * const argv[]) {
+int main (int argc, char * argv[]) {
-return Catch::Main( argc, argv );
+return Catch::Session().run( argc, argv );
 }
 #else // __OBJC__
 // Objective-C entry point
 #if !CATCH_ARC_ENABLED
 NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 #endif
 Catch::registerTestMethods();
-int result = Catch::Main( argc, (char* const*)argv );
+int result = Catch::Session().run( argc, (char* const*)argv );
 #if !CATCH_ARC_ENABLED
 [pool drain];
 #endif
 #endif // __OBJC__
 #endif
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
 //////
-#define REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, false, true, "REQUIRE" )
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( expr, true, true, "REQUIRE_FALSE" )
+#ifdef CATCH_CONFIG_PREFIX_ALL
-#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( expr, ..., true, "REQUIRE_THROWS" )
+#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE" )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, true, "REQUIRE_THROWS_AS" )
+#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "CATCH_REQUIRE_FALSE" )
-#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, true, "REQUIRE_NOTHROW" )
+#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, "", "CATCH_REQUIRE_THROWS" )
-#define CHECK( expr ) INTERNAL_CATCH_TEST( expr, false, false, "CHECK" )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THROWS_AS" )
-#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( expr, true, false, "CHECK_FALSE" )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, matcher, "CATCH_REQUIRE_THROWS_WITH" )
-#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( expr, false, false, "CHECKED_IF" )
+#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_NOTHROW" )
-#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( expr, false, false, "CHECKED_ELSE" )
+#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK" )
-#define CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( expr, ..., false, "CHECK_THROWS" )
+#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CATCH_CHECK_FALSE" )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, false, "CHECK_THROWS_AS" )
+#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_IF" )
-#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, false, "CHECK_NOTHROW" )
+#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECKED_ELSE" )
+#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_NOFAIL" )
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, false, "CHECK_THAT" )
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, true, "REQUIRE_THAT" )
+#define CATCH_CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS" )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THROWS_AS" )
-#define INFO( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Info, false, "INFO" )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CATCH_CHECK_THROWS_WITH" )
-#define WARN( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::Warning, false, "WARN" )
+#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_NOTHROW" )
-#define FAIL( msg ) INTERNAL_CATCH_MSG( msg, Catch::ResultWas::ExplicitFailure, true, "FAIL" )
-#define SCOPED_INFO( msg ) INTERNAL_CATCH_SCOPED_INFO( msg )
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CATCH_CHECK_THAT" )
-#define CAPTURE( msg ) INTERNAL_CATCH_MSG( #msg " := " << msg, Catch::ResultWas::Info, false, "CAPTURE" )
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::Normal, "CATCH_REQUIRE_THAT" )
-#define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "CATCH_WARN", msg )
-#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
+#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "CATCH_INFO" )
-#define TEST_CASE_NORETURN( name, description ) INTERNAL_CATCH_TESTCASE_NORETURN( name, description )
+#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "Anonymous test case" )
+#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CATCH_CAPTURE" )
-#define METHOD_AS_TEST_CASE( method, name, description ) CATCH_METHOD_AS_TEST_CASE( method, name, description )
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#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__ )
+#else
+#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 )
+#endif
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
+#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
+#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
+#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
+// "BDD-style" convenience wrappers
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#else
+#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags )
+#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
+#endif
+#define CATCH_GIVEN( desc )    CATCH_SECTION( std::string( "Given: ") + desc, "" )
+#define CATCH_WHEN( desc )     CATCH_SECTION( std::string( " When: ") + desc, "" )
+#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
+#define CATCH_THEN( desc )     CATCH_SECTION( std::string( " Then: ") + desc, "" )
+#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+#define REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal, "REQUIRE" )
+#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, "REQUIRE_FALSE" )
+#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, "", "REQUIRE_THROWS" )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::Normal, "REQUIRE_THROWS_AS" )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::Normal, matcher, "REQUIRE_THROWS_WITH" )
+#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::Normal, "REQUIRE_NOTHROW" )
+#define CHECK( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK" )
+#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, "CHECK_FALSE" )
+#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_IF" )
+#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECKED_ELSE" )
+#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_NOFAIL" )
+#define CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, "", "CHECK_THROWS" )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THROWS_AS" )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure, matcher, "CHECK_THROWS_WITH" )
+#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure, "CHECK_NOTHROW" )
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::ContinueOnFailure, "CHECK_THAT" )
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( arg, matcher, Catch::ResultDisposition::Normal, "REQUIRE_THAT" )
+#define INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
+#define WARN( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, "WARN", msg )
+#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( msg, "INFO" )
+#define CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
+#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( #msg " := " << msg, "CAPTURE" )
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#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__ )
+#else
+#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 )
+#endif
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
 #define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
+#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
+#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
+#endif
 #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
+// "BDD-style" convenience wrappers
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
-///////////////
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-// Still to be implemented
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CHECK_NOFAIL( expr ) // !TBD - reports violation, but doesn't fail Test
+#else
+#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
+#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
+#endif
+#define GIVEN( desc )    SECTION( std::string("   Given: ") + desc, "" )
+#define WHEN( desc )     SECTION( std::string("    When: ") + desc, "" )
+#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" )
+#define THEN( desc )     SECTION( std::string("    Then: ") + desc, "" )
+#define AND_THEN( desc ) SECTION( std::string("     And: ") + desc, "" )
 using Catch::Detail::Approx;
 #endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED

Mercurial > hg > nsaunier > traffic-intelligence

comparison include/catch.hpp @ 806:c6f497291fd8 opencv3