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

Fixed pluralization bug from GitHub issue #101

Browse Source
This commit is contained in:
Phil Nash 2012-07-20 18:47:45 +01:00
parent 46bcd4b2b7
commit f606517376
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/reporters/catch_reporter_basic.hpp
View File

@ -90,7 +90,7 @@ namespace Catch {
else { else {
TextColour colour( TextColour::ResultSuccess ); TextColour colour( TextColour::ResultSuccess );
m_config.stream() << allPrefix << "tests passed (" m_config.stream() << allPrefix << "tests passed ("
<< pluralise( totals.assertions.passed, "assertion" ) << " in " << pluralise( totals.assertions.passed, "assertion" ) << " in "
<< pluralise( totals.testCases.passed, "test case" ) << ")"; << pluralise( totals.testCases.passed, "test case" ) << ")";
} }
} }
@ -155,7 +155,7 @@ namespace Catch {
else { else {
TextColour colour( TextColour::ResultSuccess ); TextColour colour( TextColour::ResultSuccess );
m_config.stream() << ( assertions.passed > 1 ? "All " : "" ) m_config.stream() << ( assertions.passed > 1 ? "All " : "" )
<< pluralise( assertions.passed, "assertion" ) << "passed" ; << pluralise( assertions.passed, "assertion" ) << " passed" ;
} }
m_config.stream() << "]\n" << std::endl; m_config.stream() << "]\n" << std::endl;
} }

4
single_include/catch.hpp
View File

@ -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 * 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.
@ -3869,7 +3869,7 @@ namespace Catch {
else { else {
TextColour colour( TextColour::ResultSuccess ); TextColour colour( TextColour::ResultSuccess );
m_config.stream() << ( assertions.passed > 1 ? "All " : "" ) m_config.stream() << ( assertions.passed > 1 ? "All " : "" )
<< pluralise( assertions.passed, "assertion" ) << "passed" ; << pluralise( assertions.passed, "assertion" ) << " passed" ;
} }
m_config.stream() << "]\n" << std::endl; m_config.stream() << "]\n" << std::endl;
} }