3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced currentSectionInfo and m_rootSection with m_sectionStack

Browse Source
This commit is contained in:
Phil Nash
2013-08-08 08:05:19 +01:00
parent 6339254cb2
commit 29ccaa67ad
5 changed files with 59 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/reporters/catch_reporter_console.hpp
View File

@@ -62,7 +62,7 @@ namespace Catch {
if( _sectionStats.missingAssertions ) {
lazyPrint();
Colour colour( Colour::ResultError );
if( currentSectionInfo->parent )
if( m_sectionStack.size() > 1 )
stream << "\nNo assertions in section";
else
stream << "\nNo assertions in test case";
@@ -261,25 +261,20 @@ namespace Catch {
}
}
void printTestCaseAndSectionHeader() {
assert( !m_sectionStack.empty() );
printOpenHeader( unusedTestCaseInfo->name );
assert( currentSectionInfo );
if( currentSectionInfo ) {
Colour colourGuard( Colour::Headers );
std::vector<Node<SectionInfo>*> sections;
for( Node<SectionInfo>* section = currentSectionInfo.get();
section;
section = section->parent )
sections.push_back( section );
// Sections
std::vector<Node<SectionInfo>*>::const_reverse_iterator
it = sections.rbegin(), itEnd = sections.rend();
for( ++it; it != itEnd; ++it ) // Skip first section (test case)
if( m_sectionStack.size() > 1 ) {
Colour colourGuard( Colour::Headers );
std::vector<SectionInfoNode>::const_iterator
it = m_sectionStack.begin()+1, // Skip first section (test case)
itEnd = m_sectionStack.end();
for( ; it != itEnd; ++it )
printHeaderString( (*it)->value.name, 2 );
}
SourceLineInfo lineInfo = currentSectionInfo
? currentSectionInfo->value.lineInfo
: unusedTestCaseInfo->lineInfo;
SourceLineInfo lineInfo = m_sectionStack.front()->value.lineInfo;
if( !lineInfo.empty() ){
stream << getDashes() << "\n";