mirror of
https://github.com/catchorg/Catch2.git
synced 2024-12-24 03:53:29 +01:00
a020865990
When the section tracking code was rewritten a while back to simplify and iron out some bugs the order of evaluation was changed so that each new section was skipped on the first run through. This had unwelcome consequences for some people. This commit restores the original semantics (while maintaining the simpler, less buggy, new code).
144 lines
4.2 KiB
C++
144 lines
4.2 KiB
C++
/*
|
|
* Created by Phil Nash on 23/7/2013
|
|
* Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
|
|
*
|
|
* Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
*/
|
|
#ifndef TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
|
|
#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <assert.h>
|
|
|
|
namespace Catch {
|
|
namespace SectionTracking {
|
|
|
|
class TrackedSection {
|
|
|
|
typedef std::map<std::string, TrackedSection> TrackedSections;
|
|
|
|
public:
|
|
enum RunState {
|
|
NotStarted,
|
|
Executing,
|
|
ExecutingChildren,
|
|
Completed
|
|
};
|
|
|
|
TrackedSection( std::string const& name, TrackedSection* parent )
|
|
: m_name( name ), m_runState( NotStarted ), m_parent( parent )
|
|
{}
|
|
|
|
RunState runState() const { return m_runState; }
|
|
|
|
TrackedSection* findChild( std::string const& childName ) {
|
|
TrackedSections::iterator it = m_children.find( childName );
|
|
return it != m_children.end()
|
|
? &it->second
|
|
: NULL;
|
|
}
|
|
TrackedSection* acquireChild( std::string const& childName ) {
|
|
if( TrackedSection* child = findChild( childName ) )
|
|
return child;
|
|
m_children.insert( std::make_pair( childName, TrackedSection( childName, this ) ) );
|
|
return findChild( childName );
|
|
}
|
|
void enter() {
|
|
if( m_runState == NotStarted )
|
|
m_runState = Executing;
|
|
}
|
|
void leave() {
|
|
for( TrackedSections::const_iterator it = m_children.begin(), itEnd = m_children.end();
|
|
it != itEnd;
|
|
++it )
|
|
if( it->second.runState() != Completed ) {
|
|
m_runState = ExecutingChildren;
|
|
return;
|
|
}
|
|
m_runState = Completed;
|
|
}
|
|
TrackedSection* getParent() {
|
|
return m_parent;
|
|
}
|
|
bool hasChildren() const {
|
|
return !m_children.empty();
|
|
}
|
|
|
|
private:
|
|
std::string m_name;
|
|
RunState m_runState;
|
|
TrackedSections m_children;
|
|
TrackedSection* m_parent;
|
|
|
|
};
|
|
|
|
class TestCaseTracker {
|
|
public:
|
|
TestCaseTracker( std::string const& testCaseName )
|
|
: m_testCase( testCaseName, NULL ),
|
|
m_currentSection( &m_testCase ),
|
|
m_completedASectionThisRun( false )
|
|
{}
|
|
|
|
bool enterSection( std::string const& name ) {
|
|
TrackedSection* child = m_currentSection->acquireChild( name );
|
|
if( m_completedASectionThisRun || child->runState() == TrackedSection::Completed )
|
|
return false;
|
|
|
|
m_currentSection = child;
|
|
m_currentSection->enter();
|
|
return true;
|
|
}
|
|
void leaveSection() {
|
|
m_currentSection->leave();
|
|
m_currentSection = m_currentSection->getParent();
|
|
assert( m_currentSection != NULL );
|
|
m_completedASectionThisRun = true;
|
|
}
|
|
|
|
bool currentSectionHasChildren() const {
|
|
return m_currentSection->hasChildren();
|
|
}
|
|
bool isCompleted() const {
|
|
return m_testCase.runState() == TrackedSection::Completed;
|
|
}
|
|
|
|
class Guard {
|
|
public:
|
|
Guard( TestCaseTracker& tracker ) : m_tracker( tracker ) {
|
|
m_tracker.enterTestCase();
|
|
}
|
|
~Guard() {
|
|
m_tracker.leaveTestCase();
|
|
}
|
|
private:
|
|
Guard( Guard const& );
|
|
void operator = ( Guard const& );
|
|
TestCaseTracker& m_tracker;
|
|
};
|
|
|
|
private:
|
|
void enterTestCase() {
|
|
m_currentSection = &m_testCase;
|
|
m_completedASectionThisRun = false;
|
|
m_testCase.enter();
|
|
}
|
|
void leaveTestCase() {
|
|
m_testCase.leave();
|
|
}
|
|
|
|
TrackedSection m_testCase;
|
|
TrackedSection* m_currentSection;
|
|
bool m_completedASectionThisRun;
|
|
};
|
|
|
|
} // namespace SectionTracking
|
|
|
|
using SectionTracking::TestCaseTracker;
|
|
|
|
} // namespace Catch
|
|
|
|
#endif // TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
|