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-17 23:51:25 +0200
committerMartin Hořeňovský2021-06-18 10:35:02 +0200
commit70f53922102bc3b19b01fc9e1423be77b38170f4 (patch)
tree2f0c3d695eeb7b08719db0a3d52b1144b62f5db6 /src/catch2
parent61461dfd1ded8791499af80e52f3972d927944e1 (diff)
downloadcatch3-70f53922102bc3b19b01fc9e1423be77b38170f4.tar.gz
Devirtualize more things in trackers
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/internal/catch_test_case_tracker.cpp39
-rw-r--r--src/catch2/internal/catch_test_case_tracker.hpp45
2 files changed, 44 insertions, 40 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp
index 7d5d574a..ada521ca 100644
--- a/src/catch2/internal/catch_test_case_tracker.cpp
+++ b/src/catch2/internal/catch_test_case_tracker.cpp
@@ -29,6 +29,10 @@ namespace TestCaseTracking {
ITracker::~ITracker() = default;
+ void ITracker::markAsNeedingAnotherRun() {
+ m_runState = NeedsAnotherRun;
+ }
+
void ITracker::addChild( ITrackerPtr&& child ) {
m_children.push_back( std::move(child) );
}
@@ -48,6 +52,24 @@ namespace TestCaseTracking {
bool ITracker::isSectionTracker() const { return false; }
bool ITracker::isGeneratorTracker() const { return false; }
+ bool ITracker::isSuccessfullyCompleted() const {
+ return m_runState == CompletedSuccessfully;
+ }
+
+ bool ITracker::isOpen() const {
+ return m_runState != NotStarted && !isComplete();
+ }
+
+ bool ITracker::hasStarted() const { return m_runState != NotStarted; }
+
+ void ITracker::openChild() {
+ if (m_runState != ExecutingChildren) {
+ m_runState = ExecutingChildren;
+ if (m_parent) {
+ m_parent->openChild();
+ }
+ }
+ }
ITracker& TrackerContext::startRun() {
using namespace std::string_literals;
@@ -93,20 +115,6 @@ namespace TestCaseTracking {
bool TrackerBase::isComplete() const {
return m_runState == CompletedSuccessfully || m_runState == Failed;
}
- bool TrackerBase::isSuccessfullyCompleted() const {
- return m_runState == CompletedSuccessfully;
- }
- bool TrackerBase::isOpen() const {
- return m_runState != NotStarted && !isComplete();
- }
-
- void TrackerBase::openChild() {
- if( m_runState != ExecutingChildren ) {
- m_runState = ExecutingChildren;
- if( m_parent )
- m_parent->openChild();
- }
- }
void TrackerBase::open() {
m_runState = Executing;
@@ -151,9 +159,6 @@ namespace TestCaseTracking {
moveToParent();
m_ctx.completeCycle();
}
- void TrackerBase::markAsNeedingAnotherRun() {
- m_runState = NeedsAnotherRun;
- }
void TrackerBase::moveToParent() {
assert( m_parent );
diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp
index d018210c..1242d8de 100644
--- a/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/src/catch2/internal/catch_test_case_tracker.hpp
@@ -38,8 +38,18 @@ namespace TestCaseTracking {
using Children = std::vector<ITrackerPtr>;
protected:
+ enum CycleState {
+ NotStarted,
+ Executing,
+ ExecutingChildren,
+ NeedsAnotherRun,
+ CompletedSuccessfully,
+ Failed
+ };
+
ITracker* m_parent = nullptr;
Children m_children;
+ CycleState m_runState = NotStarted;
public:
ITracker( NameAndLocation const& nameAndLoc, ITracker* parent ):
@@ -60,15 +70,20 @@ namespace TestCaseTracking {
// dynamic queries
- virtual bool isComplete() const = 0; // Successfully completed or failed
- virtual bool isSuccessfullyCompleted() const = 0;
- virtual bool isOpen() const = 0; // Started but not complete
- virtual bool hasStarted() const = 0;
+
+ //! Returns true if tracker run to completion (successfully or not)
+ virtual bool isComplete() const = 0;
+ //! Returns true if tracker run to completion succesfully
+ bool isSuccessfullyCompleted() const;
+ //! Returns true if tracker has started but hasn't been completed
+ bool isOpen() const;
+ //! Returns true iff tracker has started
+ bool hasStarted() const;
// actions
virtual void close() = 0; // Successfully complete
virtual void fail() = 0;
- virtual void markAsNeedingAnotherRun() = 0;
+ void markAsNeedingAnotherRun();
//! Register a nested ITracker
void addChild( ITrackerPtr&& child );
@@ -84,7 +99,8 @@ namespace TestCaseTracking {
}
- virtual void openChild() = 0;
+ //! Marks tracker as executing a child, doing se recursively up the tree
+ void openChild();
/**
* Returns true if the instance is a section tracker
@@ -129,35 +145,18 @@ namespace TestCaseTracking {
class TrackerBase : public ITracker {
protected:
- enum CycleState {
- NotStarted,
- Executing,
- ExecutingChildren,
- NeedsAnotherRun,
- CompletedSuccessfully,
- Failed
- };
TrackerContext& m_ctx;
- CycleState m_runState = NotStarted;
public:
TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
bool isComplete() const override;
- bool isSuccessfullyCompleted() const override;
- bool isOpen() const override;
- bool hasStarted() const override {
- return m_runState != NotStarted;
- }
-
- void openChild() override;
void open();
void close() override;
void fail() override;
- void markAsNeedingAnotherRun() override;
private:
void moveToParent();