3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 23:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Regenerated single include and baselines

Browse Source
This commit is contained in:
Phil Nash 2014-07-03 19:08:44 +01:00
parent 94a1acf766
commit 08e5296720
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -788,5 +788,4 @@ with expansion:
=============================================================================== ===============================================================================
test cases: 86 passed | 38 failed | 1 failed as expected | total: 125 test cases: 86 passed | 38 failed | 1 failed as expected | total: 125
assertions: 611 passed | 79 failed | 13 failed as expected | total: 703 assertions: 611 passed | 79 failed | 13 failed as expected | total: 703
===============================================================================

1
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@ -7299,5 +7299,4 @@ with expansion:
=============================================================================== ===============================================================================
test cases: 70 passed | 54 failed | 1 failed as expected | total: 125 test cases: 70 passed | 54 failed | 1 failed as expected | total: 125
assertions: 611 passed | 99 failed | 13 failed as expected | total: 723 assertions: 611 passed | 99 failed | 13 failed as expected | total: 723
===============================================================================

1
projects/SelfTest/Baselines/console.swa4.approved.txt
View File

@ -408,5 +408,4 @@ with expansion:
=============================================================================== ===============================================================================
test cases: 11 passed | 3 failed | 1 failed as expected | total: 15 test cases: 11 passed | 3 failed | 1 failed as expected | total: 15
assertions: 47 passed | 4 failed | 2 failed as expected | total: 53 assertions: 47 passed | 4 failed | 2 failed as expected | total: 53
===============================================================================

29
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 50 (master branch) * CATCH v1.0 build 50 (master branch)
* Generated: 2014-07-03 08:10:59.438355 * Generated: 2014-07-03 19:07:54.492176
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -7999,8 +7999,7 @@ namespace Catch {
struct ConsoleReporter : StreamingReporterBase { struct ConsoleReporter : StreamingReporterBase {
ConsoleReporter( ReporterConfig const& _config ) ConsoleReporter( ReporterConfig const& _config )
: StreamingReporterBase( _config ), : StreamingReporterBase( _config ),
m_headerPrinted( false ), m_headerPrinted( false )
m_atLeastOneTestCasePrinted( false )
{} {}
virtual ~ConsoleReporter(); virtual ~ConsoleReporter();
@ -8082,9 +8081,6 @@ namespace Catch {
virtual void testRunEnded( TestRunStats const& _testRunStats ) { virtual void testRunEnded( TestRunStats const& _testRunStats ) {
printTotalsDivider( _testRunStats.totals ); printTotalsDivider( _testRunStats.totals );
printTotals( _testRunStats.totals ); printTotals( _testRunStats.totals );
if( m_atLeastOneTestCasePrinted ||
( _testRunStats.totals.assertions.total() == 0 && _testRunStats.totals.testCases.total() > 0 ) )
printTotalsDivider( _testRunStats.totals );
stream << std::endl; stream << std::endl;
StreamingReporterBase::testRunEnded( _testRunStats ); StreamingReporterBase::testRunEnded( _testRunStats );
} }
@ -8236,7 +8232,6 @@ namespace Catch {
printTestCaseAndSectionHeader(); printTestCaseAndSectionHeader();
m_headerPrinted = true; m_headerPrinted = true;
} }
m_atLeastOneTestCasePrinted = true;
} }
void lazyPrintRunInfo() { void lazyPrintRunInfo() {
stream << "\n" << getLineOfChars<'~'>() << "\n"; stream << "\n" << getLineOfChars<'~'>() << "\n";
@ -8313,13 +8308,16 @@ namespace Catch {
stream << Colour( Colour::Warning ) << "No tests ran\n"; stream << Colour( Colour::Warning ) << "No tests ran\n";
} }
else if( totals.assertions.total() == 0 ) { else if( totals.assertions.total() == 0 ) {
printCounts( "test case", totals.testCases, cols ); stream << "test cases: ";
printCounts( totals.testCases, cols );
stream << "assertions: "; stream << "assertions: ";
stream << Colour( Colour::Warning ) << "- none -\n"; stream << Colour( Colour::Warning ) << "- none -\n";
} }
else if( totals.assertions.failed + totals.assertions.failedButOk ) { else if( totals.assertions.failed + totals.assertions.failedButOk ) {
printCounts( "test case", totals.testCases, cols ); stream << "test cases: ";
printCounts( "assertion", totals.assertions, cols ); printCounts( totals.testCases, cols );
stream << "assertions: ";
printCounts( totals.assertions, cols );
} }
else { else {
stream << Colour( Colour::ResultSuccess ) << "All tests passed"; stream << Colour( Colour::ResultSuccess ) << "All tests passed";
@ -8329,10 +8327,8 @@ namespace Catch {
<< "\n"; << "\n";
} }
} }
void printCounts( std::string const& label, Counts const& counts, int cols ) { void printCounts( Counts const& counts, int cols ) {
stream << label << "s: "; stream << Colour( counts.passed > 0 ? Colour::Success : Colour::LightGrey )
stream << Colour( counts.passed > 0 ? Colour::ResultSuccess : Colour::LightGrey )
<< std::setw( cols ) << counts.passed << " passed"; << std::setw( cols ) << counts.passed << " passed";
stream << Colour( Colour::LightGrey ) << " | "; stream << Colour( Colour::LightGrey ) << " | ";
@ -8344,8 +8340,8 @@ namespace Catch {
stream << Colour( counts.failedButOk > 0 ? Colour::ResultExpectedFailure : Colour::LightGrey ) stream << Colour( counts.failedButOk > 0 ? Colour::ResultExpectedFailure : Colour::LightGrey )
<< std::setw( cols ) << counts.failedButOk << " failed as expected"; << std::setw( cols ) << counts.failedButOk << " failed as expected";
} }
stream << Colour( Colour::LightGrey ) << " | "; stream << Colour( Colour::LightGrey ) << " | "
stream << "total: " << counts.total() << "\n"; << "total: " << counts.total() << "\n";
} }
static std::size_t makeRatio( std::size_t number, std::size_t total ) { static std::size_t makeRatio( std::size_t number, std::size_t total ) {
@ -8395,7 +8391,6 @@ namespace Catch {
private: private:
bool m_headerPrinted; bool m_headerPrinted;
bool m_atLeastOneTestCasePrinted;
}; };
INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter ) INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter )