fixed tests not building with catch2 versions >= 3.0

rapidfuzz · Jan 22, 2025 · f65c3d1 · f65c3d1
1 parent 6f34131
commit f65c3d1
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+## [3.3.1] - 2025-01-22
+### Fixed
+- fixed tests not building with catch2 versions >= 3.0
+
 ## [3.3.0] - 2025-01-18
 ### Changed
 - add C++11 and C++14 support

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif()
 
-project(rapidfuzz LANGUAGES CXX VERSION 3.3.0)
+project(rapidfuzz LANGUAGES CXX VERSION 3.3.1)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 include(GNUInstallDirs)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Catch2 2 QUIET)
+find_package(Catch2 QUIET)
 if (Catch2_FOUND)
     message("Using system supplied version of Catch2")
 else()
@@ -10,6 +10,7 @@ else()
         GIT_TAG         v2.13.10
     )
     FetchContent_MakeAvailable(Catch2)
+    set(Catch2_VERSION "2.13.10")
 endif()
 
 if (RAPIDFUZZ_ENABLE_LINTERS)
@@ -50,11 +51,19 @@ if (RAPIDFUZZ_ENABLE_LINTERS)
 endif()
 
 function(rapidfuzz_add_test test)
-    add_executable(test_${test} tests-main.cpp tests-${test}.cpp)
-    target_link_libraries(test_${test} ${PROJECT_NAME})
-    target_link_libraries(test_${test} Catch2::Catch2)
+    if(Catch2_VERSION VERSION_LESS "3.0")
+        add_executable(test_${test} tests-main.cpp tests-${test}.cpp)
+        target_link_libraries(test_${test} PRIVATE Catch2::Catch2)
+        target_compile_definitions(test_${test} PRIVATE CATCH2_VERSION=2)
+    else()
+        add_executable(test_${test} tests-${test}.cpp)
+        target_link_libraries(test_${test} PRIVATE Catch2::Catch2WithMain)
+        target_compile_definitions(test_${test} PRIVATE CATCH2_VERSION=3)
+    endif()
+
+    target_link_libraries(test_${test} PRIVATE ${PROJECT_NAME})
     if (RAPIDFUZZ_ENABLE_LINTERS)
-        target_link_libraries(test_${test} project_warnings)
+        target_link_libraries(test_${test} PRIVATE project_warnings)
     endif()
     add_test(NAME ${test} COMMAND test_${test})
 endfunction()

diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt
@@ -1,7 +1,15 @@
 function(rapidfuzz_add_test test)
-    add_executable(test_${test} ../tests-main.cpp tests-${test}.cpp examples/ocr.cpp examples/pythonLevenshteinIssue9.cpp)
+    if(Catch2_VERSION VERSION_LESS "3.0")
+        add_executable(test_${test} ../tests-main.cpp tests-${test}.cpp examples/ocr.cpp examples/pythonLevenshteinIssue9.cpp)
+        target_link_libraries(test_${test} PRIVATE Catch2::Catch2)
+        target_compile_definitions(test_${test} PRIVATE CATCH2_VERSION=2)
+    else()
+        add_executable(test_${test} tests-${test}.cpp examples/ocr.cpp examples/pythonLevenshteinIssue9.cpp)
+        target_link_libraries(test_${test} PRIVATE Catch2::Catch2WithMain)
+        target_compile_definitions(test_${test} PRIVATE CATCH2_VERSION=3)
+    endif()
+
     target_link_libraries(test_${test} PRIVATE ${PROJECT_NAME})
-    target_link_libraries(test_${test} PRIVATE Catch2::Catch2)
     if (RAPIDFUZZ_ENABLE_LINTERS)
         target_link_libraries(test_${test} PRIVATE project_warnings)
     endif()

diff --git a/test/distance/tests-DamerauLevenshtein.cpp b/test/distance/tests-DamerauLevenshtein.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <rapidfuzz/details/Range.hpp>
 #include <rapidfuzz/details/types.hpp>
 #include <string>

diff --git a/test/distance/tests-Hamming.cpp b/test/distance/tests-Hamming.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <rapidfuzz/distance.hpp>
 #include <rapidfuzz/distance/Hamming.hpp>
 #include <string>

diff --git a/test/distance/tests-Indel.cpp b/test/distance/tests-Indel.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <string>
 
 #include <rapidfuzz/distance.hpp>

diff --git a/test/distance/tests-Jaro.cpp b/test/distance/tests-Jaro.cpp
@@ -1,5 +1,11 @@
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include "../../rapidfuzz_reference/Jaro.hpp"
-#include <catch2/catch.hpp>
 #include <rapidfuzz/distance/Jaro.hpp>
 
 #include "../common.hpp"

diff --git a/test/distance/tests-JaroWinkler.cpp b/test/distance/tests-JaroWinkler.cpp
@@ -1,5 +1,11 @@
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include "../../rapidfuzz_reference/JaroWinkler.hpp"
-#include <catch2/catch.hpp>
 #include <rapidfuzz/distance/JaroWinkler.hpp>
 
 #include "../common.hpp"

diff --git a/test/distance/tests-LCSseq.cpp b/test/distance/tests-LCSseq.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <rapidfuzz/distance/LCSseq.hpp>
 #include <string>
 

diff --git a/test/distance/tests-Levenshtein.cpp b/test/distance/tests-Levenshtein.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <rapidfuzz/details/Range.hpp>
 #include <rapidfuzz/details/types.hpp>
 #include <rapidfuzz/distance/Levenshtein.hpp>

diff --git a/test/distance/tests-OSA.cpp b/test/distance/tests-OSA.cpp
@@ -1,4 +1,10 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
+
 #include <rapidfuzz/details/types.hpp>
 #include <rapidfuzz/distance/OSA.hpp>
 #include <string>

diff --git a/test/tests-common.cpp b/test/tests-common.cpp
@@ -1,5 +1,11 @@
 #include "rapidfuzz/details/Range.hpp"
-#include <catch2/catch.hpp>
+
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_approx.hpp>
+#    include <catch2/catch_test_macros.hpp>
+#endif
 
 #include <rapidfuzz/details/common.hpp>
 

diff --git a/test/tests-fuzz.cpp b/test/tests-fuzz.cpp
@@ -1,4 +1,9 @@
-#include <catch2/catch.hpp>
+#if CATCH2_VERSION == 2
+#    include <catch2/catch.hpp>
+#else
+#    include <catch2/catch_test_macros.hpp>
+#    include <catch2/matchers/catch_matchers_floating_point.hpp>
+#endif
 
 #include <rapidfuzz/fuzz.hpp>
 

diff --git a/test/tests-main.cpp b/test/tests-main.cpp
@@ -1,3 +1,3 @@
 // test main file so catch2 does not has to be recompiled
 #define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"
+#include <catch2/catch.hpp>