From 151dccbd3161715be284ddd68be6f20dbae29f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Sun, 29 Mar 2020 16:41:58 +0200
Subject: [PATCH] Remove catch.hpp

This was an old "include all" header, that we no longer want to be
usable, to make the include differences in new versions explicit.

We will introduce new "include all" headers later, in the form of
`catch_all.hpp`, `catch_matchers_all.hpp` and so on...
---
 examples/010-TestCase.cpp                     |  2 +-
 examples/020-TestCase-1.cpp                   |  2 +-
 examples/020-TestCase-2.cpp                   |  2 +-
 examples/030-Asn-Require-Check.cpp            |  2 +-
 examples/120-Bdd-ScenarioGivenWhenThen.cpp    |  2 +-
 src/CMakeLists.txt                            |  1 -
 src/catch2/catch.hpp                          | 56 -------------------
 .../UsageTests/ToStringVector.tests.cpp       |  2 +-
 8 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 src/catch2/catch.hpp

diff --git a/examples/010-TestCase.cpp b/examples/010-TestCase.cpp
index 9c676f82e..8eaa1c0e8 100644
--- a/examples/010-TestCase.cpp
+++ b/examples/010-TestCase.cpp
@@ -4,7 +4,7 @@
 #include <catch2/catch_default_main.hpp>
 
 // And write tests in the same file:
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 static int Factorial( int number ) {
    return number <= 1 ? number : Factorial( number - 1 ) * number;  // fail
diff --git a/examples/020-TestCase-1.cpp b/examples/020-TestCase-1.cpp
index 76e25dad9..c734d029b 100644
--- a/examples/020-TestCase-1.cpp
+++ b/examples/020-TestCase-1.cpp
@@ -6,7 +6,7 @@
 // Let Catch provide main():
 #include <catch2/catch_default_main.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 TEST_CASE( "1: All test cases reside in other .cpp files (empty)", "[multi-file:1]" ) {
 }
diff --git a/examples/020-TestCase-2.cpp b/examples/020-TestCase-2.cpp
index 43c0aee0e..3f5767b34 100644
--- a/examples/020-TestCase-2.cpp
+++ b/examples/020-TestCase-2.cpp
@@ -2,7 +2,7 @@
 
 // main() provided by Catch in file 020-TestCase-1.cpp.
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 static int Factorial( int number ) {
    return number <= 1 ? number : Factorial( number - 1 ) * number;  // fail
diff --git a/examples/030-Asn-Require-Check.cpp b/examples/030-Asn-Require-Check.cpp
index 84935bbc8..f638afae5 100644
--- a/examples/030-Asn-Require-Check.cpp
+++ b/examples/030-Asn-Require-Check.cpp
@@ -10,7 +10,7 @@
 
 // main() provided in 000-CatchMain.cpp
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 static std::string one() {
     return "1";
diff --git a/examples/120-Bdd-ScenarioGivenWhenThen.cpp b/examples/120-Bdd-ScenarioGivenWhenThen.cpp
index d1b9ce558..97336a705 100644
--- a/examples/120-Bdd-ScenarioGivenWhenThen.cpp
+++ b/examples/120-Bdd-ScenarioGivenWhenThen.cpp
@@ -2,7 +2,7 @@
 
 // main() provided in 000-CatchMain.cpp
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 SCENARIO( "vectors can be sized and resized", "[vector]" ) {
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27a6b58a4..d9205d65b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,6 @@ SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 set(INTERNAL_HEADERS
     ${SOURCES_DIR}/internal/catch_capture_matchers.h
     ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
-    ${SOURCES_DIR}/catch.hpp
     ${SOURCES_DIR}/catch_approx.h
     ${SOURCES_DIR}/catch_assertionhandler.h
     ${SOURCES_DIR}/catch_assertioninfo.h
diff --git a/src/catch2/catch.hpp b/src/catch2/catch.hpp
deleted file mode 100644
index 352eae25d..000000000
--- a/src/catch2/catch.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Created by Phil on 22/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_HPP_INCLUDED
-
-#include <catch2/catch_version_macros.hpp>
-
-#include <catch2/catch_suppress_warnings.h>
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-#include <catch2/catch_platform.h>
-
-#include <catch2/catch_user_interfaces.h>
-#include <catch2/catch_tag_alias_autoregistrar.h>
-#include <catch2/catch_test_registry.h>
-#include <catch2/catch_capture.hpp>
-#include <catch2/catch_section.h>
-#include <catch2/catch_interfaces_exception.h>
-#include <catch2/catch_approx.h>
-#include <catch2/catch_compiler_capabilities.h>
-#include <catch2/catch_string_manip.h>
-
-#include <catch2/catch_generators.hpp>
-#include <catch2/catch_generators_generic.hpp>
-#include <catch2/catch_generators_specific.hpp>
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-#include <catch2/catch_test_case_info.h>
-#include <catch2/catch_interfaces_runner.h>
-
-#ifdef __OBJC__
-#include <catch2/catch_objc.hpp>
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#include <catch2/catch_test_macros.hpp>
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#include <catch2/catch_reenable_warnings.h>
-
-#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED
diff --git a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp
index 5ce2ff75c..96c676725 100644
--- a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp
+++ b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <vector>
 #include <array>