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

summaryrefslogtreecommitdiffhomepage
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
parentb36f8daaada443fc208d6ceb1c9bf071af86ed94 (diff)
downloadcatch3-28f6698ec80c03b7351e8f546734726acb56c104.tar.gz
Remove unneeded interface IRunner
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/catch2/interfaces/catch_interfaces_all.hpp1
-rw-r--r--src/catch2/interfaces/catch_interfaces_combined_tu.cpp11
-rw-r--r--src/catch2/interfaces/catch_interfaces_runner.hpp19
-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
8 files changed, 2 insertions, 46 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3dd11578..270f3fdd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,7 +80,6 @@ set(INTERNAL_HEADERS
${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.hpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_runner.hpp
${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
${SOURCES_DIR}/internal/catch_lazy_expr.hpp
diff --git a/src/catch2/interfaces/catch_interfaces_all.hpp b/src/catch2/interfaces/catch_interfaces_all.hpp
index 6dc4ebf1..2960bf67 100644
--- a/src/catch2/interfaces/catch_interfaces_all.hpp
+++ b/src/catch2/interfaces/catch_interfaces_all.hpp
@@ -31,7 +31,6 @@
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
#include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
-#include <catch2/interfaces/catch_interfaces_runner.hpp>
#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
#include <catch2/interfaces/catch_interfaces_testcase.hpp>
diff --git a/src/catch2/interfaces/catch_interfaces_combined_tu.cpp b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp
index 46d7c38c..7acf0a12 100644
--- a/src/catch2/interfaces/catch_interfaces_combined_tu.cpp
+++ b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp
@@ -63,17 +63,6 @@ namespace Catch {
}
-//////////////////////////////////////////////////
-// vvv formerly catch_interfaces_runner.cpp vvv //
-//////////////////////////////////////////////////
-
-#include <catch2/interfaces/catch_interfaces_runner.hpp>
-
-namespace Catch {
- IRunner::~IRunner() = default;
-}
-
-
////////////////////////////////////////////////////
// vvv formerly catch_interfaces_testcase.cpp vvv //
////////////////////////////////////////////////////
diff --git a/src/catch2/interfaces/catch_interfaces_runner.hpp b/src/catch2/interfaces/catch_interfaces_runner.hpp
deleted file mode 100644
index 9072d721..00000000
--- a/src/catch2/interfaces/catch_interfaces_runner.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_INTERFACES_RUNNER_HPP_INCLUDED
-#define CATCH_INTERFACES_RUNNER_HPP_INCLUDED
-
-namespace Catch {
-
- struct IRunner {
- virtual ~IRunner();
- virtual bool aborting() const = 0;
- };
-}
-
-#endif // CATCH_INTERFACES_RUNNER_HPP_INCLUDED
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: