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

Give Catch3 its own build names and headers

10 files changed, 21 insertions, 22 deletions

diff --git a/tests/Progmasoft/BUILD.bazel b/tests/Progmasoft/BUILD.bazel
index b5fb21d8..bc3eda98 100644
--- a/tests/Progmasoft/BUILD.bazel
+++ b/tests/Progmasoft/BUILD.bazel
@@ -30,9 +30,8 @@ cc_test(
     data = [":runner_fixture"],
     env = {"CATCH3_RUNNER_FIXTURE": "$(rootpath :runner_fixture)"},
     deps = [
-        "//:catch2",
-        "//:catch2_main",
-        "//src/Progmasoft:catch3",
+        "//:catch3",
+        "//:catch3_main",
     ],
 )
 
@@ -45,7 +44,7 @@ cc_binary(
         "//conditions:default": ["-std=c++20"],
     }),
     deps = [
-        "//:catch2",
-        "//:catch2_main",
+        "//:catch3",
+        "//:catch3_main",
     ],
 )
diff --git a/tests/Progmasoft/Results.tests.cpp b/tests/Progmasoft/Results.tests.cpp
index 1216fdd2..fc37caff 100644
--- a/tests/Progmasoft/Results.tests.cpp
+++ b/tests/Progmasoft/Results.tests.cpp
@@ -3,7 +3,7 @@
 #include <Progmasoft/Catch3/Results.hpp>
 #include <Progmasoft/Catch3/XmlWriter.hpp>
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 #include <sstream>
 #include <string>
diff --git a/tests/Progmasoft/Runner.tests.cpp b/tests/Progmasoft/Runner.tests.cpp
index d458de10..ff0cfb1a 100644
--- a/tests/Progmasoft/Runner.tests.cpp
+++ b/tests/Progmasoft/Runner.tests.cpp
@@ -9,8 +9,8 @@
 #include <Progmasoft/Runner/Json.hpp>
 #include <Progmasoft/Runner/Process.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 
 #include <chrono>
 #include <cstdlib>
diff --git a/tests/Progmasoft/RunnerAnalysis.tests.cpp b/tests/Progmasoft/RunnerAnalysis.tests.cpp
index 453fa671..799358d8 100644
--- a/tests/Progmasoft/RunnerAnalysis.tests.cpp
+++ b/tests/Progmasoft/RunnerAnalysis.tests.cpp
@@ -9,9 +9,9 @@
 #include <Progmasoft/Runner/Files.hpp>
 #include <Progmasoft/Runner/History.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
-#include <catch2/matchers/catch_matchers_vector.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
+#include <Progmasoft/Catch3/Matchers/Vector.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/tests/Progmasoft/RunnerFixture.cpp b/tests/Progmasoft/RunnerFixture.cpp
index fe9fb150..1c2e865b 100644
--- a/tests/Progmasoft/RunnerFixture.cpp
+++ b/tests/Progmasoft/RunnerFixture.cpp
@@ -5,7 +5,7 @@
 // tests start it and check what the runner made of each misbehaviour.
 
 #include <Progmasoft/Catch3/Runner.hpp>
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 #include <chrono>
 #include <cstdlib>
 #include <filesystem>
diff --git a/tests/Progmasoft/RunnerFixtureClient.hpp b/tests/Progmasoft/RunnerFixtureClient.hpp
index 1352e1eb..3085176d 100644
--- a/tests/Progmasoft/RunnerFixtureClient.hpp
+++ b/tests/Progmasoft/RunnerFixtureClient.hpp
@@ -8,7 +8,7 @@
 #include <Progmasoft/Runner/Files.hpp>
 #include <Progmasoft/Runner/Json.hpp>
 #include <Progmasoft/Runner/Process.hpp>
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 #include <chrono>
 #include <cstdint>
 #include <filesystem>
diff --git a/tests/Progmasoft/RunnerOptions.tests.cpp b/tests/Progmasoft/RunnerOptions.tests.cpp
index 2ad8c0b7..1650d061 100644
--- a/tests/Progmasoft/RunnerOptions.tests.cpp
+++ b/tests/Progmasoft/RunnerOptions.tests.cpp
@@ -7,9 +7,9 @@
 #include <Progmasoft/Runner/Files.hpp>
 #include <Progmasoft/Runner/Options.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Generators/Generators.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 
 #include <chrono>
 #include <filesystem>
diff --git a/tests/Progmasoft/RunnerOutput.tests.cpp b/tests/Progmasoft/RunnerOutput.tests.cpp
index 572adf78..351527a5 100644
--- a/tests/Progmasoft/RunnerOutput.tests.cpp
+++ b/tests/Progmasoft/RunnerOutput.tests.cpp
@@ -7,8 +7,8 @@
 #include <Progmasoft/Catch3/Version.hpp>
 #include <Progmasoft/Runner/Files.hpp>
 #include <Progmasoft/Runner/Json.hpp>
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 #include <filesystem>
 #include <fstream>
 #include <string>
diff --git a/tests/Progmasoft/RunnerPlanner.tests.cpp b/tests/Progmasoft/RunnerPlanner.tests.cpp
index 4c930632..4cf9af8c 100644
--- a/tests/Progmasoft/RunnerPlanner.tests.cpp
+++ b/tests/Progmasoft/RunnerPlanner.tests.cpp
@@ -11,8 +11,8 @@
 #include <Progmasoft/Runner/History.hpp>
 #include <Progmasoft/Runner/Planner.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 
 #include <algorithm>
 #include <chrono>
diff --git a/tests/Progmasoft/RunnerUnits.tests.cpp b/tests/Progmasoft/RunnerUnits.tests.cpp
index 29e832a5..3f23382e 100644
--- a/tests/Progmasoft/RunnerUnits.tests.cpp
+++ b/tests/Progmasoft/RunnerUnits.tests.cpp
@@ -12,8 +12,8 @@
 
 #include <Progmasoft/Catch3.hpp>
 
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
+#include <Progmasoft/Catch3/Matchers/String.hpp>
 
 #include <chrono>
 #include <filesystem>