update to catch version 3

NWChemEx · Sep 10, 2024 · 2bf2054 · 2bf2054
1 parent 10551d5
commit 2bf2054
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 51 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ nwx_cxx_api_docs("README.md" "${project_inc_dir}" "${project_src_dir}")
 cmaize_find_or_build_dependency(
     spdlog
     URL github.com/gabime/spdlog
-    VERSION ${NWX_SPDLOG_VERSION}
+    VERSION ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36
     BUILD_TARGET spdlog
     FIND_TARGET spdlog::spdlog
     CMAKE_ARGS SPDLOG_INSTALL=ON
@@ -78,7 +78,7 @@ endif ()
 cmaize_find_or_build_dependency(
     cereal
     URL github.com/USCiLab/cereal
-    VERSION ${NWX_CEREAL_VERSION}
+    VERSION v1.3.0
     BUILD_TARGET cereal
     FIND_TARGET cereal
     CMAKE_ARGS JUST_INSTALL_CEREAL=ON
@@ -109,20 +109,14 @@ if("${BUILD_TESTING}")
         URL github.com/catchorg/Catch2
         BUILD_TARGET Catch2
         FIND_TARGET Catch2::Catch2
-        VERSION ${NWX_CATCH2_VERSION}
+        VERSION v3.6.0
     )
     cmaize_add_tests(
         test_unit_parallelzone
         SOURCE_DIR "${CXX_TEST_DIR}/unit_tests"
         INCLUDE_DIRS "${project_src_dir}"
 	DEPENDS Catch2::Catch2 ${PROJECT_NAME}
     )
-    cmaize_add_tests(
-        test_integration_parallelzone
-        SOURCE_DIR "${CXX_TEST_DIR}/integration_tests"
-        INCLUDE_DIRS "${project_src_dir}"
-        DEPENDS Catch2::Catch2 ${PROJECT_NAME}
-    )
     cmaize_add_tests(
         test_parallelzone_docs
         SOURCE_DIR "${CXX_TEST_DIR}/doc_snippets"

diff --git a/tests/cxx/doc_snippets/catch.hpp b/tests/cxx/doc_snippets/catch.hpp
@@ -0,0 +1,5 @@
+#pragma once
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/tests/cxx/doc_snippets/test_parallelzone.hpp b/tests/cxx/doc_snippets/test_parallelzone.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <catch2/catch.hpp>
+#include "catch.hpp"
 #include <parallelzone/runtime/runtime_view.hpp>
 
 namespace testing {

diff --git a/tests/cxx/integration_tests/blank_test.cpp b/tests/cxx/integration_tests/blank_test.cpp
diff --git a/tests/cxx/unit_tests/parallelzone/archive_wrapper.cpp b/tests/cxx/unit_tests/parallelzone/archive_wrapper.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "catch.hpp"
 #include "parallelzone/archive_wrapper.hpp"
-#include <catch2/catch.hpp>
 
 TEMPLATE_TEST_CASE("Serialization with  ArchiveWrapper",
                    "[serialization][Serializer][Deserializer]",

diff --git a/tests/cxx/unit_tests/parallelzone/catch.hpp b/tests/cxx/unit_tests/parallelzone/catch.hpp
@@ -0,0 +1,5 @@
+#pragma once
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/file.cpp b/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/file.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../catch.hpp"
 #include <filesystem>
 #include <parallelzone/logging/detail_/spdlog/file.hpp>
 #include <parallelzone/logging/detail_/spdlog/stdout.hpp>

diff --git a/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/spdlog.cpp b/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/spdlog.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../catch.hpp"
 #include <filesystem>
 #include <iostream>
 #include <parallelzone/logging/detail_/spdlog/spdlog.hpp>

diff --git a/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/stdout.cpp b/tests/cxx/unit_tests/parallelzone/logging/detail_/spdlog/stdout.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../catch.hpp"
 #include <parallelzone/logging/detail_/spdlog/stdout.hpp>
 #include <spdlog/sinks/ostream_sink.h>
 #include <sstream>

diff --git a/tests/cxx/unit_tests/parallelzone/logging/logger.cpp b/tests/cxx/unit_tests/parallelzone/logging/logger.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <parallelzone/logging/detail_/spdlog/spdlog.hpp>
 #include <parallelzone/logging/detail_/spdlog/stdout.hpp>
 #include <parallelzone/logging/logger.hpp>

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/binary_buffer.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/binary_buffer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <parallelzone/mpi_helpers/binary_buffer/binary_buffer.hpp>
 
 /* Testing Strategy:

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/binary_view.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/binary_view.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <parallelzone/mpi_helpers/binary_buffer/binary_buffer.hpp>
 #include <parallelzone/mpi_helpers/binary_buffer/binary_view.hpp>
 

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/detail_/binary_buffer_pimpl.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/binary_buffer/detail_/binary_buffer_pimpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../catch.hpp"
 #include <parallelzone/mpi_helpers/binary_buffer/detail_/binary_buffer_pimpl.hpp>
 
 /* Testing Strategy:

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/commpp/commpp.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/commpp/commpp.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "../../test_parallelzone.hpp"
+#include <numeric>
 #include <parallelzone/mpi_helpers/commpp/commpp.hpp>
 
 using namespace parallelzone::mpi_helpers;

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/mpi_data_type.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/mpi_data_type.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <parallelzone/mpi_helpers/traits/mpi_data_type.hpp>
 
 using namespace parallelzone::mpi_helpers;

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/mpi_op.cpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/mpi_op.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <parallelzone/mpi_helpers/traits/mpi_op.hpp>
 
 using namespace parallelzone::mpi_helpers;

diff --git a/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/test_traits.hpp b/tests/cxx/unit_tests/parallelzone/mpi_helpers/traits/test_traits.hpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <map>
 #include <parallelzone/mpi_helpers/binary_buffer/binary_buffer.hpp>
 #include <vector>

diff --git a/tests/cxx/unit_tests/parallelzone/runtime/detail_/resource_set_pimpl.cpp b/tests/cxx/unit_tests/parallelzone/runtime/detail_/resource_set_pimpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <parallelzone/logging/logger_factory.hpp>
 #include <parallelzone/runtime/detail_/resource_set_pimpl.hpp>
 

diff --git a/tests/cxx/unit_tests/parallelzone/serialization.cpp b/tests/cxx/unit_tests/parallelzone/serialization.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "catch.hpp"
 #include "parallelzone/serialization.hpp"
-#include <catch2/catch.hpp>
 
 TEMPLATE_TEST_CASE("Serialization with Cereal wrapper",
                    "[serialization][serializer][deserializer]",

diff --git a/tests/cxx/unit_tests/parallelzone/test_parallelzone.hpp b/tests/cxx/unit_tests/parallelzone/test_parallelzone.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <catch2/catch.hpp>
+#include "catch.hpp"
 #include <parallelzone/runtime/runtime_view.hpp>
 
 namespace testing {