Upgraded catch2 to v3 and take advantage of creating our own main to …

…include STOP_LOGGING
driplineorg · Oct 10, 2024 · 0798044 · 0798044
1 parent 96f2165
commit 0798044
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 29 deletions.
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -4,11 +4,26 @@
 
 ##########
 
+# Install Catch2
+
+include( FetchContent )
+
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        v3.7.1
+)
+
+FetchContent_MakeAvailable( Catch2 )
+list( APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras )
+
+##########
+
 #set( testing_HEADERS
 #)
 
 set( testing_SOURCES
-    use_catch.cc
+    run_dl_tests.cc
     test_agent.cc
     test_amqp.cc
     test_core.cc
@@ -27,7 +42,6 @@ set( testing_SOURCES
 
 set( testing_LIBS 
     Dripline
-    Catch
 )
 
 if( Dripline_BUILD_EXAMPLES )
@@ -42,21 +56,21 @@ if( Dripline_BUILD_EXAMPLES )
     )
 endif()
 
-# Interface library was recommended for Catch:
-# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
-add_library( Catch INTERFACE )
-target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/catch )
-
 pbuilder_executable( 
     EXECUTABLE run_dl_tests
     SOURCES ${testing_SOURCES}
     PROJECT_LIBRARIES ${testing_LIBS}
+    PRIVATE_EXTERNAL_LIBRARIES Catch2::Catch2
 )
-target_link_libraries( run_dl_tests PUBLIC Catch )
 
 list( APPEND programs "run_dl_tests" )
 
-message(STATUS "##### programs: ${programs}")
+pbuilder_component_install_and_export( 
+    COMPONENT Catch2
+    LIBTARGETS Catch2
+    NAMESPACE Catch2::
+)
+
 pbuilder_component_install_and_export( 
     COMPONENT Executables
     EXETARGETS ${programs}

diff --git a/testing/run_dl_tests.cc b/testing/run_dl_tests.cc
@@ -0,0 +1,20 @@
+/*
+ * run_dl_tests.cc
+ *
+ *  Created on: Oct 10, 2024
+ *      Author: N.S. Oblath
+ */
+
+
+#include "catch2/catch_session.hpp"
+
+#include "logger.hh"
+
+int main( int argc, char* argv[] ) {
+
+  int result = Catch::Session().run( argc, argv );
+
+  STOP_LOGGING;
+
+  return result;
+}
diff --git a/testing/test_agent.cc b/testing/test_agent.cc
@@ -12,7 +12,8 @@
 
 //#include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_all.hpp"
 
 //LOGGER( talog, "test_agent" );
 

diff --git a/testing/test_amqp.cc b/testing/test_amqp.cc
@@ -7,7 +7,7 @@
 
 #include "amqp.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 TEST_CASE( "amqp_table", "[amqp]" )
 {

diff --git a/testing/test_core.cc b/testing/test_core.cc
@@ -14,7 +14,7 @@
 #include "authentication.hh"
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <boost/filesystem.hpp>
 

diff --git a/testing/test_dripline_error.cc b/testing/test_dripline_error.cc
@@ -11,7 +11,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "test_dripline_error" );
 

diff --git a/testing/test_endpoint.cc b/testing/test_endpoint.cc
@@ -8,7 +8,7 @@
 #include "dripline_exceptions.hh"
 #include "endpoint.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 TEST_CASE( "submit_msg", "[endpoint]" )
 {

diff --git a/testing/test_examples_oscillator.cc b/testing/test_examples_oscillator.cc
@@ -7,7 +7,8 @@
 
 #include "oscillator.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_all.hpp"
 
 #include <cmath>
 

diff --git a/testing/test_lockout.cc b/testing/test_lockout.cc
@@ -7,7 +7,7 @@
 
 #include "endpoint.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 
 TEST_CASE( "lockout", "[endpoint]" ) // even though a service is used here for convenience, lockout functionality lives in endpoint

diff --git a/testing/test_messages.cc b/testing/test_messages.cc
@@ -9,7 +9,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "test_message" );
 

diff --git a/testing/test_return_codes.cc b/testing/test_return_codes.cc
@@ -11,7 +11,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <algorithm>
 #include <sstream>

diff --git a/testing/test_scheduler.cc b/testing/test_scheduler.cc
@@ -9,7 +9,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <thread>
 

diff --git a/testing/test_service.cc b/testing/test_service.cc
@@ -11,7 +11,7 @@
 #include "authentication.hh"
 #include "param_node.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <chrono>
 #include <future>

diff --git a/testing/test_specifier.cc b/testing/test_specifier.cc
@@ -7,7 +7,7 @@
 
 #include "specifier.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 TEST_CASE( "specifier", "[message]" )
 {

diff --git a/testing/test_throw_reply.cc b/testing/test_throw_reply.cc
@@ -9,7 +9,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "test_throw_reply" );
 

diff --git a/testing/test_uuid.cc b/testing/test_uuid.cc
@@ -7,7 +7,8 @@
 
 #include "uuid.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_all.hpp"
 
 TEST_CASE( "uuid", "[message]" )
 {
@@ -19,25 +20,25 @@ TEST_CASE( "uuid", "[message]" )
     std::string t_test_string_1( "AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE" );
     dripline::uuid_t t_test_uuid_1;
     REQUIRE_NOTHROW( t_test_uuid_1 = dripline::uuid_from_string( t_test_string_1 ) );
-    REQUIRE_THAT( t_test_string_1, Catch::Equals(dripline::string_from_uuid(t_test_uuid_1), Catch::CaseSensitive::No) );
+    REQUIRE_THAT( t_test_string_1, Catch::Matchers::Equals(dripline::string_from_uuid(t_test_uuid_1), Catch::CaseSensitive::No) );
 
     std::string t_test_string_2( "{AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE}" );
     dripline::uuid_t t_test_uuid_2;
     REQUIRE_NOTHROW( t_test_uuid_2 = dripline::uuid_from_string( t_test_string_2 ) );
     // compare to t_test_string_1 because the to_string conversion adds dashes and has no braces
-    REQUIRE_THAT( t_test_string_1, Catch::Equals(dripline::string_from_uuid(t_test_uuid_2), Catch::CaseSensitive::No) );
+    REQUIRE_THAT( t_test_string_1, Catch::Matchers::Equals(dripline::string_from_uuid(t_test_uuid_2), Catch::CaseSensitive::No) );
 
     std::string t_test_string_3( "AAAAAAAABBBBCCCCDDDDEEEEEEEEEEEE" );
     dripline::uuid_t t_test_uuid_3;
     REQUIRE_NOTHROW( t_test_uuid_3 = dripline::uuid_from_string( t_test_string_3 ) );
     // compare to t_test_string_1 because the to_string conversion adds dashes and has no braces
-    REQUIRE_THAT( t_test_string_1, Catch::Equals(dripline::string_from_uuid(t_test_uuid_3), Catch::CaseSensitive::No) );
+    REQUIRE_THAT( t_test_string_1, Catch::Matchers::Equals(dripline::string_from_uuid(t_test_uuid_3), Catch::CaseSensitive::No) );
 
     std::string t_test_string_4( "{AAAAAAAABBBBCCCCDDDDEEEEEEEEEEEE}" );
     dripline::uuid_t t_test_uuid_4;
     REQUIRE_NOTHROW( t_test_uuid_4 = dripline::uuid_from_string( t_test_string_4 ) );
     // compare to t_test_string_1 because the to_string conversion adds dashes and has no braces
-    REQUIRE_THAT( t_test_string_1, Catch::Equals(dripline::string_from_uuid(t_test_uuid_4), Catch::CaseSensitive::No) );
+    REQUIRE_THAT( t_test_string_1, Catch::Matchers::Equals(dripline::string_from_uuid(t_test_uuid_4), Catch::CaseSensitive::No) );
 }
 
 

diff --git a/testing/test_version_store.cc b/testing/test_version_store.cc
@@ -9,7 +9,7 @@
 
 #include "dripline_version.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 
 namespace dripline

diff --git a/testing/use_catch.cc b/testing/use_catch.cc
@@ -7,4 +7,4 @@
 
 // Tells Catch to provide a main()
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"