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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-01-18 08:09:28 +0000
committerPhil Nash2013-01-18 08:09:28 +0000
commit3ce320db4f7943f48737be3fb304419e136a4275 (patch)
treebacd7b60fa24dbd54f9b9635c1f7403c62c738e8 /include
parentb588755a9298389989fc376848ef62254980a7c6 (diff)
downloadcatch3-3ce320db4f7943f48737be3fb304419e136a4275.tar.gz
More console reporter tweaks
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_version.hpp2
-rw-r--r--include/reporters/catch_reporter_console.hpp14
2 files changed, 9 insertions, 7 deletions
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index adc262b4..1d5eac22 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
- Version libraryVersion( 0, 9, 14, "integration" );
+ Version libraryVersion( 0, 9, 15, "integration" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index dbb3b023..292b354b 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -48,19 +48,16 @@ namespace Catch {
if( _assertionStats.totals.assertions.total() > 0 ) {
printResultType( components );
printOriginalExpression( result );
-// printResultType( components );
endsWithNewLine = printReconstructedExpression( result );
}
endsWithNewLine |= printMessage( components );
-// if( !endsWithNewLine )
-// stream << "\n";
printSourceInfo( result );
stream << std::endl;
}
void printSourceInfo( AssertionResult const& _result ) {
TextColour colour( TextColour::FileName );
- stream << _result.getSourceInfo() << "\n";
+ stream << _result.getSourceInfo() << ":\n";
}
struct ResultComponents {
@@ -266,7 +263,7 @@ namespace Catch {
typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it )
stream << " " << (*it)->name << "\n";
- stream << getDashes() << "\n" << std::endl;
+ stream << getDots() << "\n" << std::endl;
unusedSectionInfo.reset();
}
}
@@ -275,7 +272,7 @@ namespace Catch {
stream << getDashes() << "\n"
<< _name << "\n";
if( closed )
- stream << getDashes() << "\n";
+ stream << getDots() << "\n";
}
void printTotals( const Totals& totals ) {
@@ -336,6 +333,11 @@ namespace Catch {
= "-----------------------------------------------------------------";
return dashes;
}
+ static std::string const& getDots() {
+ static const std::string dots
+ = ".................................................................";
+ return dots;
+ }
static std::string const& getDoubleDashes() {
static const std::string doubleDashes
= "=================================================================";