3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked console reporter some more

Browse Source
This commit is contained in:
Phil Nash
2013-01-17 12:07:34 +00:00
parent 10e891767f
commit b588755a92
6 changed files with 1941 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_version.hpp
View File

@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 0, 9, 13, "integration" );
Version libraryVersion( 0, 9, 14, "integration" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

34
include/reporters/catch_reporter_console.hpp
View File

@@ -43,23 +43,25 @@ namespace Catch {
lazyPrint();
{
TextColour colour( TextColour::FileName );
stream << result.getSourceInfo() << ":\n";
}
ResultComponents components( result );
bool endsWithNewLine = false;
if( _assertionStats.totals.assertions.total() > 0 ) {
printOriginalExpression( result );
printResultType( components );
printOriginalExpression( result );
// printResultType( components );
endsWithNewLine = printReconstructedExpression( result );
}
endsWithNewLine |= printMessage( components );
if( !endsWithNewLine )
stream << "\n";
// if( !endsWithNewLine )
// stream << "\n";
printSourceInfo( result );
stream << std::endl;
}
void printSourceInfo( AssertionResult const& _result ) {
TextColour colour( TextColour::FileName );
stream << _result.getSourceInfo() << "\n";
}
struct ResultComponents {
ResultComponents( AssertionResult const& _result )
@@ -69,18 +71,18 @@ namespace Catch {
switch( _result.getResultType() ) {
case ResultWas::Ok:
colour = TextColour::Success;
passOrFail = "passed";
passOrFail = "PASSED";
if( _result.hasMessage() )
messageLabel = "with message";
break;
case ResultWas::ExpressionFailed:
if( _result.isOk() ) {
colour = TextColour::Success;
passOrFail = "failed - but was ok";
passOrFail = "FAILED - but was ok";
}
else {
colour = TextColour::Error;
passOrFail = "failed";
passOrFail = "FAILED";
}
if( _result.hasMessage() ){
messageLabel = "with message";
@@ -88,12 +90,12 @@ namespace Catch {
break;
case ResultWas::ThrewException:
colour = TextColour::Error;
passOrFail = "failed";
passOrFail = "FAILED";
messageLabel = "due to unexpected exception with message";
break;
case ResultWas::DidntThrowException:
colour = TextColour::Error;
passOrFail = "failed";
passOrFail = "FAILED";
messageLabel = "because no exception was thrown where one was expected";
break;
case ResultWas::Info:
@@ -103,12 +105,12 @@ namespace Catch {
messageLabel = "warning";
break;
case ResultWas::ExplicitFailure:
passOrFail = "failed";
passOrFail = "FAILED";
colour = TextColour::Error;
messageLabel = "explicitly with message";
break;
case ResultWas::Exception:
passOrFail = "failed";
passOrFail = "FAILED";
colour = TextColour::Error;
if( _result.hasMessage() )
messageLabel = "with message";
@@ -132,7 +134,7 @@ namespace Catch {
void printResultType( ResultComponents const& _components ) {
if( !_components.passOrFail.empty() ) {
TextColour colour( _components.colour );
stream << _components.passOrFail << " ";
stream << _components.passOrFail << ":\n";
}
}
bool printOriginalExpression( AssertionResult const& _result ) {