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

Small fixes and tweaks

Browse Source
This commit is contained in:
Phil Nash 2012-10-28 10:27:44 +00:00
parent 355b5e546d
commit fe1d7c1d08
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_capture.hpp
View File

@ -91,7 +91,7 @@ inline bool isTrue( bool value ){ return value; }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_ACCEPT_INFO( expr, macroName, shouldNegate ) \ #define INTERNAL_CATCH_ACCEPT_INFO( expr, macroName, shouldNegate ) \
Catch::getResultCapture().acceptAssertionInfo( Catch::AssertionInfo( macroName, CATCH_INTERNAL_LINEINFO, #expr, shouldNegate ) ); Catch::getResultCapture().acceptAssertionInfo( Catch::AssertionInfo( macroName, CATCH_INTERNAL_LINEINFO, expr, shouldNegate ) );
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_TEST( expr, shouldNegate, stopOnFailure, macroName ) \ #define INTERNAL_CATCH_TEST( expr, shouldNegate, stopOnFailure, macroName ) \

2
include/internal/catch_expressionresult_builder.hpp
View File

@ -26,7 +26,7 @@ namespace Catch {
ExpressionResultBuilder& ExpressionResultBuilder::operator=(const ExpressionResultBuilder& other ) { ExpressionResultBuilder& ExpressionResultBuilder::operator=(const ExpressionResultBuilder& other ) {
m_data = other.m_data; m_data = other.m_data;
m_exprComponents = other.m_exprComponents; m_exprComponents = other.m_exprComponents;
m_stream.clear(); m_stream.str("");
m_stream << other.m_stream.str(); m_stream << other.m_stream.str();
return *this; return *this;
} }

4
include/reporters/catch_reporter_basic.hpp
View File

@ -206,7 +206,7 @@ namespace Catch {
streamVariableLengthText( "info", assertionResult.getMessage() ); streamVariableLengthText( "info", assertionResult.getMessage() );
break; break;
case ResultWas::Warning: case ResultWas::Warning:
m_config.stream << "warning:\n'" << assertionResult.getMessage() << "'"; streamVariableLengthText( "warning", assertionResult.getMessage() );
break; break;
case ResultWas::ExplicitFailure: case ResultWas::ExplicitFailure:
{ {
@ -309,7 +309,7 @@ namespace Catch {
void streamVariableLengthText( const std::string& prefix, const std::string& text ) { void streamVariableLengthText( const std::string& prefix, const std::string& text ) {
std::string trimmed = trim( text ); std::string trimmed = trim( text );
if( trimmed.find_first_of( "\r\n" ) == std::string::npos ) { if( trimmed.find_first_of( "\r\n" ) == std::string::npos ) {
m_config.stream << "[" << prefix << ": " << trimmed << "]\n"; m_config.stream << "[" << prefix << ": " << trimmed << "]";
} }
else { else {
m_config.stream << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed m_config.stream << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed