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

Removed circular dependency between SectionInfo and its parent

Browse Source
This commit is contained in:
Phil Nash 2013-01-26 20:17:52 +00:00
parent 67ccd8d74a
commit 603002c644
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/internal/catch_interfaces_reporter.h
View File

@ -77,14 +77,14 @@ namespace Catch
}; };
struct ThreadedSectionInfo : SectionInfo, SharedImpl<> { struct ThreadedSectionInfo : SectionInfo, SharedImpl<> {
ThreadedSectionInfo( SectionInfo const& _sectionInfo, Ptr<ThreadedSectionInfo> const& _parent = Ptr<ThreadedSectionInfo>() ) ThreadedSectionInfo( SectionInfo const& _sectionInfo, ThreadedSectionInfo* _parent = NULL )
: SectionInfo( _sectionInfo ), : SectionInfo( _sectionInfo ),
parent( _parent ) parent( _parent )
{} {}
virtual ~ThreadedSectionInfo(); virtual ~ThreadedSectionInfo();
std::vector<Ptr<ThreadedSectionInfo> > children; std::vector<Ptr<ThreadedSectionInfo> > children;
Ptr<ThreadedSectionInfo> parent; ThreadedSectionInfo* parent;
}; };
struct AssertionStats { struct AssertionStats {
@ -222,20 +222,19 @@ namespace Catch
} }
virtual void sectionStarting( SectionInfo const& _sectionInfo ) { virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo ); Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo );
unusedSectionInfo = sectionInfo;
if( !currentSectionInfo ) { if( !currentSectionInfo ) {
currentSectionInfo = sectionInfo; currentSectionInfo = sectionInfo;
m_rootSections.push_back( currentSectionInfo );
} }
else { else {
currentSectionInfo->children.push_back( sectionInfo ); currentSectionInfo->children.push_back( sectionInfo );
sectionInfo->parent = currentSectionInfo; sectionInfo->parent = currentSectionInfo.get();
currentSectionInfo = sectionInfo; currentSectionInfo = sectionInfo;
} }
} }
virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) { virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) {
currentSectionInfo = currentSectionInfo->parent; currentSectionInfo = currentSectionInfo->parent;
unusedSectionInfo = currentSectionInfo;
} }
virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) { virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) {
unusedTestCaseInfo.reset(); unusedTestCaseInfo.reset();
@ -245,7 +244,6 @@ namespace Catch
} }
virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) { virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) {
currentSectionInfo.reset(); currentSectionInfo.reset();
unusedSectionInfo.reset();
unusedTestCaseInfo.reset(); unusedTestCaseInfo.reset();
unusedGroupInfo.reset(); unusedGroupInfo.reset();
testRunInfo.reset(); testRunInfo.reset();
@ -255,9 +253,11 @@ namespace Catch
Option<TestRunInfo> testRunInfo; Option<TestRunInfo> testRunInfo;
Option<GroupInfo> unusedGroupInfo; Option<GroupInfo> unusedGroupInfo;
Option<TestCaseInfo> unusedTestCaseInfo; Option<TestCaseInfo> unusedTestCaseInfo;
Ptr<ThreadedSectionInfo> unusedSectionInfo;
Ptr<ThreadedSectionInfo> currentSectionInfo; Ptr<ThreadedSectionInfo> currentSectionInfo;
std::ostream& stream; std::ostream& stream;
// !TBD: This should really go in the TestCaseStats class
std::vector<Ptr<ThreadedSectionInfo> > m_rootSections;
}; };
struct TestGroupNode : TestGroupStats { struct TestGroupNode : TestGroupStats {
@ -303,7 +303,6 @@ namespace Catch
} }
virtual void sectionStarting( SectionInfo const& _sectionInfo ) { virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
// Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo ); // Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo );
// unusedSectionInfo = sectionInfo;
// if( !currentSectionInfo ) { // if( !currentSectionInfo ) {
// currentSectionInfo = sectionInfo; // currentSectionInfo = sectionInfo;
// } // }
@ -316,7 +315,6 @@ namespace Catch
virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) { virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) {
// currentSectionInfo = currentSectionInfo->parent; // currentSectionInfo = currentSectionInfo->parent;
// unusedSectionInfo = currentSectionInfo;
} }
virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) { virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) {
// unusedTestCaseInfo.reset(); // unusedTestCaseInfo.reset();
@ -328,7 +326,6 @@ namespace Catch
} }
virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) { virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) {
// currentSectionInfo.reset(); // currentSectionInfo.reset();
// unusedSectionInfo.reset();
// unusedTestCaseInfo.reset(); // unusedTestCaseInfo.reset();
// unusedGroupInfo.reset(); // unusedGroupInfo.reset();
// testRunInfo.reset(); // testRunInfo.reset();
@ -338,7 +335,6 @@ namespace Catch
// Option<TestRunInfo> testRunInfo; // Option<TestRunInfo> testRunInfo;
// Option<GroupInfo> unusedGroupInfo; // Option<GroupInfo> unusedGroupInfo;
// Option<TestCaseInfo> unusedTestCaseInfo; // Option<TestCaseInfo> unusedTestCaseInfo;
// Ptr<ThreadedSectionInfo> unusedSectionInfo;
// Ptr<ThreadedSectionInfo> currentSectionInfo; // Ptr<ThreadedSectionInfo> currentSectionInfo;
// Ptr<TestGroupNode> testGroupNode; // Ptr<TestGroupNode> testGroupNode;
Option<TestGroupNode> testGroupNode; Option<TestGroupNode> testGroupNode;

16
include/reporters/catch_reporter_console.hpp
View File

@ -17,6 +17,7 @@ namespace Catch {
struct ConsoleReporter : StreamingReporterBase { struct ConsoleReporter : StreamingReporterBase {
ConsoleReporter( ReporterConfig const& _config ) ConsoleReporter( ReporterConfig const& _config )
: StreamingReporterBase( _config ), : StreamingReporterBase( _config ),
m_printedCurrentSection( false ),
m_atLeastOneTestCasePrinted( false ) m_atLeastOneTestCasePrinted( false )
{} {}
@ -48,12 +49,17 @@ namespace Catch {
stream << std::endl; stream << std::endl;
} }
virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
m_printedCurrentSection = false;
StreamingReporterBase::sectionStarting( _sectionInfo );
}
virtual void sectionEnded( SectionStats const& _sectionStats ) { virtual void sectionEnded( SectionStats const& _sectionStats ) {
if( _sectionStats.missingAssertions ) { if( _sectionStats.missingAssertions ) {
lazyPrint(); lazyPrint();
TextColour colour( TextColour::ResultError ); TextColour colour( TextColour::ResultError );
stream << "\nNo assertions in section, '" << _sectionStats.sectionInfo.name << "'\n" << std::endl; stream << "\nNo assertions in section, '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
} }
m_printedCurrentSection = false;
StreamingReporterBase::sectionEnded( _sectionStats ); StreamingReporterBase::sectionEnded( _sectionStats );
} }
@ -219,7 +225,7 @@ namespace Catch {
lazyPrintGroupInfo(); lazyPrintGroupInfo();
if( unusedTestCaseInfo ) if( unusedTestCaseInfo )
lazyPrintTestCaseInfo(); lazyPrintTestCaseInfo();
if( unusedSectionInfo) if( currentSectionInfo && !m_printedCurrentSection )
lazyPrintSectionInfo(); lazyPrintSectionInfo();
m_atLeastOneTestCasePrinted = true; m_atLeastOneTestCasePrinted = true;
@ -252,9 +258,9 @@ namespace Catch {
void lazyPrintSectionInfo() { void lazyPrintSectionInfo() {
std::vector<ThreadedSectionInfo*> sections; std::vector<ThreadedSectionInfo*> sections;
for( ThreadedSectionInfo* section = unusedSectionInfo.get(); for( ThreadedSectionInfo* section = currentSectionInfo.get();
section; section;
section = section->parent.get() ) section = section->parent )
sections.push_back( section ); sections.push_back( section );
// Sections // Sections
@ -265,8 +271,8 @@ namespace Catch {
for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it )
stream << " " << (*it)->name << "\n"; stream << " " << (*it)->name << "\n";
stream << getDots() << "\n" << std::endl; stream << getDots() << "\n" << std::endl;
unusedSectionInfo.reset();
} }
m_printedCurrentSection = true;
} }
void printHeader( std::string const& _name, bool closed = true ) { void printHeader( std::string const& _name, bool closed = true ) {
@ -343,8 +349,8 @@ namespace Catch {
} }
private: private:
bool m_printedCurrentSection;
bool m_atLeastOneTestCasePrinted; bool m_atLeastOneTestCasePrinted;
}; };
INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter ) INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter )