Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-08-08 08:05:19 +0100
committerPhil Nash2013-08-08 08:05:19 +0100
commit29ccaa67ad7dae7be2a7503bd795c64de973d013 (patch)
tree82438b28a8ed4222c6b94bedee18f10808c7372b /include
parent6339254cb28a49581b25602739c7497139899c45 (diff)
downloadcatch3-29ccaa67ad7dae7be2a7503bd795c64de973d013.tar.gz
Replaced currentSectionInfo and m_rootSection with m_sectionStack
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_impl.hpp2
-rw-r--r--include/internal/catch_interfaces_reporter.h48
-rw-r--r--include/reporters/catch_reporter_console.hpp27
3 files changed, 33 insertions, 44 deletions
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index c4959026..f01fe457 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -58,8 +58,6 @@ namespace Catch {
TestCaseStats::~TestCaseStats() {}
TestGroupStats::~TestGroupStats() {}
TestRunStats::~TestRunStats() {}
- TestGroupNode::~TestGroupNode() {}
- TestRunNode::~TestRunNode() {}
BasicReporter::~BasicReporter() {}
StreamingReporterBase::~StreamingReporterBase() {}
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index 057eef94..488397a2 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -47,7 +47,7 @@ namespace Catch
};
- template<typename T>
+ template<typename T, typename ChildT=T>
struct Node : SharedImpl<> {
Node( T const& _value, Node* _parent = NULL )
: value( _value ),
@@ -223,6 +223,8 @@ namespace Catch
struct StreamingReporterBase : SharedImpl<IStreamingReporter> {
+ typedef Ptr<Node<SectionInfo> > SectionInfoNode;
+
StreamingReporterBase( ReporterConfig const& _config )
: m_config( _config.fullConfig() ),
stream( _config.stream() )
@@ -244,28 +246,20 @@ namespace Catch
}
virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
Ptr<Node<SectionInfo> > sectionInfo = new Node<SectionInfo>( _sectionInfo );
- if( !currentSectionInfo ) {
- currentSectionInfo = sectionInfo;
- m_rootSections.push_back( currentSectionInfo );
- }
- else {
- currentSectionInfo->children.push_back( sectionInfo );
- sectionInfo->parent = currentSectionInfo.get();
- currentSectionInfo = sectionInfo;
- }
+ m_sectionStack.push_back( sectionInfo );
}
virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) {
- currentSectionInfo = currentSectionInfo->parent;
+ m_sectionStack.pop_back();
}
virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) {
unusedTestCaseInfo.reset();
+ assert( m_sectionStack.empty() );
}
virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) {
unusedGroupInfo.reset();
}
virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) {
- currentSectionInfo.reset();
unusedTestCaseInfo.reset();
unusedGroupInfo.reset();
testRunInfo.reset();
@@ -275,26 +269,27 @@ namespace Catch
Option<TestRunInfo> testRunInfo;
Option<GroupInfo> unusedGroupInfo;
Option<TestCaseInfo> unusedTestCaseInfo;
- Ptr<Node<SectionInfo> > currentSectionInfo;
std::ostream& stream;
- // !TBD: This should really go in the TestCaseStats class
- std::vector<Ptr<Node<SectionInfo> > > m_rootSections;
+ std::vector<SectionInfoNode> m_sectionStack;
};
- struct TestGroupNode : TestGroupStats {
- TestGroupNode( TestGroupStats const& _stats ) : TestGroupStats( _stats ) {}
-// TestGroupNode( GroupInfo const& _info ) : TestGroupStats( _stats ) {}
- ~TestGroupNode();
+ struct CumulativeReporterBase : StreamingReporterBase {
+ virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+ virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
- };
+ virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+ virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
- struct TestRunNode : TestRunStats {
+ virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
- TestRunNode( TestRunStats const& _stats ) : TestRunStats( _stats ) {}
- ~TestRunNode();
+ virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+ virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+ virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+ virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+ virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
- std::vector<TestGroupNode> groups;
+ std::vector<Ptr<Node<TestGroupStats> > > m_groups;
};
// Deprecated
@@ -333,8 +328,9 @@ namespace Catch
};
inline std::string trim( std::string const& str ) {
- std::string::size_type start = str.find_first_not_of( "\n\r\t " );
- std::string::size_type end = str.find_last_not_of( "\n\r\t " );
+ static char const* whitespaceChars = "\n\r\t ";
+ std::string::size_type start = str.find_first_not_of( whitespaceChars );
+ std::string::size_type end = str.find_last_not_of( whitespaceChars );
return start != std::string::npos ? str.substr( start, 1+end-start ) : "";
}
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index d750f3e4..2bb93e42 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -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 ) {
+
+ if( m_sectionStack.size() > 1 ) {
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)
+
+ 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";