From 2cc9b0dba18e5f32eedff63f843d29fcbeccd1b2 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 22 Feb 2012 09:44:06 +0000 Subject: [PATCH] Regen header --- single_include/catch.hpp | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/single_include/catch.hpp b/single_include/catch.hpp index ffa159ac..a285cd11 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -5078,11 +5078,30 @@ namespace Catch if( failed + succeeded == 0 ) m_config.stream() << "No tests ran"; 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 ) - 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 - 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 @@ -5110,7 +5129,7 @@ namespace Catch ) { // 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 ); m_config.stream() << "]\n" << std::endl; }