3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed now redundant handling for missing assertions in test cases 

- handled as part of sections
This commit is contained in:
Phil Nash 2013-07-26 19:28:34 +01:00
parent e8cf726a23
commit 649f8c24b1
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_interfaces_reporter.h
View File

@ -134,13 +134,11 @@ namespace Catch
Totals const& _totals,
std::string const& _stdOut,
std::string const& _stdErr,
bool _missingAssertions,
bool _aborting )
: testInfo( _testInfo ),
totals( _totals ),
stdOut( _stdOut ),
stdErr( _stdErr ),
missingAssertions( _missingAssertions ),
aborting( _aborting )
{}
virtual ~TestCaseStats();
@ -149,7 +147,6 @@ namespace Catch
Totals totals;
std::string stdOut;
std::string stdErr;
bool missingAssertions;
bool aborting;
};

2
include/internal/catch_legacy_reporter_adapter.hpp
View File

@ -63,8 +63,6 @@ namespace Catch
m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions );
}
void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) {
if( testCaseStats.missingAssertions )
m_legacyReporter->NoAssertionsInTestCase( testCaseStats.testInfo.name );
m_legacyReporter->EndTestCase
( testCaseStats.testInfo,
testCaseStats.totals,

10
include/internal/catch_runner_impl.hpp
View File

@ -126,23 +126,13 @@ namespace Catch {
while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() );
Totals deltaTotals = m_totals.delta( prevTotals );
bool missingAssertions = false;
if( deltaTotals.assertions.total() == 0 && m_config->warnAboutMissingAssertions() ) {
m_totals.assertions.failed++;
deltaTotals = m_totals.delta( prevTotals );
missingAssertions = true;
}
m_totals.testCases += deltaTotals.testCases;
m_reporter->testCaseEnded( TestCaseStats( testInfo,
deltaTotals,
redirectedCout,
redirectedCerr,
missingAssertions,
aborting() ) );
m_activeTestCase = NULL;
m_testCaseTracker.reset();

6
include/reporters/catch_reporter_console.hpp
View File

@ -73,12 +73,6 @@ namespace Catch {
}
virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) {
if( _testCaseStats.missingAssertions ) {
lazyPrint();
Colour colour( Colour::ResultError );
stream << "\nNo assertions in test case, '" << _testCaseStats.testInfo.name << "'\n" << std::endl;
}
StreamingReporterBase::testCaseEnded( _testCaseStats );
m_headerPrinted = false;
}