3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored printResultType into switch

This commit is contained in:
Phil Nash 2013-01-14 18:58:50 +00:00
parent 60ed3c142c
commit 3b970e20e9
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/reporters/catch_reporter_console.hpp
View File

@ -61,20 +61,25 @@ namespace Catch {
}
bool printResultType( AssertionResult const& _result ) {
if( _result.getResultType() == ResultWas::Info ||
_result.getResultType() == ResultWas::Warning ) {
}
else if( _result.succeeded() ) {
TextColour successColour( TextColour::Success );
stream << "passed ";
}
else if( _result.isOk() ) {
TextColour okAnywayColour( TextColour::Success );
stream << "failed - but was ok ";
}
else {
TextColour errorColour( TextColour::Error );
stream << "failed ";
switch( _result.getResultType() ) {
case ResultWas::Info:
case ResultWas::Warning:
break;
case ResultWas::Ok:
{
TextColour successColour( TextColour::Success );
stream << "passed ";
}
break;
default:
if( _result.isOk() ) {
TextColour okAnywayColour( TextColour::Success );
stream << "failed - but was ok ";
}
else {
TextColour errorColour( TextColour::Error );
stream << "failed ";
}
}
return false;
}