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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-06-09 22:09:00 +0200
committerMartin Hořeňovský2021-06-18 10:34:58 +0200
commitc064322a9d9807a74f9974cba1cf06551c5808bb (patch)
tree81307624dc9c77220d7e4b4e520c20d3153b3812 /src/catch2
parenta14d67cacede08349036cc13691861569a27d979 (diff)
downloadcatch3-c064322a9d9807a74f9974cba1cf06551c5808bb.tar.gz
Devirtualize ITracker::parent
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp10
-rw-r--r--src/catch2/internal/catch_test_case_tracker.hpp14
2 files changed, 9 insertions, 15 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index 9354b362..b040f63a 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -84,9 +84,8 @@ namespace TestCaseTracking {
TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
- ITracker(nameAndLocation),
- m_ctx( ctx ),
- m_parent( parent )
+ ITracker(nameAndLocation, parent),
+ m_ctx( ctx )
{}
bool TrackerBase::isComplete() const {
@@ -99,11 +98,6 @@ namespace TestCaseTracking {
return m_runState != NotStarted && !isComplete();
}
- ITracker* TrackerBase::parent() {
- assert( m_parent ); // Should always be non-null except for root
- return m_parent;
- }
-
void TrackerBase::openChild() {
if( m_runState != ExecutingChildren ) {
m_runState = ExecutingChildren;
diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp
index 9e36a19d..8c2222af 100644
--- a/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/src/catch2/internal/catch_test_case_tracker.hpp
@@ -38,11 +38,13 @@ namespace TestCaseTracking {
using Children = std::vector<ITrackerPtr>;
protected:
+ ITracker* m_parent = nullptr;
Children m_children;
public:
- ITracker(NameAndLocation const& nameAndLoc) :
- m_nameAndLocation(nameAndLoc)
+ ITracker( NameAndLocation const& nameAndLoc, ITracker* parent ):
+ m_nameAndLocation( nameAndLoc ),
+ m_parent( parent )
{}
@@ -50,6 +52,9 @@ namespace TestCaseTracking {
NameAndLocation const& nameAndLocation() const {
return m_nameAndLocation;
}
+ ITracker* parent() const {
+ return m_parent;
+ }
virtual ~ITracker(); // = default
@@ -60,8 +65,6 @@ namespace TestCaseTracking {
virtual bool isOpen() const = 0; // Started but not complete
virtual bool hasStarted() const = 0;
- virtual ITracker* parent() = 0;
-
// actions
virtual void close() = 0; // Successfully complete
virtual void fail() = 0;
@@ -125,7 +128,6 @@ namespace TestCaseTracking {
};
TrackerContext& m_ctx;
- ITracker* m_parent;
CycleState m_runState = NotStarted;
public:
@@ -138,8 +140,6 @@ namespace TestCaseTracking {
return m_runState != NotStarted;
}
- ITracker* parent() override;
-
void openChild() override;
bool isSectionTracker() const override;