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

Tidied up reporting of missing assertions in test cases 

- also removed basic reporter from approval test
This commit is contained in:
Phil Nash 2013-07-26 19:19:44 +01:00
parent 801672b962
commit b80280f428
4 changed files with 42 additions and 2829 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/internal/catch_runner_impl.hpp
View File

@ -267,6 +267,7 @@ namespace Catch {
TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
SectionInfo testCaseSection( testCaseInfo.name, testCaseInfo.description, testCaseInfo.lineInfo );
m_reporter->sectionStarting( testCaseSection );
Counts prevAssertions = m_totals.assertions;
try {
m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
TestCaseTracker::Guard guard( *m_testCaseTracker );
@ -297,7 +298,20 @@ namespace Catch {
sectionEnded( it->info, it->prevAssertions );
m_unfinishedSections.clear();
m_messages.clear();
SectionStats testCaseSectionStats( testCaseSection, Counts(), 0 ); // !TBD
Counts assertions = m_totals.assertions - prevAssertions;
// !TBD?
bool missingAssertions = false;
if( assertions.total() == 0 &&
m_config->warnAboutMissingAssertions() &&
!m_testCaseTracker->currentSectionHasChildren() ) {
m_totals.assertions.failed++;
assertions.failed++;
missingAssertions = true;
}
SectionStats testCaseSectionStats( testCaseSection, assertions, missingAssertions );
m_reporter->sectionEnded( testCaseSectionStats );
}

7
include/reporters/catch_reporter_console.hpp
View File

@ -62,7 +62,11 @@ namespace Catch {
if( _sectionStats.missingAssertions ) {
lazyPrint();
Colour colour( Colour::ResultError );
stream << "\nNo assertions in section, '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
if( currentSectionInfo->parent )
stream << "\nNo assertions in section";
else
stream << "\nNo assertions in test case";
stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
}
m_headerPrinted = false;
StreamingReporterBase::sectionEnded( _sectionStats );
@ -262,6 +266,7 @@ namespace Catch {
}
void printTestCaseAndSectionHeader() {
printOpenHeader( unusedTestCaseInfo->name );
assert( currentSectionInfo );
if( currentSectionInfo ) {
Colour colourGuard( Colour::Headers );
std::vector<ThreadedSectionInfo*> sections;

2846
projects/SelfTest/Baselines/approvedResults.txt
View File

File diff suppressed because it is too large Load Diff

2
scripts/approvalTests.py
View File

@ -26,8 +26,6 @@ subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console"
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console", "-a", "4" ], stdout=f, stderr=f )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "junit" ], stdout=f, stderr=f )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "xml" ], stdout=f, stderr=f )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "basic" ], stdout=f, stderr=f )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "basic", "-a", "4" ], stdout=f, stderr=f )
f.close()
rawFile = open( rawResultsPath, 'r' )