Unit tests: include test-specific headers

sccn · Oct 28, 2023 · 4210bb6 · 4210bb6
1 parent 9b6d12b
commit 4210bb6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -13,7 +13,7 @@ Include(FetchContent)
 FetchContent_Declare(
 		Catch2
 		GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-		GIT_TAG        v3.0.1 # or a later release
+		GIT_TAG        v3.4.0 # or a later release
 )
 FetchContent_MakeAvailable(Catch2)
 

diff --git a/testing/catch_main.cpp b/testing/catch_main.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_session.hpp>
 
 extern "C" {
 const char *lsl_library_info() { return LSL_VERSION_INFO; }

diff --git a/testing/ext/DataType.cpp b/testing/ext/DataType.cpp
@@ -1,6 +1,8 @@
 #include "../common/create_streampair.hpp"
 #include "../common/lsltypes.hpp"
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <cstdint>
 #include <lsl_cpp.h>
 #include <thread>

diff --git a/testing/int/bench_sleep.cpp b/testing/int/bench_sleep.cpp
@@ -1,4 +1,5 @@
-#include <catch2/catch_all.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <common.h>
 #include <thread>
 

diff --git a/testing/int/bench_timesync.cpp b/testing/int/bench_timesync.cpp
@@ -1,6 +1,7 @@
 #include "stream_info_impl.h"
 #include "udp_server.h"
-#include <catch2/catch_all.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <sstream>
 #include <thread>
 

diff --git a/testing/int/inireader.cpp b/testing/int/inireader.cpp
@@ -1,5 +1,5 @@
 #include "util/inireader.hpp"
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <sstream>
 
 // clazy:excludeall=non-pod-global-static

diff --git a/testing/int/loguruthreadnames.cpp b/testing/int/loguruthreadnames.cpp
@@ -1,7 +1,7 @@
 #include <loguru.hpp>
 #include <thread>
 // Include loguru before catch
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 // clazy:excludeall=non-pod-global-static
 

diff --git a/testing/int/network.cpp b/testing/int/network.cpp
@@ -7,7 +7,9 @@
 #include <asio/read.hpp>
 #include <asio/use_future.hpp>
 #include <asio/write.hpp>
-#include <catch2/catch_all.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <chrono>
 #include <condition_variable>
 #include <future>

diff --git a/testing/int/postproc.cpp b/testing/int/postproc.cpp
@@ -3,7 +3,8 @@
 #include <random>
 #include <thread>
 // include loguru before catch
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_approx.cpp>
+#include <catch2/catch_test_macros.hpp>
 
 // clazy:excludeall=non-pod-global-static