mirror of
https://github.com/catchorg/Catch2.git
synced 2025-08-01 12:55:40 +02:00
Merge branch 'master' of github.com:philsquared/Catch
This commit is contained in:
@@ -527,7 +527,8 @@ public:
|
||||
const char* expr = "",
|
||||
bool isNot = false
|
||||
)
|
||||
: m_result( expr, isNot, filename, line, macroName )
|
||||
: m_result( expr, isNot, filename, line, macroName ),
|
||||
m_messageStream()
|
||||
{}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@@ -627,7 +628,7 @@ class ScopedInfo
|
||||
public:
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
ScopedInfo
|
||||
()
|
||||
() : m_oss()
|
||||
{
|
||||
Hub::getResultCapture().pushScopedInfo( this );
|
||||
}
|
||||
|
@@ -194,6 +194,7 @@ namespace Catch
|
||||
return setErrorMode( m_command + " does not accept arguments" );
|
||||
m_config.setShowHelp( true );
|
||||
break;
|
||||
case modeError:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@@ -38,6 +38,7 @@ namespace Catch
|
||||
void operator = ( const NonCopyable& );
|
||||
protected:
|
||||
NonCopyable(){}
|
||||
virtual ~NonCopyable() {}
|
||||
};
|
||||
|
||||
typedef char NoType;
|
||||
|
@@ -24,7 +24,14 @@ namespace Catch
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
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_isNot( false )
|
||||
{}
|
||||
@@ -44,6 +51,8 @@ namespace Catch
|
||||
m_filename( filename ),
|
||||
m_line( line ),
|
||||
m_expr( expr ),
|
||||
m_lhs(),
|
||||
m_rhs(),
|
||||
m_op( isNotExpression( expr ) ? "!" : "" ),
|
||||
m_message( message ),
|
||||
m_result( result ),
|
||||
@@ -53,6 +62,11 @@ namespace Catch
|
||||
m_expr = "!" + m_expr;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
virtual ~ResultInfo
|
||||
()
|
||||
{
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
bool ok
|
||||
()
|
||||
|
@@ -31,6 +31,8 @@ namespace Catch
|
||||
std::size_t line
|
||||
)
|
||||
: m_name( name ),
|
||||
m_successes(0),
|
||||
m_failures(0),
|
||||
m_sectionIncluded( Hub::getResultCapture().sectionStarted( name, description, filename, line, m_successes, m_failures ) )
|
||||
{
|
||||
}
|
||||
|
@@ -42,7 +42,11 @@ namespace Catch
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
TestCaseInfo
|
||||
()
|
||||
: m_test( NULL )
|
||||
: m_test( NULL ),
|
||||
m_name(),
|
||||
m_description(),
|
||||
m_filename(),
|
||||
m_line( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user