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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-03-16 20:19:38 +0000
committerPhil Nash2013-03-16 20:19:38 +0000
commita46ee0222a2db8340e4efe63eb9e9f7a7e20bf75 (patch)
tree1bc328838018cd7f723d7fc78ac83d4d8560e2a8 /include
parentc0b698073e5e69204b6c5468a74ce5cfdc8e65fa (diff)
downloadcatch3-a46ee0222a2db8340e4efe63eb9e9f7a7e20bf75.tar.gz
Print ~~~ at start of console output.
Some cleanup in the reporter code
Diffstat (limited to 'include')
-rw-r--r--include/reporters/catch_reporter_console.hpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 3f0c770c..ea3ea47a 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -129,9 +129,6 @@ namespace Catch {
messageLabel = "with message";
if( _stats.infoMessages.size() > 1 )
messageLabel = "with messages";
-// if( result.hasMessage() ){
-// messageLabel = "with message";
-// }
break;
case ResultWas::ThrewException:
colour = TextColour::Error;
@@ -152,7 +149,6 @@ namespace Catch {
case ResultWas::ExplicitFailure:
passOrFail = "FAILED";
colour = TextColour::Error;
-// messageLabel = "explicitly with message";
if( _stats.infoMessages.size() == 1 )
messageLabel = "explicitly with message";
if( _stats.infoMessages.size() > 1 )
@@ -165,8 +161,6 @@ namespace Catch {
messageLabel = "with message";
if( _stats.infoMessages.size() > 1 )
messageLabel = "with messages";
-// if( result.hasMessage() )
-// messageLabel = "with message";
break;
// These cases are here to prevent compiler warnings
@@ -227,8 +221,6 @@ namespace Catch {
++it ) {
stream << wrapLongStrings( it->message ) << "\n";
}
-// if( !message.empty() )
-// stream << wrapLongStrings( message ) << "\n";
}
void printSourceInfo() const {
TextColour colourGuard( TextColour::FileName );
@@ -263,7 +255,8 @@ namespace Catch {
m_atLeastOneTestCasePrinted = true;
}
void lazyPrintRunInfo() {
- stream << "\n" << testRunInfo->name
+ stream << "\n" << getTildes() << "\n";
+ stream << testRunInfo->name
<< " is a CATCH v" << libraryVersion.majorVersion << "."
<< libraryVersion.minorVersion << " b"
<< libraryVersion.buildNumber;
@@ -379,6 +372,10 @@ namespace Catch {
static const std::string doubleDashes( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' );
return doubleDashes;
}
+ static std::string const& getTildes() {
+ static const std::string dots( CATCH_CONFIG_CONSOLE_WIDTH-1, '~' );
+ return dots;
+ }
private:
bool m_headerPrinted;