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

(Hopefully) fixed infinite loop in sections (GitHub #39).

Browse Source
This commit is contained in:
Phil Nash 2011-06-21 08:43:48 +01:00
parent f721a96d24
commit d258e49f7c
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/internal/catch_runner_impl.hpp
View File

@ -67,7 +67,6 @@ namespace Catch
Root, Root,
Unknown, Unknown,
NonLeaf, NonLeaf,
UntestedLeaf,
TestedLeaf TestedLeaf
}; };
@ -117,15 +116,23 @@ namespace Catch
} }
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
SectionInfo* getSubSection SectionInfo* findSubSection
( (
const std::string& name const std::string& name
) )
{ {
std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.find( name ); std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.find( name );
if( it != m_subSections.end() ) return it != m_subSections.end()
return it->second; ? it->second
: NULL;
}
///////////////////////////////////////////////////////////////////////
SectionInfo* addSubSection
(
const std::string& name
)
{
SectionInfo* subSection = new SectionInfo( this ); SectionInfo* subSection = new SectionInfo( this );
m_subSections.insert( std::make_pair( name, subSection ) ); m_subSections.insert( std::make_pair( name, subSection ) );
m_status = NonLeaf; m_status = NonLeaf;
@ -144,7 +151,7 @@ namespace Catch
() ()
const const
{ {
if( m_status == Unknown || m_status == UntestedLeaf ) if( m_status == Unknown )
return true; return true;
std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.begin(); std::map<std::string, SectionInfo*>::const_iterator it = m_subSections.begin();
@ -185,7 +192,8 @@ namespace Catch
) )
: m_info( info ), : m_info( info ),
m_runStatus( RanAtLeastOneSection ), m_runStatus( RanAtLeastOneSection ),
m_currentSection( &m_rootSection ) m_currentSection( &m_rootSection ),
m_changed( false )
{ {
} }
@ -203,6 +211,7 @@ namespace Catch
() ()
{ {
m_runStatus = NothingRun; m_runStatus = NothingRun;
m_changed = false;
} }
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
@ -224,7 +233,12 @@ namespace Catch
if( m_runStatus == NothingRun ) if( m_runStatus == NothingRun )
m_runStatus = EncounteredASection; m_runStatus = EncounteredASection;
SectionInfo* thisSection = m_currentSection->getSubSection( name ); SectionInfo* thisSection = m_currentSection->findSubSection( name );
if( !thisSection )
{
thisSection = m_currentSection->addSubSection( name );
m_changed = true;
}
if( !wasSectionSeen() && thisSection->shouldRun() ) if( !wasSectionSeen() && thisSection->shouldRun() )
{ {
@ -241,7 +255,10 @@ namespace Catch
) )
{ {
if( m_currentSection->ran() ) if( m_currentSection->ran() )
{
m_runStatus = RanAtLeastOneSection; m_runStatus = RanAtLeastOneSection;
m_changed = true;
}
m_currentSection = m_currentSection->getParent(); m_currentSection = m_currentSection->getParent();
} }
@ -258,8 +275,8 @@ namespace Catch
() ()
const const
{ {
return m_rootSection.hasUntestedSections() || return m_runStatus == RanAtLeastOneSection ||
m_runStatus == RanAtLeastOneSection; ( m_rootSection.hasUntestedSections() && m_changed );
} }
private: private:
@ -267,6 +284,7 @@ namespace Catch
RunStatus m_runStatus; RunStatus m_runStatus;
SectionInfo m_rootSection; SectionInfo m_rootSection;
SectionInfo* m_currentSection; SectionInfo* m_currentSection;
bool m_changed;
}; };
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////