eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-06-01 17:37:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added ReporterPreferences and started some SectionInfo refactoring

Browse source
This commit is contained in:
Phil Nash 2012-11-29 09:05:51 +00:00
parent 994e64c217
commit c4ba6757d9
4 changed files with 93 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

17
include/internal/catch_running_test.hpp
View file

@ -24,9 +24,10 @@ namespace Catch {
};
public:
explicit RunningTest( const TestCase* info = NULL )
explicit RunningTest( const TestCase& info )
: m_info( info ),
m_runStatus( RanAtLeastOneSection ),
m_rootSection( info.getTestCaseInfo().name ),
m_currentSection( &m_rootSection ),
m_changed( false )
{}
@ -71,12 +72,8 @@ namespace Catch {
if( m_runStatus == NothingRun )
m_runStatus = EncounteredASection;
SectionInfo* thisSection = m_currentSection->findSubSection( name );
if( !thisSection ) {
thisSection = m_currentSection->addSubSection( name );
m_changed = true;
}
SectionInfo* thisSection = m_currentSection->findOrAddSubSection( name, m_changed );
if( !wasSectionSeen() && thisSection->shouldRun() ) {
m_currentSection = thisSection;
m_lastSectionToRun = NULL;
@ -98,16 +95,16 @@ namespace Catch {
}
const TestCase& getTestCase() const {
return *m_info;
return m_info;
}
bool hasUntestedSections() const {
return m_runStatus == RanAtLeastOneSection ||
( m_rootSection.hasUntestedSections() && m_changed );
}
private:
const TestCase* m_info;
const TestCase& m_info;
RunStatus m_runStatus;
SectionInfo m_rootSection;
SectionInfo* m_currentSection;