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

Give Catch3 its own build names and headers

6 files changed, 34 insertions, 34 deletions

diff --git a/tests/TestScripts/ConfigureTestsCommon.py b/tests/TestScripts/ConfigureTestsCommon.py
index 0af4c1f6..cd8a2471 100644
--- a/tests/TestScripts/ConfigureTestsCommon.py
+++ b/tests/TestScripts/ConfigureTestsCommon.py
@@ -17,7 +17,7 @@ def configure_and_build(source_path: str, project_path: str, options: List[Tuple
                           '-B{}'.format(project_path),
                           '-S{}'.format(source_path),
                           '-DCMAKE_BUILD_TYPE=Debug',
-                          '-DCATCH_DEVELOPMENT_BUILD=ON']
+                          '-DCATCH3_DEVELOPMENT_BUILD=ON']
     toolchain_file = os.environ.get('CMAKE_TOOLCHAIN_FILE')
     if toolchain_file:
         # CMake only reads this environment variable itself since 3.21.
diff --git a/tests/TestScripts/DiscoverTests/CMakeLists.txt b/tests/TestScripts/DiscoverTests/CMakeLists.txt
index 8ae0decb..e4058297 100644
--- a/tests/TestScripts/DiscoverTests/CMakeLists.txt
+++ b/tests/TestScripts/DiscoverTests/CMakeLists.txt
@@ -3,17 +3,17 @@ project(discover-tests-test LANGUAGES CXX)
 
 add_executable(tests register-tests.cpp)
 add_subdirectory(${CATCH2_PATH} catch2-build)
-target_link_libraries(tests PRIVATE Catch2::Catch2WithMain)
+target_link_libraries(tests PRIVATE Catch3::Catch3WithMain)
 
 enable_testing()
-include(Catch)
+include(Catch3)
 set(extra_args)
 if(CMAKE_VERSION GREATER_EQUAL 3.27)
   list(APPEND extra_args
     DL_PATHS "${CMAKE_CURRENT_LIST_DIR};${CMAKE_CURRENT_LIST_DIR}/.."
   )
 endif()
-catch_discover_tests(
+catch3_discover_tests(
   tests
   TEST_PREFIX " prefix "
   TEST_SUFFIX " suffix "
diff --git a/tests/TestScripts/DiscoverTests/TestDecomposeJsonArray.cmake b/tests/TestScripts/DiscoverTests/TestDecomposeJsonArray.cmake
index c64b4f52..693979ad 100644
--- a/tests/TestScripts/DiscoverTests/TestDecomposeJsonArray.cmake
+++ b/tests/TestScripts/DiscoverTests/TestDecomposeJsonArray.cmake
@@ -1,37 +1,37 @@
 # SPDX-License-Identifier: BSL-1.0
 
-# Unit tests for `split_json_array` helper in `extras/CatchAddTests.cmake`.
+# Unit tests for `catch3_split_json_array` helper in `extras/Catch3AddTests.cmake`.
 #
 # Yes, we are at the stage where the script helpers need unit tests.
 #
 # Run as
-#     cmake -DCATCH_ADD_TESTS_SCRIPT=/path/to/extras/CatchAddTests.cmake \
+#     cmake -DCATCH3_ADD_TESTS_SCRIPT=/path/to/extras/Catch3AddTests.cmake \
 #           -P TestDecomposeJsonArray.cmake
 
 
 cmake_minimum_required(VERSION 3.19)
 
-if(NOT DEFINED CATCH_ADD_TESTS_SCRIPT)
-  message(FATAL_ERROR "Missing argument `CATCH_ADD_TESTS_SCRIPT`")
+if(NOT DEFINED CATCH3_ADD_TESTS_SCRIPT)
+  message(FATAL_ERROR "Missing argument `CATCH3_ADD_TESTS_SCRIPT`")
 endif()
 
-if(NOT EXISTS "${CATCH_ADD_TESTS_SCRIPT}")
-  message(FATAL_ERROR "Cannot find CatchAddTests.cmake at '${CATCH_ADD_TESTS_SCRIPT}'")
+if(NOT EXISTS "${CATCH3_ADD_TESTS_SCRIPT}")
+  message(FATAL_ERROR "Cannot find Catch3AddTests.cmake at '${CATCH3_ADD_TESTS_SCRIPT}'")
 endif()
 
 # Pull in the helper functions. Without `TEST_EXECUTABLE` being defined,
-# `catch_discover_tests_impl` is not called.
-include("${CATCH_ADD_TESTS_SCRIPT}")
+# `catch3_discover_tests_impl` is not called.
+include("${CATCH3_ADD_TESTS_SCRIPT}")
 
 set(_failures 0)
 
 # Parses out test names from provided listings and returns them through `out_var`.
 # Semicolons in test names are escaped as `@SEMI@`.
 function(decomposed_names listing_var out_var)
-  split_json_array(${listing_var} elements)
+  catch3_split_json_array(${listing_var} elements)
   set(names "")
   foreach(element IN LISTS elements)
-    magic_unescape_chars(element)
+    catch3_magic_unescape_chars(element)
     string(JSON name ERROR_VARIABLE err GET "${element}" "name")
     if(NOT err STREQUAL "NOTFOUND")
       set(${out_var} "PARSE-ERROR" PARENT_SCOPE)
@@ -62,9 +62,9 @@ endfunction()
 # Assert that the tags in one decomposed element are preserved exactly.
 # Semicolons in expected tags have to be escaped as `@SEMI@`.
 function(expect_tags description listing_var element_index expected_tags)
-  split_json_array(${listing_var} elements)
+  catch3_split_json_array(${listing_var} elements)
   list(GET elements ${element_index} element)
-  magic_unescape_chars(element)
+  catch3_magic_unescape_chars(element)
 
   string(JSON tags ERROR_VARIABLE err GET "${element}" "tags")
   if(NOT err STREQUAL "NOTFOUND")
@@ -109,7 +109,7 @@ function(make_listing out_var)
   set(${out_var} "[\n${objects}]" PARENT_SCOPE)
 endfunction()
 
-message(STATUS "Running split_json_array correctness tests")
+message(STATUS "Running catch3_split_json_array correctness tests")
 
 # There are 2 main difficulties in the array decomposition that we need
 # to check for:
@@ -191,4 +191,4 @@ if(_failures GREATER 0)
   message(FATAL_ERROR "${_failures} decomposition test(s) failed")
 endif()
 
-message(STATUS "All split_json_array correctness tests passed")
+message(STATUS "All catch3_split_json_array correctness tests passed")
diff --git a/tests/TestScripts/DiscoverTests/TestPrepareCommandFragment.cmake b/tests/TestScripts/DiscoverTests/TestPrepareCommandFragment.cmake
index cfcaf0d1..a36b0191 100644
--- a/tests/TestScripts/DiscoverTests/TestPrepareCommandFragment.cmake
+++ b/tests/TestScripts/DiscoverTests/TestPrepareCommandFragment.cmake
@@ -1,27 +1,27 @@
 # SPDX-License-Identifier: BSL-1.0
 
-# Unit tests for `prepare_command_fragment` helper in `extras/CatchAddTests.cmake`.
+# Unit tests for `catch3_prepare_command_fragment` helper in `extras/Catch3AddTests.cmake`.
 #
 # Yes, we are at the stage where the script helpers need unit tests.
 #
 # Run as
-#     cmake -DCATCH_ADD_TESTS_SCRIPT=/path/to/extras/CatchAddTests.cmake \
+#     cmake -DCATCH3_ADD_TESTS_SCRIPT=/path/to/extras/Catch3AddTests.cmake \
 #           -P TestPrepareCommandFragment.cmake
 
 
 cmake_minimum_required(VERSION 3.19)
 
-if(NOT DEFINED CATCH_ADD_TESTS_SCRIPT)
-  message(FATAL_ERROR "Missing argument `CATCH_ADD_TESTS_SCRIPT`")
+if(NOT DEFINED CATCH3_ADD_TESTS_SCRIPT)
+  message(FATAL_ERROR "Missing argument `CATCH3_ADD_TESTS_SCRIPT`")
 endif()
 
-if(NOT EXISTS "${CATCH_ADD_TESTS_SCRIPT}")
-  message(FATAL_ERROR "Cannot find CatchAddTests.cmake at '${CATCH_ADD_TESTS_SCRIPT}'")
+if(NOT EXISTS "${CATCH3_ADD_TESTS_SCRIPT}")
+  message(FATAL_ERROR "Cannot find Catch3AddTests.cmake at '${CATCH3_ADD_TESTS_SCRIPT}'")
 endif()
 
 # Pull in the helper functions. Without `TEST_EXECUTABLE` being defined,
-# `catch_discover_tests_impl` is not called.
-include("${CATCH_ADD_TESTS_SCRIPT}")
+# `catch3_discover_tests_impl` is not called.
+include("${CATCH3_ADD_TESTS_SCRIPT}")
 
 set(_failures 0)
 
@@ -37,25 +37,25 @@ function(expect_equal description actual expected)
   endif()
 endfunction()
 
-prepare_command_fragment(test_fragment SimpleName /path/to/tests)
+catch3_prepare_command_fragment(test_fragment SimpleName /path/to/tests)
 expect_equal("Simple arg, no quotes" "${test_fragment}" " SimpleName /path/to/tests")
 
-prepare_command_fragment(test_fragment "Name with spaces")
+catch3_prepare_command_fragment(test_fragment "Name with spaces")
 expect_equal("Spaces in arg, needs quotes" "${test_fragment}" " [==[Name with spaces]==]")
 
-prepare_command_fragment(test_fragment Foo PROPERTIES LABELS "tagA\;tagB\;tagC")
+catch3_prepare_command_fragment(test_fragment Foo PROPERTIES LABELS "tagA\;tagB\;tagC")
 expect_equal("semicolons in argument are kept and quoted"
   "${test_fragment}" " Foo PROPERTIES LABELS [==[tagA\;tagB\;tagC]==]")
 
 set(test_fragment "PRE-EXISTING")
-prepare_command_fragment(test_fragment Foo PROPERTIES BAR baz)
+catch3_prepare_command_fragment(test_fragment Foo PROPERTIES BAR baz)
 expect_equal("out var does no accumulate commands"
   "${test_fragment}" " Foo PROPERTIES BAR baz")
 
 
 
 if(_failures GREATER 0)
-  message(FATAL_ERROR "${_failures} prepare_command_fragment test(s) failed")
+  message(FATAL_ERROR "${_failures} catch3_prepare_command_fragment test(s) failed")
 else()
-  message(STATUS "All prepare_command_fragment tests passed")
+  message(STATUS "All catch3_prepare_command_fragment tests passed")
 endif()
diff --git a/tests/TestScripts/DiscoverTests/register-tests.cpp b/tests/TestScripts/DiscoverTests/register-tests.cpp
index e22b9752..8b5570d3 100644
--- a/tests/TestScripts/DiscoverTests/register-tests.cpp
+++ b/tests/TestScripts/DiscoverTests/register-tests.cpp
@@ -6,7 +6,7 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-#include <catch2/catch_test_macros.hpp>
+#include <Progmasoft/Catch3/TestMacros.hpp>
 
 #include <cstdio>
 #include <iostream>
diff --git a/tests/TestScripts/testConfigureDisable.py b/tests/TestScripts/testConfigureDisable.py
index ce9b2f9f..ae5ce37b 100644
--- a/tests/TestScripts/testConfigureDisable.py
+++ b/tests/TestScripts/testConfigureDisable.py
@@ -34,7 +34,7 @@ configure_and_build(catch2_source_path,
                      # We need to turn off WERROR, because the compilers
                      # can see that the various variables inside test cases
                      # are set but unused.
-                     ("CATCH_ENABLE_WERROR", "OFF")])
+                     ("CATCH3_ENABLE_WERROR", "OFF")])
 
 stdout, _ = run_and_return_output(os.path.join(build_dir_path, 'tests'),
                                   'SelfTest',