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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-05-13 09:14:26 +0200
committerMartin Hořeňovský2021-05-13 09:14:26 +0200
commit28f6698ec80c03b7351e8f546734726acb56c104 (patch)
treed65ee66ed66fa7f7cb583d09e151ac9c113799c3 /src/catch2/internal
parentb36f8daaada443fc208d6ceb1c9bf071af86ed94 (diff)
downloadcatch3-28f6698ec80c03b7351e8f546734726acb56c104.tar.gz
Remove unneeded interface IRunner
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_context.cpp7
-rw-r--r--src/catch2/internal/catch_context.hpp3
-rw-r--r--src/catch2/internal/catch_run_context.cpp1
-rw-r--r--src/catch2/internal/catch_run_context.hpp5
4 files changed, 2 insertions, 14 deletions
diff --git a/src/catch2/internal/catch_context.cpp b/src/catch2/internal/catch_context.cpp
index 86c56a6f..790a1b23 100644
--- a/src/catch2/internal/catch_context.cpp
+++ b/src/catch2/internal/catch_context.cpp
@@ -17,9 +17,6 @@ namespace Catch {
IResultCapture* getResultCapture() override {
return m_resultCapture;
}
- IRunner* getRunner() override {
- return m_runner;
- }
IConfig const* getConfig() const override {
return m_config;
@@ -31,9 +28,6 @@ namespace Catch {
void setResultCapture( IResultCapture* resultCapture ) override {
m_resultCapture = resultCapture;
}
- void setRunner( IRunner* runner ) override {
- m_runner = runner;
- }
void setConfig( IConfig const* config ) override {
m_config = config;
}
@@ -42,7 +36,6 @@ namespace Catch {
private:
IConfig const* m_config = nullptr;
- IRunner* m_runner = nullptr;
IResultCapture* m_resultCapture = nullptr;
};
diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp
index ca697431..d3552448 100644
--- a/src/catch2/internal/catch_context.hpp
+++ b/src/catch2/internal/catch_context.hpp
@@ -11,7 +11,6 @@
namespace Catch {
struct IResultCapture;
- struct IRunner;
struct IConfig;
struct IContext
@@ -19,7 +18,6 @@ namespace Catch {
virtual ~IContext(); // = default
virtual IResultCapture* getResultCapture() = 0;
- virtual IRunner* getRunner() = 0;
virtual IConfig const* getConfig() const = 0;
};
@@ -27,7 +25,6 @@ namespace Catch {
{
virtual ~IMutableContext(); // = default
virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
- virtual void setRunner( IRunner* runner ) = 0;
virtual void setConfig( IConfig const* config ) = 0;
private:
diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index d3c22303..127fc538 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -167,7 +167,6 @@ namespace Catch {
m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
{
- m_context.setRunner(this);
m_context.setResultCapture(this);
m_reporter->testRunStarting(m_runInfo);
}
diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp
index d4f913da..8819aa17 100644
--- a/src/catch2/internal/catch_run_context.hpp
+++ b/src/catch2/internal/catch_run_context.hpp
@@ -8,7 +8,6 @@
#ifndef CATCH_RUN_CONTEXT_HPP_INCLUDED
#define CATCH_RUN_CONTEXT_HPP_INCLUDED
-#include <catch2/interfaces/catch_interfaces_runner.hpp>
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <catch2/internal/catch_test_registry.hpp>
#include <catch2/internal/catch_fatal_condition_handler.hpp>
@@ -30,7 +29,7 @@ namespace Catch {
///////////////////////////////////////////////////////////////////////////
- class RunContext : public IResultCapture, public IRunner {
+ class RunContext : public IResultCapture {
public:
RunContext( RunContext const& ) = delete;
@@ -102,7 +101,7 @@ namespace Catch {
public:
// !TBD We need to do this another way!
- bool aborting() const override;
+ bool aborting() const;
private: