Merge pull request #178 from aboseley/adam/use-catch2

Use catch2 for unit testing
zeromq · Dec 3, 2021 · 27740d7 · 27740d7
2 parents febe5f0 + 46f11ed
commit 27740d7
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 9,019 deletions.
diff --git a/.github/workflows/cmake-superbuild/CMakeLists.txt b/.github/workflows/cmake-superbuild/CMakeLists.txt
@@ -54,5 +54,6 @@ ExternalProject_Add(
         DEPENDS ${LIBS}
         CMAKE_ARGS ${CMAKE_ARGS} -DBUILD_TESTING=YES
         SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../..
+        TEST_COMMAND ctest --repeat-until-fail 3
         TEST_BEFORE_INSTALL YES
 )
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -27,7 +27,7 @@ jobs:
             os: ubuntu-20.04,
             boost_url: system,
             zmq_tag: system,
-            system_packages: "libboost-all-dev libzmq3-dev",
+            system_packages: "libboost-all-dev libzmq3-dev ",
             cc: "gcc",
             cxx: "g++",
           }
@@ -54,7 +54,7 @@ jobs:
             os: macos-11,
             boost_url: system,
             zmq_tag: system,
-            system_packages: "zmq boost",
+            system_packages: "zmq boost ",
             cc: "clang",
             cxx: "clang++",
           }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,13 +57,7 @@ if(NOT AZMQ_NO_TESTS)
     enable_testing()
 endif()
 
-macro(add_catch_test name)
-    if (TEST_REPORT_FORMAT)
-        add_test(NAME ${name} COMMAND ${name} -r ${TEST_REPORT_FORMAT} -o "${name}.test_out.xml")
-    else()
-        add_test(NAME ${name} COMMAND ${name})
-    endif()
-endmacro()
+
 
 if(NOT AZMQ_NO_TESTS)
     add_subdirectory(test)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,3 +1,22 @@
+find_package(Catch2)
+if ( NOT Catch2 )
+    Include(FetchContent)
+    FetchContent_Declare(
+            Catch2
+            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+            GIT_TAG        v2.13.7)
+    FetchContent_MakeAvailable(Catch2)
+    list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
+endif()
+
+link_libraries(Catch2::Catch2)
+
+macro(add_catch_test name)
+    include(CTest)
+    include(Catch)
+    catch_discover_tests(${name})
+endmacro()
+
 add_subdirectory(message)
 add_subdirectory(context_ops)
 add_subdirectory(socket_ops)

diff --git a/test/actor/main.cpp b/test/actor/main.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 
 #define CATCH_CONFIG_MAIN
-#include "../catch.hpp"
+#include <catch2/catch.hpp>
 
 std::array<boost::asio::const_buffer, 2> snd_bufs = {{
     boost::asio::buffer("A"),