Regen header

This commit is contained in:
Phil Nash 2012-02-22 09:44:06 +00:00
parent e1a2480f49
commit 2cc9b0dba1

View File

@ -5078,11 +5078,30 @@ namespace Catch
if( failed + succeeded == 0 ) if( failed + succeeded == 0 )
m_config.stream() << "No tests ran"; m_config.stream() << "No tests ran";
else if( failed == 0 ) else if( failed == 0 )
m_config.stream() << "All " << succeeded << " test(s) succeeded"; {
if( succeeded == 1 )
m_config.stream() << "1 test succeeded";
else
m_config.stream() << "All " << succeeded << " tests succeeded";
}
else if( succeeded == 0 ) else if( succeeded == 0 )
m_config.stream() << "All " << failed << " test(s) failed"; {
if( failed == 1 )
m_config.stream() << "1 test failed";
else
m_config.stream() << "All " << failed << " tests failed";
}
else else
m_config.stream() << succeeded << " test(s) passed but " << failed << " test(s) failed"; {
m_config.stream() << succeeded << " test";
if( succeeded > 1 )
m_config.stream() << "s";
m_config.stream() << " passed but " << failed << " test";
if( failed > 1 )
m_config.stream() << "s";
m_config.stream() << " failed";
}
} }
private: // IReporter private: // IReporter
@ -5110,7 +5129,7 @@ namespace Catch
) )
{ {
// Output the overall test results even if "Started Testing" was not emitted // Output the overall test results even if "Started Testing" was not emitted
m_config.stream() << "[Testing completed. "; m_config.stream() << "\n[Testing completed. ";
ReportCounts( succeeded, failed ); ReportCounts( succeeded, failed );
m_config.stream() << "]\n" << std::endl; m_config.stream() << "]\n" << std::endl;
} }