Merge pull request #18 from Progmasoft/build/catch3-identity

Give Catch3 its own build names and headers

29 files changed, 82 insertions, 116 deletions

diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt
index 8e8102ee..23f504f3 100644
--- a/tests/ExtraTests/CMakeLists.txt
+++ b/tests/ExtraTests/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(Catch2ExtraTests LANGUAGES CXX)
+project(Catch3ExtraTests LANGUAGES CXX)
 
 message(STATUS "Extra tests included")
 
@@ -37,7 +37,7 @@ add_executable(PrefixedMacros ${TESTS_DIR}/X01-PrefixedMacros.cpp)
 target_compile_definitions(PrefixedMacros PRIVATE CATCH_CONFIG_PREFIX_ALL CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
 # We want to verify that the main library can also be built with prefixed
 # macros, regression test for #3087.
-target_link_libraries(PrefixedMacros Catch2_buildall_interface)
+target_link_libraries(PrefixedMacros Catch3_buildall_interface)
 
 add_test(NAME CATCH_CONFIG_PREFIX_ALL COMMAND PrefixedMacros --no-history --success)
 set_tests_properties(CATCH_CONFIG_PREFIX_ALL
@@ -53,7 +53,7 @@ add_executable(DisabledMacros ${TESTS_DIR}/X02-DisabledMacros.cpp)
 target_compile_definitions(DisabledMacros PRIVATE CATCH_CONFIG_DISABLE)
 # Macro configuration does not touch the compiled parts, so we can link
 # it against the main library
-target_link_libraries(DisabledMacros Catch2WithMain)
+target_link_libraries(DisabledMacros Catch3WithMain)
 
 add_test(NAME CATCH_CONFIG_DISABLE-1 COMMAND DisabledMacros --no-history --success)
 set_tests_properties(CATCH_CONFIG_DISABLE-1
@@ -79,7 +79,7 @@ else()
 endif()
 foreach(target DisabledExceptions-DefaultHandler DisabledExceptions-CustomHandler)
   target_compile_options(${target} PUBLIC ${CATCH_NO_EXCEPTIONS_OPTIONS})
-  target_link_libraries(${target} Catch2_buildall_interface)
+  target_link_libraries(${target} Catch3_buildall_interface)
 endforeach()
 target_compile_definitions(DisabledExceptions-CustomHandler PUBLIC CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
 
@@ -94,7 +94,7 @@ set_tests_properties(CATCH_CONFIG_DISABLE_EXCEPTIONS-1
 # Bazel passes its wishes in the environment: a JUnit file, a filter, a
 # shard, a seed.
 add_executable(BazelReporterNoCatchConfig ${TESTS_DIR}/X30-BazelReporter.cpp)
-target_link_libraries(BazelReporterNoCatchConfig Catch2WithMain)
+target_link_libraries(BazelReporterNoCatchConfig Catch3WithMain)
 add_test(NAME NO_CATCH_CONFIG_BAZEL_REPORTER-1
   COMMAND
   Python3::Interpreter "${CATCH_DIR}/tests/TestScripts/testBazelReporter.py" $<TARGET_FILE:BazelReporterNoCatchConfig> "${CMAKE_CURRENT_BINARY_DIR}"
@@ -151,7 +151,7 @@ set_tests_properties(CATCH_CONFIG_DISABLE_EXCEPTIONS-4
 )
 
 add_executable(DeferredStaticChecks ${TESTS_DIR}/X05-DeferredStaticChecks.cpp)
-target_link_libraries(DeferredStaticChecks PRIVATE Catch2WithMain)
+target_link_libraries(DeferredStaticChecks PRIVATE Catch3WithMain)
 target_compile_definitions(DeferredStaticChecks PRIVATE "CATCH_CONFIG_RUNTIME_STATIC_REQUIRE")
 
 add_test(NAME DeferredStaticChecks COMMAND DeferredStaticChecks --no-history --retries=off)
@@ -161,7 +161,7 @@ set_tests_properties(DeferredStaticChecks
 )
 
 add_executable(MixingClearedAndUnclearedMessages ${TESTS_DIR}/X06-MixingClearedAndUnclearedMessages.cpp)
-target_link_libraries(MixingClearedAndUnclearedMessages PRIVATE Catch2WithMain)
+target_link_libraries(MixingClearedAndUnclearedMessages PRIVATE Catch3WithMain)
 
 add_test(NAME MixingClearedAndUnclearedMessages
   COMMAND
@@ -175,7 +175,7 @@ set_tests_properties(MixingClearedAndUnclearedMessages
 
 add_executable(FallbackStringifier ${TESTS_DIR}/X10-FallbackStringifier.cpp)
 target_compile_definitions(FallbackStringifier PRIVATE CATCH_CONFIG_FALLBACK_STRINGIFIER=fallbackStringifier)
-target_link_libraries(FallbackStringifier Catch2WithMain)
+target_link_libraries(FallbackStringifier Catch3WithMain)
 
 add_test(NAME FallbackStringifier COMMAND FallbackStringifier --no-history --success)
 set_tests_properties(FallbackStringifier
@@ -185,7 +185,7 @@ set_tests_properties(FallbackStringifier
 
 add_executable(DisableStringification ${TESTS_DIR}/X11-DisableStringification.cpp)
 target_compile_definitions(DisableStringification PRIVATE CATCH_CONFIG_DISABLE_STRINGIFICATION)
-target_link_libraries(DisableStringification Catch2WithMain)
+target_link_libraries(DisableStringification Catch3WithMain)
 add_test(NAME CATCH_CONFIG_DISABLE_STRINGIFICATION COMMAND DisableStringification --no-history --success)
 set_tests_properties(CATCH_CONFIG_DISABLE_STRINGIFICATION
   PROPERTIES
@@ -197,13 +197,13 @@ set_tests_properties(CATCH_CONFIG_DISABLE_STRINGIFICATION
 if(MSVC)
   # This test fails if it does not compile and succeeds otherwise
   add_executable(WindowsHeader ${TESTS_DIR}/X90-WindowsHeaderInclusion.cpp)
-  target_link_libraries(WindowsHeader Catch2WithMain)
+  target_link_libraries(WindowsHeader Catch3WithMain)
   add_test(NAME WindowsHeader COMMAND WindowsHeader --no-history)
   list(APPEND CATCH_TEST_TARGETS ${EXTRA_TEST_BINARIES} WindowsHeader)
 endif()
 
 add_executable(PartialTestCaseEvents ${TESTS_DIR}/X21-PartialTestCaseEvents.cpp)
-target_link_libraries(PartialTestCaseEvents PRIVATE Catch2WithMain)
+target_link_libraries(PartialTestCaseEvents PRIVATE Catch3WithMain)
 add_test(
   NAME PartialTestCaseEvents
   COMMAND Python3::Interpreter ${CATCH_DIR}/tests/TestScripts/testPartialTestCaseEvent.py $<TARGET_FILE:PartialTestCaseEvents>
@@ -214,7 +214,7 @@ set_tests_properties(PartialTestCaseEvents
 )
 
 add_executable(CapturedStdoutInTestCaseEvents ${TESTS_DIR}/X27-CapturedStdoutInTestCaseEvents.cpp)
-target_link_libraries(CapturedStdoutInTestCaseEvents PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(CapturedStdoutInTestCaseEvents PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME Listeners::CapturedStdOutInEvents
   COMMAND CapturedStdoutInTestCaseEvents --no-history
@@ -225,7 +225,7 @@ set_tests_properties(Listeners::CapturedStdOutInEvents
 )
 
 add_executable(ListenerStdoutCaptureInMultireporter ${TESTS_DIR}/X24-ListenerStdoutCaptureInMultireporter.cpp)
-target_link_libraries(ListenerStdoutCaptureInMultireporter PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(ListenerStdoutCaptureInMultireporter PRIVATE Catch3::Catch3WithMain)
 
 # The runner keeps what a passing test prints, whatever a listener prefers;
 # what the listener prints outside a test reaches the output.
@@ -240,7 +240,7 @@ set_tests_properties(Listeners::NoncapturingListenerDoesntCauseStdoutPassThrough
 )
 
 add_executable(ListenerCanAskForCapturedStdout ${TESTS_DIR}/X25-ListenerCanAskForCapturedStdout.cpp)
-target_link_libraries(ListenerCanAskForCapturedStdout PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(ListenerCanAskForCapturedStdout PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME Listeners::CapturingListenerCausesStdoutCapture
   COMMAND ListenerCanAskForCapturedStdout --no-history
@@ -252,7 +252,7 @@ set_tests_properties(Listeners::CapturingListenerCausesStdoutCapture
 )
 
 add_executable(ListenersGetEventsBeforeReporters ${TESTS_DIR}/X28-ListenersGetEventsBeforeReporters.cpp)
-target_link_libraries(ListenersGetEventsBeforeReporters PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(ListenersGetEventsBeforeReporters PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME ListenersGetRunEvents
   COMMAND ListenersGetEventsBeforeReporters --no-history
@@ -264,7 +264,7 @@ set_tests_properties(ListenersGetRunEvents
 )
 
 add_executable(DuplicatedTestCases-SameNameAndTags ${TESTS_DIR}/X31-DuplicatedTestCases.cpp)
-target_link_libraries(DuplicatedTestCases-SameNameAndTags PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(DuplicatedTestCases-SameNameAndTags PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME DuplicatedTestCases::SameNameAndTags
   COMMAND $<TARGET_FILE:DuplicatedTestCases-SameNameAndTags> --no-history
@@ -275,7 +275,7 @@ set_tests_properties(DuplicatedTestCases::SameNameAndTags
 )
 
 add_executable(DuplicatedTestCases-SameNameDifferentTags ${TESTS_DIR}/X32-DuplicatedTestCasesDifferentTags.cpp)
-target_link_libraries(DuplicatedTestCases-SameNameDifferentTags PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(DuplicatedTestCases-SameNameDifferentTags PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME DuplicatedTestCases::SameNameDifferentTags
   COMMAND $<TARGET_FILE:DuplicatedTestCases-SameNameDifferentTags> --no-history
@@ -286,7 +286,7 @@ set_tests_properties(DuplicatedTestCases::SameNameDifferentTags
 )
 
 add_executable(DuplicatedTestCases-DuplicatedTestCaseMethods ${TESTS_DIR}/X33-DuplicatedTestCaseMethods.cpp)
-target_link_libraries(DuplicatedTestCases-DuplicatedTestCaseMethods PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(DuplicatedTestCases-DuplicatedTestCaseMethods PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME DuplicatedTestCases::DuplicatedTestCaseMethods
   COMMAND $<TARGET_FILE:DuplicatedTestCases-DuplicatedTestCaseMethods> --no-history
@@ -297,7 +297,7 @@ set_tests_properties(DuplicatedTestCases::DuplicatedTestCaseMethods
 )
 
 add_executable(DuplicatedTestCases-DifferentFixtures ${TESTS_DIR}/X34-DuplicatedTestCaseMethodsDifferentFixtures.cpp)
-target_link_libraries(DuplicatedTestCases-DifferentFixtures PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(DuplicatedTestCases-DifferentFixtures PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME DuplicatedTestCases::DuplicatedTestCaseMethodsDifferentFixtures
   COMMAND $<TARGET_FILE:DuplicatedTestCases-DifferentFixtures> --no-history
@@ -308,7 +308,7 @@ set_tests_properties(DuplicatedTestCases::DuplicatedTestCaseMethodsDifferentFixt
 )
 
 add_executable(ReportingCrashWithJunitReporter ${TESTS_DIR}/X36-ReportingCrashWithJunitReporter.cpp)
-target_link_libraries(ReportingCrashWithJunitReporter PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(ReportingCrashWithJunitReporter PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME Runner::CrashIsReported
   COMMAND $<TARGET_FILE:ReportingCrashWithJunitReporter> --no-history --retries=off
@@ -321,7 +321,7 @@ set_tests_properties(Runner::CrashIsReported
 
 
 add_executable(ReportingInvalidTestCaseTags ${TESTS_DIR}/X37-ReportingInvalidTestCaseTags.cpp)
-target_link_libraries(ReportingInvalidTestCaseTags PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(ReportingInvalidTestCaseTags PRIVATE Catch3::Catch3WithMain)
 add_test(
   NAME Validation::TestCaseTags
   COMMAND $<TARGET_FILE:ReportingInvalidTestCaseTags> --no-history
@@ -342,7 +342,7 @@ set_tests_properties(Validation::TestCaseTags
 
 
 add_executable(QuickExitInTest ${TESTS_DIR}/X40-QuickExit.cpp)
-target_link_libraries(QuickExitInTest PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(QuickExitInTest PRIVATE Catch3::Catch3WithMain)
 # A test that ends its process early cannot pass: the exit of its worker is
 # reported as a crash of the test.
 add_test(
@@ -371,23 +371,15 @@ add_executable(AssertionStartingEventGoesBeforeAssertionIsEvaluated
   X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
 )
 target_link_libraries(AssertionStartingEventGoesBeforeAssertionIsEvaluated
-  PRIVATE Catch2::Catch2WithMain
+  PRIVATE Catch3::Catch3WithMain
 )
 add_test(
   NAME ReporterEvents::AssertionStartingHappensBeforeAssertionIsEvaluated
   COMMAND $<TARGET_FILE:AssertionStartingEventGoesBeforeAssertionIsEvaluated> --no-history
 )
 
-#add_executable(DebugBreakMacros ${TESTS_DIR}/X12-CustomDebugBreakMacro.cpp)
-#target_link_libraries(DebugBreakMacros Catch2)
-#add_test(NAME DebugBreakMacros COMMAND DebugBreakMacros --break)
-#set_tests_properties(DebugBreakMacros
-#  PROPERTIES
-#    PASS_REGULAR_EXPRESSION "Pretty please, break into debugger"
-#)
-
 add_executable(NoTests ${TESTS_DIR}/X92-NoTests.cpp)
-target_link_libraries(NoTests PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(NoTests PRIVATE Catch3::Catch3WithMain)
 
 add_test(
   NAME TestSpecs::EmptySpecWithNoTestsFails
@@ -404,7 +396,7 @@ add_test(
 )
 
 add_executable(AllSkipped ${TESTS_DIR}/X93-AllSkipped.cpp)
-target_link_libraries(AllSkipped PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(AllSkipped PRIVATE Catch3::Catch3WithMain)
 
 add_test(
   NAME TestSpecs::SkippingAllTestsFails
@@ -416,7 +408,7 @@ set_tests_properties(TestSpecs::SkippingAllTestsFails
 )
 
 add_executable(FastCompileMacros ${TESTS_DIR}/X07-FastCompileMacros.cpp)
-target_link_libraries(FastCompileMacros PRIVATE Catch2_buildall_interface)
+target_link_libraries(FastCompileMacros PRIVATE Catch3_buildall_interface)
 target_compile_definitions(FastCompileMacros PRIVATE CATCH_CONFIG_FAST_COMPILE)
 
 add_test(
@@ -449,7 +441,7 @@ set_tests_properties(AmalgamatedFileTest
 add_executable(ThreadSafetyTests
   ${TESTS_DIR}/X94-ThreadSafetyTests.cpp
 )
-target_link_libraries(ThreadSafetyTests Catch2_buildall_interface)
+target_link_libraries(ThreadSafetyTests Catch3_buildall_interface)
 target_compile_definitions(ThreadSafetyTests PUBLIC CATCH_CONFIG_THREAD_SAFE_ASSERTIONS)
 
 add_test(NAME ThreadSafetyTests::ScopedMessagesAndAssertions
@@ -470,7 +462,7 @@ set_tests_properties(ThreadSafetyTests::UnscopedMessagesAndAssertions
 )
 
 add_executable(InfiniteGenerators ${TESTS_DIR}/X95-InfiniteGenerators.cpp)
-target_link_libraries(InfiniteGenerators PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(InfiniteGenerators PRIVATE Catch3::Catch3WithMain)
 
 add_test(
   NAME Warnings::InfiniteGenerators::NoFilterWarns
diff --git a/tests/ExtraTests/X01-PrefixedMacros.cpp b/tests/ExtraTests/X01-PrefixedMacros.cpp
index d2d05528..bb38e320 100644
--- a/tests/ExtraTests/X01-PrefixedMacros.cpp
+++ b/tests/ExtraTests/X01-PrefixedMacros.cpp
@@ -14,9 +14,9 @@
  */
 
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_predicate.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/Predicate.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 
 #include <type_traits>
 #include <stdexcept>
diff --git a/tests/ExtraTests/X02-DisabledMacros.cpp b/tests/ExtraTests/X02-DisabledMacros.cpp
index 3449ab73..ccdb193b 100644
--- a/tests/ExtraTests/X02-DisabledMacros.cpp
+++ b/tests/ExtraTests/X02-DisabledMacros.cpp
@@ -11,10 +11,10 @@
  * and expressions in assertion macros are not run.
  */
 
-#include <catch2/benchmark/catch_benchmark.hpp>
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include <catch2/matchers/catch_matchers_predicate.hpp>
+#include <Progmasoft/Catch3/Benchmark/Benchmark.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/Matchers.hpp>
+#include <Progmasoft/Catch3/Matchers/Predicate.hpp>
 
 #include <iostream>
 
diff --git a/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
index 5b6d4b12..d72996ff 100644
--- a/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
+++ b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
@@ -6,10 +6,10 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/benchmark/catch_benchmark.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include <catch2/matchers/catch_matchers_predicate.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Benchmark/Benchmark.hpp>
+#include <Progmasoft/Catch3/Matchers/Matchers.hpp>
+#include <Progmasoft/Catch3/Matchers/Predicate.hpp>
 
 TEST_CASE("Tests that run") {
     // All of these should be run and be reported
diff --git a/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp b/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
index e1f1e703..02dbaf0d 100644
--- a/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
+++ b/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
@@ -6,7 +6,7 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 #include <iostream>
 
diff --git a/tests/ExtraTests/X05-DeferredStaticChecks.cpp b/tests/ExtraTests/X05-DeferredStaticChecks.cpp
index 79ff35cc..5d26289f 100644
--- a/tests/ExtraTests/X05-DeferredStaticChecks.cpp
+++ b/tests/ExtraTests/X05-DeferredStaticChecks.cpp
@@ -11,8 +11,8 @@
  * does not abort the test case.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_templated.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/Templated.hpp>
 
 #if defined( CATCH_INTERNAL_CONSTEXPR_MATCHERS_ENABLED )
 
diff --git a/tests/ExtraTests/X06-MixingClearedAndUnclearedMessages.cpp b/tests/ExtraTests/X06-MixingClearedAndUnclearedMessages.cpp
index 2c52ba1b..78bff33d 100644
--- a/tests/ExtraTests/X06-MixingClearedAndUnclearedMessages.cpp
+++ b/tests/ExtraTests/X06-MixingClearedAndUnclearedMessages.cpp
@@ -15,7 +15,7 @@
  * listener, which disables the assertion fast path.
  */
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 TEST_CASE(
     "Delayed unscoped message clearing does not catch newly inserted messages",
diff --git a/tests/ExtraTests/X07-FastCompileMacros.cpp b/tests/ExtraTests/X07-FastCompileMacros.cpp
index 66d11664..09f8d2c7 100644
--- a/tests/ExtraTests/X07-FastCompileMacros.cpp
+++ b/tests/ExtraTests/X07-FastCompileMacros.cpp
@@ -14,7 +14,7 @@
  * supposed to.
  */
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 #include <stdexcept>
 
diff --git a/tests/ExtraTests/X10-FallbackStringifier.cpp b/tests/ExtraTests/X10-FallbackStringifier.cpp
index 8525a813..add65393 100644
--- a/tests/ExtraTests/X10-FallbackStringifier.cpp
+++ b/tests/ExtraTests/X10-FallbackStringifier.cpp
@@ -22,7 +22,7 @@ std::string fallbackStringifier(T const&) {
     return "{ !!! }";
 }
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 struct foo {
     explicit operator bool() const {
diff --git a/tests/ExtraTests/X11-DisableStringification.cpp b/tests/ExtraTests/X11-DisableStringification.cpp
index f8996277..3ead9a87 100644
--- a/tests/ExtraTests/X11-DisableStringification.cpp
+++ b/tests/ExtraTests/X11-DisableStringification.cpp
@@ -14,7 +14,7 @@
  */
 
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 namespace {
     struct Hidden {};
diff --git a/tests/ExtraTests/X12-CustomDebugBreakMacro.cpp b/tests/ExtraTests/X12-CustomDebugBreakMacro.cpp
deleted file mode 100644
index e6d3e38b..00000000
--- a/tests/ExtraTests/X12-CustomDebugBreakMacro.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-/**\file
- * Test that user-defined `CATCH_BREAK_INTO_DEBUGGER` is respected and used.
- */
-
-#include <iostream>
-
-void custom_debug_break() {
-    std::cerr << "Pretty please, break into debugger\n";
-}
-
-#define CATCH_BREAK_INTO_DEBUGGER() custom_debug_break()
-
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
-
-TEST_CASE("Failing test that breaks into debugger", "[macros]") {
-    REQUIRE(1 == 2);
-}
diff --git a/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp b/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
index 6f44bf69..0ab44f37 100644
--- a/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
+++ b/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
@@ -13,10 +13,10 @@
  * value when they are evaluated.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
-#include <catch2/matchers/catch_matchers_predicate.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
+#include <Progmasoft/Catch3/Matchers/Predicate.hpp>
 
 namespace {
 
diff --git a/tests/ExtraTests/X21-PartialTestCaseEvents.cpp b/tests/ExtraTests/X21-PartialTestCaseEvents.cpp
index 99002822..d98d07b3 100644
--- a/tests/ExtraTests/X21-PartialTestCaseEvents.cpp
+++ b/tests/ExtraTests/X21-PartialTestCaseEvents.cpp
@@ -16,11 +16,11 @@
  * events are properly nested.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_test_case_info.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
-#include <catch2/generators/catch_generators.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/TestCaseInfo.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
+#include <Progmasoft/Catch3/Generators/Generators.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/tests/ExtraTests/X24-ListenerStdoutCaptureInMultireporter.cpp b/tests/ExtraTests/X24-ListenerStdoutCaptureInMultireporter.cpp
index ffb706e9..dbbc8598 100644
--- a/tests/ExtraTests/X24-ListenerStdoutCaptureInMultireporter.cpp
+++ b/tests/ExtraTests/X24-ListenerStdoutCaptureInMultireporter.cpp
@@ -16,9 +16,9 @@
  * whether the stdout should be passed-through or not.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
 
 #include <iostream>
 
diff --git a/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp b/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp
index de75ef4e..67c7d0b1 100644
--- a/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp
+++ b/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp
@@ -16,9 +16,9 @@
  * it.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
 
 #include <iostream>
 
diff --git a/tests/ExtraTests/X27-CapturedStdoutInTestCaseEvents.cpp b/tests/ExtraTests/X27-CapturedStdoutInTestCaseEvents.cpp
index 20b39d78..f5072f7e 100644
--- a/tests/ExtraTests/X27-CapturedStdoutInTestCaseEvents.cpp
+++ b/tests/ExtraTests/X27-CapturedStdoutInTestCaseEvents.cpp
@@ -18,11 +18,11 @@
  */
 
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/generators/catch_generators_range.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Generators/Generators.hpp>
+#include <Progmasoft/Catch3/Generators/Range.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/tests/ExtraTests/X28-ListenersGetEventsBeforeReporters.cpp b/tests/ExtraTests/X28-ListenersGetEventsBeforeReporters.cpp
index 088e7072..4d4c7dac 100644
--- a/tests/ExtraTests/X28-ListenersGetEventsBeforeReporters.cpp
+++ b/tests/ExtraTests/X28-ListenersGetEventsBeforeReporters.cpp
@@ -16,9 +16,9 @@
  * the same, and thus if few work, all work.
  */
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Reporters/EventListener.hpp>
+#include <Progmasoft/Catch3/Reporters/Registrars.hpp>
 
 #include <iostream>
 
diff --git a/tests/ExtraTests/X30-BazelReporter.cpp b/tests/ExtraTests/X30-BazelReporter.cpp
index 2a259416..b194bb41 100644
--- a/tests/ExtraTests/X30-BazelReporter.cpp
+++ b/tests/ExtraTests/X30-BazelReporter.cpp
@@ -11,7 +11,7 @@
  * of dummy test cases.
  */
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 TEST_CASE( "Passing test case" ) { REQUIRE( 1 == 1 ); }
 TEST_CASE( "Failing test case" ) { REQUIRE( 2 == 1 ); }
diff --git a/tests/ExtraTests/X31-DuplicatedTestCases.cpp b/tests/ExtraTests/X31-Duplicated