From f606517376c5e3f94e9927afcf2bca0f0005237e Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Fri, 20 Jul 2012 18:47:45 +0100 Subject: [PATCH] Fixed pluralization bug from GitHub issue #101 --- include/reporters/catch_reporter_basic.hpp | 4 ++-- single_include/catch.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/reporters/catch_reporter_basic.hpp b/include/reporters/catch_reporter_basic.hpp index f5fc6ee1..57d830a5 100644 --- a/include/reporters/catch_reporter_basic.hpp +++ b/include/reporters/catch_reporter_basic.hpp @@ -90,7 +90,7 @@ namespace Catch { else { TextColour colour( TextColour::ResultSuccess ); m_config.stream() << allPrefix << "tests passed (" - << pluralise( totals.assertions.passed, "assertion" ) << " in " + << pluralise( totals.assertions.passed, "assertion" ) << " in " << pluralise( totals.testCases.passed, "test case" ) << ")"; } } @@ -155,7 +155,7 @@ namespace Catch { else { TextColour colour( TextColour::ResultSuccess ); m_config.stream() << ( assertions.passed > 1 ? "All " : "" ) - << pluralise( assertions.passed, "assertion" ) << "passed" ; + << pluralise( assertions.passed, "assertion" ) << " passed" ; } m_config.stream() << "]\n" << std::endl; } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index b1231b99..c2615e3c 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,5 +1,5 @@ /* - * Generated: 2012-07-20 18:42:56.789420 + * Generated: 2012-07-20 18:46:50.092936 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -3869,7 +3869,7 @@ namespace Catch { else { TextColour colour( TextColour::ResultSuccess ); m_config.stream() << ( assertions.passed > 1 ? "All " : "" ) - << pluralise( assertions.passed, "assertion" ) << "passed" ; + << pluralise( assertions.passed, "assertion" ) << " passed" ; } m_config.stream() << "]\n" << std::endl; }