3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +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 18:42:32 +01:00
parent a713ce0264 0afab69c7d
commit 4094e7fe3d
14 changed files with 95 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/catch.hpp
View File

@@ -28,6 +28,7 @@
#include "internal/catch_generators.hpp"
#include "internal/catch_interfaces_exception.h"
#include "internal/catch_approx.hpp"
#include "internal/catch_test_case_info.hpp"
#ifdef __OBJC__
#include "internal/catch_objc.hpp"

5
include/internal/catch_capture.hpp
View File

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

1
include/internal/catch_commandline.hpp
View File

@@ -194,6 +194,7 @@ namespace Catch
return setErrorMode( m_command + " does not accept arguments" );
m_config.setShowHelp( true );
break;
case modeError:
default:
break;
}

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

5
include/reporters/catch_reporter_basic.hpp
View File

@@ -211,6 +211,11 @@ namespace Catch
case ResultWas::ExplicitFailure:
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() )
{

4
include/reporters/catch_reporter_junit.hpp
View File

@@ -156,6 +156,10 @@ namespace Catch
case ResultWas::Ok:
stats.m_element = "success";
break;
case ResultWas::Unknown:
case ResultWas::FailureBit:
case ResultWas::Exception:
case ResultWas::DidntThrowException:
default:
stats.m_element = "unknown";
break;

6
include/reporters/catch_reporter_xml.hpp
View File

@@ -153,6 +153,12 @@ namespace Catch
.writeText( resultInfo.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;
}