diff options
| author | Martin Hořeňovský | 2020-07-27 19:53:54 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-07-27 19:53:54 +0200 |
| commit | ef92178058db3f153457ad515e58d3fe1d4fe3b0 (patch) | |
| tree | aec2b38688f242c111facaade286ab3b8ec38718 /src/catch2/internal/catch_test_case_tracker.cpp | |
| parent | 125d4b41643ab410545d7c1cc8dabd7f862f5277 (diff) | |
| download | catch3-ef92178058db3f153457ad515e58d3fe1d4fe3b0.tar.gz | |
Devirtualize nested tracker handling
Diffstat (limited to 'src/catch2/internal/catch_test_case_tracker.cpp')
| -rw-r--r-- | src/catch2/internal/catch_test_case_tracker.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp index 188d3ae1..098547fb 100644 --- a/src/catch2/internal/catch_test_case_tracker.cpp +++ b/src/catch2/internal/catch_test_case_tracker.cpp @@ -31,6 +31,23 @@ namespace TestCaseTracking { ITracker::~ITracker() = default; + void ITracker::addChild( ITrackerPtr const& child ) { + m_children.push_back( child ); + } + + ITrackerPtr ITracker::findChild( NameAndLocation const& nameAndLocation ) { + auto it = std::find_if( + m_children.begin(), + m_children.end(), + [&nameAndLocation]( ITrackerPtr const& tracker ) { + return tracker->nameAndLocation().location == + nameAndLocation.location && + tracker->nameAndLocation().name == nameAndLocation.name; + } ); + return ( it != m_children.end() ) ? *it : nullptr; + } + + ITracker& TrackerContext::startRun() { m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr ); @@ -79,26 +96,7 @@ namespace TestCaseTracking { bool TrackerBase::isOpen() const { return m_runState != NotStarted && !isComplete(); } - bool TrackerBase::hasChildren() const { - return !m_children.empty(); - } - - void TrackerBase::addChild( ITrackerPtr const& child ) { - m_children.push_back( child ); - } - - ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) { - auto it = std::find_if( m_children.begin(), m_children.end(), - [&nameAndLocation]( ITrackerPtr const& tracker ){ - return - tracker->nameAndLocation().location == nameAndLocation.location && - tracker->nameAndLocation().name == nameAndLocation.name; - } ); - return( it != m_children.end() ) - ? *it - : nullptr; - } ITracker& TrackerBase::parent() { assert( m_parent ); // Should always be non-null except for root return *m_parent; |