From dbf088f2346a338e92f96a0e5b846cf40f8b09c5 Mon Sep 17 00:00:00 2001
From: David Heejong Park <hee.jong.park@dnv.com>
Date: Wed, 29 Mar 2023 22:23:37 +0200
Subject: [PATCH] Upgraded to more recent version of Catch2 (v3)

---
 tests/CMakeLists.txt       | 4 ++--
 tests/signaltl_tests.cc    | 3 ---
 tests/test_append_error.cc | 2 +-
 tests/test_signals.cc      | 8 ++++----
 third_party/Catch2         | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 tests/signaltl_tests.cc

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c50d060..92b9217 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,10 @@
 message(STATUS "Building Tests in ${CMAKE_CURRENT_LIST_DIR}")
 
-set(TEST_SRCS signaltl_tests.cc test_append_error.cc test_signals.cc)
+set(TEST_SRCS test_append_error.cc test_signals.cc)
 
 add_executable(signaltl_tests ${TEST_SRCS})
 target_include_directories(signaltl_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(signaltl_tests PUBLIC signal_tl::signal_tl Catch2::Catch2)
+target_link_libraries(signaltl_tests PUBLIC signal_tl::signal_tl Catch2::Catch2 Catch2::Catch2WithMain)
 
 include(Catch)
 if(SIGNALTL_COVERAGE)
diff --git a/tests/signaltl_tests.cc b/tests/signaltl_tests.cc
deleted file mode 100644
index 8e5193c..0000000
--- a/tests/signaltl_tests.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-#define CATCH_CONFIG_MAIN
-
-#include "catch2/catch.hpp"
diff --git a/tests/test_append_error.cc b/tests/test_append_error.cc
index 28f4157..62850c8 100644
--- a/tests/test_append_error.cc
+++ b/tests/test_append_error.cc
@@ -3,7 +3,7 @@
 
 #include <fmt/format.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace stl = signal_tl;
 using namespace signal_tl::signal;
diff --git a/tests/test_signals.cc b/tests/test_signals.cc
index ed7ada7..0da03e5 100644
--- a/tests/test_signals.cc
+++ b/tests/test_signals.cc
@@ -1,7 +1,7 @@
 /**
  * This file will test the functionality of the Signal class
  */
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "signal_tl/signal.hh"
 
@@ -38,7 +38,7 @@ class MonotonicIncreasingTimestampedSignal
 Catch::Generators::GeneratorWrapper<Sample>
 mono_increase_sample(double interval_size = 10.0, double delta = 0.1) {
   return Catch::Generators::GeneratorWrapper<Sample>(
-      std::unique_ptr<Catch::Generators::IGenerator<Sample>>(
+      Catch::Detail::unique_ptr<Catch::Generators::IGenerator<Sample>>(
           new MonotonicIncreasingTimestampedSignal(interval_size, delta)));
 }
 
@@ -55,8 +55,8 @@ TEST_CASE("Signals are monotonically increasing", "[signal]") {
     auto sig      = std::make_shared<Signal>(points, time_pts);
 
     REQUIRE(sig->size() == 4);
-    REQUIRE(sig->begin_time() == Approx(0));
-    REQUIRE(sig->end_time() == Approx(6.25));
+    REQUIRE(sig->begin_time() == Catch::Approx(0));
+    REQUIRE(sig->end_time() == Catch::Approx(6.25));
 
     auto time_point = GENERATE(take(100, random(0.0, 6.25)));
     REQUIRE_THROWS(sig->push_back(time_point, 0.0));
diff --git a/third_party/Catch2 b/third_party/Catch2
index 7f21cc6..3f0283d 160000
--- a/third_party/Catch2
+++ b/third_party/Catch2
@@ -1 +1 @@
-Subproject commit 7f21cc6c5599f59835f769debf13b4c3e6148a28
+Subproject commit 3f0283de7a9c43200033da996ff9093be3ac84dc