Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-01-15 08:09:20 +0000
committerPhil Nash2013-01-15 08:09:20 +0000
commit9beb6f24a17361be026985661ce0fa96cc4da9c8 (patch)
treebc8fd5942aa2c4084b9a41f4545d14afcb5ed5f0 /include
parent313481006fb2f2bd59eec547ec42c76c51faa836 (diff)
downloadcatch3-9beb6f24a17361be026985661ce0fa96cc4da9c8.tar.gz
More console reporter refactoring
Diffstat (limited to 'include')
-rw-r--r--include/reporters/catch_reporter_console.hpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index f83b4434..92a8f20a 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -63,16 +63,15 @@ namespace Catch {
struct ResultComponents {
ResultComponents( AssertionResult const& _result )
- : colour( TextColour::None )
+ : colour( TextColour::None ),
+ message( _result.getMessage() )
{
switch( _result.getResultType() ) {
case ResultWas::Ok:
colour = TextColour::Success;
passOrFail = "passed";
- if( _result.hasMessage() ){
+ if( _result.hasMessage() )
messageLabel = "with message";
- message = _result.getMessage();
- }
break;
case ResultWas::ExpressionFailed:
if( _result.isOk() ) {
@@ -85,14 +84,12 @@ namespace Catch {
}
if( _result.hasMessage() ){
messageLabel = "with message";
- message = _result.getMessage();
}
break;
case ResultWas::ThrewException:
colour = TextColour::Error;
passOrFail = "failed";
messageLabel = "due to unexpected exception with message";
- message = _result.getMessage();
break;
case ResultWas::DidntThrowException:
colour = TextColour::Error;
@@ -101,27 +98,24 @@ namespace Catch {
break;
case ResultWas::Info:
messageLabel = "info";
- message = _result.getMessage();
break;
case ResultWas::Warning:
messageLabel = "warning";
- message = _result.getMessage();
break;
case ResultWas::ExplicitFailure:
passOrFail = "failed";
colour = TextColour::Error;
messageLabel = "explicitly with message";
- message = _result.getMessage();
break;
case ResultWas::Exception:
passOrFail = "failed";
colour = TextColour::Error;
- if( _result.hasMessage() ){
+ if( _result.hasMessage() )
messageLabel = "with message";
- message = _result.getMessage();
- }
break;
- case ResultWas::Unknown: // These cases are here to prevent compiler warnings
+
+ // These cases are here to prevent compiler warnings
+ case ResultWas::Unknown:
case ResultWas::FailureBit:
passOrFail = "** internal error **";
colour = TextColour::Error;