diff options
| author | Martin Hořeňovský | 2020-06-13 19:26:17 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-07-22 21:23:12 +0200 |
| commit | b74996a29ca9c0a0d98d4866663d0c2943a60617 (patch) | |
| tree | 917e50185e0dccf2a3a27669acf28938ed68a236 | |
| parent | de53773e468d401426c8f6413a72d2279a81c09c (diff) | |
| download | catch3-b74996a29ca9c0a0d98d4866663d0c2943a60617.tar.gz | |
Devirtualize NameAndLocation query on trackers
| -rw-r--r-- | src/catch2/internal/catch_test_case_tracker.cpp | 7 | ||||
| -rw-r--r-- | src/catch2/internal/catch_test_case_tracker.hpp | 21 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/catch2/internal/catch_test_case_tracker.cpp b/src/catch2/internal/catch_test_case_tracker.cpp index 4a47a244..57399912 100644 --- a/src/catch2/internal/catch_test_case_tracker.cpp +++ b/src/catch2/internal/catch_test_case_tracker.cpp @@ -64,15 +64,12 @@ namespace TestCaseTracking { } - TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : m_nameAndLocation( nameAndLocation ), + TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ): + ITracker(nameAndLocation), m_ctx( ctx ), m_parent( parent ) {} - NameAndLocation const& TrackerBase::nameAndLocation() const { - return m_nameAndLocation; - } bool TrackerBase::isComplete() const { return m_runState == CompletedSuccessfully || m_runState == Failed; } diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp index 04a6a048..ff8095ac 100644 --- a/src/catch2/internal/catch_test_case_tracker.hpp +++ b/src/catch2/internal/catch_test_case_tracker.hpp @@ -29,15 +29,26 @@ namespace TestCaseTracking { } }; - struct ITracker; + class ITracker; using ITrackerPtr = std::shared_ptr<ITracker>; - struct ITracker { - virtual ~ITracker(); + class ITracker { + NameAndLocation m_nameAndLocation; + + public: + ITracker(NameAndLocation const& nameAndLoc) : + m_nameAndLocation(nameAndLoc) + {} + // static queries - virtual NameAndLocation const& nameAndLocation() const = 0; + NameAndLocation const& nameAndLocation() const { + return m_nameAndLocation; + } + + virtual ~ITracker(); + // dynamic queries virtual bool isComplete() const = 0; // Successfully completed or failed @@ -98,7 +109,6 @@ namespace TestCaseTracking { }; using Children = std::vector<ITrackerPtr>; - NameAndLocation m_nameAndLocation; TrackerContext& m_ctx; ITracker* m_parent; Children m_children; @@ -107,7 +117,6 @@ namespace TestCaseTracking { public: TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ); - NameAndLocation const& nameAndLocation() const override; bool isComplete() const override; bool isSuccessfullyCompleted() const override; bool isOpen() const override; |