3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:philsquared/Catch

Browse Source
This commit is contained in:
Phil Nash 2011-09-29 08:49:05 +01:00
commit 7df1ba0926
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/internal/catch_capture.hpp
View File

@ -559,7 +559,8 @@ public:
const char* expr = "",
bool isNot = false
)
: m_result( expr, isNot, filename, line, macroName )
: m_result( expr, isNot, filename, line, macroName ),
m_messageStream()
{}
///////////////////////////////////////////////////////////////////////////
@ -659,7 +660,7 @@ class ScopedInfo
public:
///////////////////////////////////////////////////////////////////////////
ScopedInfo
()
() : m_oss()
{
Hub::getResultCapture().pushScopedInfo( this );
}

1
include/internal/catch_common.h
View File

@ -38,6 +38,7 @@ namespace Catch
void operator = ( const NonCopyable& );
protected:
NonCopyable(){}
virtual ~NonCopyable() {}
};
typedef char NoType;

16
include/internal/catch_resultinfo.hpp
View File

@ -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
()

2
include/internal/catch_section.hpp
View File

@ -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 ) )
{
}

6
include/internal/catch_test_case_info.hpp
View File

@ -42,7 +42,11 @@ namespace Catch
///////////////////////////////////////////////////////////////////////
TestCaseInfo
()
: m_test( NULL )
: m_test( NULL ),
m_name(),
m_description(),
m_filename(),
m_line( 0 )
{
}