3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Regenerated single include for last few commits

This commit is contained in:
Phil Nash 2011-12-28 10:37:31 +00:00
parent 7c94aef660
commit f51d316dba
1 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
single_include/catch.hpp
View File

@ -96,6 +96,7 @@ namespace Catch
void operator = ( const NonCopyable& ); void operator = ( const NonCopyable& );
protected: protected:
NonCopyable(){} NonCopyable(){}
virtual ~NonCopyable() {}
}; };
typedef char NoType; typedef char NoType;
@ -660,7 +661,14 @@ namespace Catch
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
ResultInfo ResultInfo
() ()
: m_line( 0 ), : m_macroName(),
m_filename(),
m_line( 0 ),
m_expr(),
m_lhs(),
m_rhs(),
m_op(),
m_message(),
m_result( ResultWas::Unknown ), m_result( ResultWas::Unknown ),
m_isNot( false ) m_isNot( false )
{} {}
@ -680,6 +688,8 @@ namespace Catch
m_filename( filename ), m_filename( filename ),
m_line( line ), m_line( line ),
m_expr( expr ), m_expr( expr ),
m_lhs(),
m_rhs(),
m_op( isNotExpression( expr ) ? "!" : "" ), m_op( isNotExpression( expr ) ? "!" : "" ),
m_message( message ), m_message( message ),
m_result( result ), m_result( result ),
@ -689,6 +699,11 @@ namespace Catch
m_expr = "!" + m_expr; m_expr = "!" + m_expr;
} }
///////////////////////////////////////////////////////////////////////////
virtual ~ResultInfo
()
{
}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
bool ok bool ok
() ()
@ -970,7 +985,6 @@ namespace Catch
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
#define BreakIntoDebugger() if (IsDebuggerPresent() ) { __debugbreak(); } #define BreakIntoDebugger() if (IsDebuggerPresent() ) { __debugbreak(); }
inline bool isDebuggerActive() inline bool isDebuggerActive()
{ {
@ -981,15 +995,19 @@ namespace Catch
inline bool isDebuggerActive() { return false; } inline bool isDebuggerActive() { return false; }
#endif #endif
#ifdef CATCH_PLATFORM_WINDOWS
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( const char* );
inline void writeToDebugConsole( const std::string& text ) inline void writeToDebugConsole( const std::string& text )
{ {
#ifdef CATCH_PLATFORM_WINDOWS
::OutputDebugStringA( text.c_str() ); ::OutputDebugStringA( text.c_str() );
}
#else #else
inline void writeToDebugConsole( const std::string& text )
{
// !TBD: Need a version for Mac/ XCode and other IDEs // !TBD: Need a version for Mac/ XCode and other IDEs
std::cout << text; std::cout << text;
#endif
} }
#endif // CATCH_PLATFORM_WINDOWS
// #included from: catch_evaluate.hpp // #included from: catch_evaluate.hpp
@ -1186,67 +1204,35 @@ namespace Internal
namespace Catch namespace Catch
{ {
namespace Detail namespace Detail
{ {
// The following code, contributed by Sam Partington, allows us to choose an implementation
// of toString() depending on whether a << overload is available
struct NonStreamable struct NonStreamable
{ {
// allow construction from anything... template<typename T>
template<typename Anything> NonStreamable( const T& )
NonStreamable(Anything) {
{} }
}; };
// a local operator<< which may be called if there isn't a better one elsewhere... // If the type does not have its own << overload for ostream then
inline NonStreamable operator << ( std::ostream&, const NonStreamable& ns ) // this one will be used instead
inline std::ostream& operator << ( std::ostream& ss, NonStreamable )
{ {
return ns; ss << "{?}";
return ss;
} }
template<typename T> template<typename T>
struct IsStreamable inline std::string makeString
(
const T& value
)
{ {
static NoType Deduce( const NonStreamable& ); std::ostringstream oss;
static YesType Deduce( std::ostream& ); oss << value;
return oss.str();
enum }
{
value = sizeof( Deduce( Synth<std::ostream&>() << Synth<const T&>() ) )
== sizeof( YesType )
};
};
// << is available, so use it with ostringstream to make the string
template<typename T, bool streamable>
struct StringMaker
{
///////////////////////////////////////////////////////////////////////
static std::string apply
(
const T& value
)
{
std::ostringstream oss;
oss << value;
return oss.str();
}
};
// << not available - use a default string
template<typename T>
struct StringMaker<T, false>
{
///////////////////////////////////////////////////////////////////////
static std::string apply
(
const T&
)
{
return "{?}";
}
};
}// end namespace Detail }// end namespace Detail
@ -1257,7 +1243,7 @@ std::string toString
const T& value const T& value
) )
{ {
return Detail::StringMaker<T, Detail::IsStreamable<T>::value>::apply( value ); return Detail::makeString( value );
} }
// Shortcut overloads // Shortcut overloads
@ -1722,7 +1708,8 @@ public:
const char* expr = "", const char* expr = "",
bool isNot = false bool isNot = false
) )
: m_result( expr, isNot, filename, line, macroName ) : m_result( expr, isNot, filename, line, macroName ),
m_messageStream()
{} {}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -1822,7 +1809,7 @@ class ScopedInfo
public: public:
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
ScopedInfo ScopedInfo
() () : m_oss()
{ {
Hub::getResultCapture().pushScopedInfo( this ); Hub::getResultCapture().pushScopedInfo( this );
} }
@ -1963,6 +1950,8 @@ namespace Catch
std::size_t line std::size_t line
) )
: m_name( name ), : m_name( name ),
m_successes(0),
m_failures(0),
m_sectionIncluded( Hub::getResultCapture().sectionStarted( name, description, filename, line, m_successes, m_failures ) ) m_sectionIncluded( Hub::getResultCapture().sectionStarted( name, description, filename, line, m_successes, m_failures ) )
{ {
} }
@ -2597,7 +2586,11 @@ namespace Catch
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
TestCaseInfo TestCaseInfo
() ()
: m_test( NULL ) : m_test( NULL ),
m_name(),
m_description(),
m_filename(),
m_line( 0 )
{ {
} }
@ -3142,7 +3135,6 @@ namespace Catch
if( testSpec.matches( it->getName() ) ) if( testSpec.matches( it->getName() ) )
{ {
testList.push_back( *it ); testList.push_back( *it );
std::cout << it->getName() << std::endl;
} }
} }
return testList; return testList;
@ -3312,7 +3304,7 @@ namespace Catch
// #included from: catch_runner_impl.hpp // #included from: catch_runner_impl.hpp
/* /*
* catch_runner.hpp * catch_runner.hpp
* Catch * Catch
* *
@ -3643,7 +3635,7 @@ namespace Catch
~StreamRedirect ~StreamRedirect
() ()
{ {
m_targetString = m_oss.str(); m_targetString += m_oss.str();
m_stream.rdbuf( m_prevBuf ); m_stream.rdbuf( m_prevBuf );
} }
@ -4085,7 +4077,7 @@ namespace Catch
) )
{ {
std::ostringstream oss; std::ostringstream oss;
oss << filename << ":" << line; oss << name << "@" << filename << ":" << line;
if( !m_runningTest->addSection( oss.str() ) ) if( !m_runningTest->addSection( oss.str() ) )
return false; return false;
@ -4750,6 +4742,7 @@ namespace Catch
return setErrorMode( m_command + " does not accept arguments" ); return setErrorMode( m_command + " does not accept arguments" );
m_config.setShowHelp( true ); m_config.setShowHelp( true );
break; break;
case modeError:
default: default:
break; break;
} }
@ -4953,7 +4946,8 @@ namespace Catch
( (
const IReporterConfig& config const IReporterConfig& config
) )
: m_config( config ) : m_config( config ),
m_firstSectionInTestCase( true )
{ {
} }
@ -5118,6 +5112,11 @@ namespace Catch
case ResultWas::ExplicitFailure: case ResultWas::ExplicitFailure:
m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'"; m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
break; 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: default:
if( !resultInfo.hasExpression() ) if( !resultInfo.hasExpression() )
{ {
@ -5565,7 +5564,7 @@ namespace Catch
// !TBD finish this // !TBD finish this
if( !findReplaceableString( text, "<", "&lt;" ) && if( !findReplaceableString( text, "<", "&lt;" ) &&
!findReplaceableString( text, "&", "&amp;" ) && !findReplaceableString( text, "&", "&amp;" ) &&
!findReplaceableString( text, "\"", "&quote;" ) ) !findReplaceableString( text, "\"", "&quot;" ) )
{ {
stream() << text; stream() << text;
} }
@ -5734,6 +5733,12 @@ namespace Catch
.writeText( resultInfo.getMessage() ); .writeText( resultInfo.getMessage() );
m_currentTestSuccess = false; m_currentTestSuccess = false;
break; break;
case ResultWas::Unknown:
case ResultWas::Ok:
case ResultWas::FailureBit:
case ResultWas::ExpressionFailed:
case ResultWas::Exception:
case ResultWas::DidntThrowException:
default: default:
break; break;
} }
@ -5913,6 +5918,10 @@ namespace Catch
case ResultWas::Ok: case ResultWas::Ok:
stats.m_element = "success"; stats.m_element = "success";
break; break;
case ResultWas::Unknown:
case ResultWas::FailureBit:
case ResultWas::Exception:
case ResultWas::DidntThrowException:
default: default:
stats.m_element = "unknown"; stats.m_element = "unknown";
break; break;
@ -6079,7 +6088,7 @@ namespace Catch
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void showHelp inline void showHelp
( (
std::string exeName std::string exeName
) )