Upgrade to a newer version of Catch using FetchContent

Fastcode · Jul 14, 2024 · ae944aa · ae944aa
1 parent 964efc8
commit ae944aa
Show file tree

Hide file tree

Showing 52 changed files with 122 additions and 262 deletions.
diff --git a/cmake/Modules/FindCATCH.cmake b/cmake/Modules/FindCATCH.cmake
diff --git a/cmake/Modules/HeaderLibrary.cmake b/cmake/Modules/HeaderLibrary.cmake
diff --git a/src/dsl/store/TypeCallbackStore.hpp b/src/dsl/store/TypeCallbackStore.hpp
@@ -33,13 +33,13 @@ namespace dsl {
     namespace store {
 
         /**
-         * @biref The main callback store for reactions that are executed when a paticular type is emitted.
+         * @brief The main callback store for reactions that are executed when a particular type is emitted.
          *
          * @details This store is the main location that callbacks that are executed on type are stored.
          *          This method of storing is how the system realises compile time message dispatch. By storing each
-         *          differnt type of message user in its own location the system knows exactly which reactions to
-         *          execuing without having to do an expensive lookup. This reduces the latency and computational
-         *          power invovled in spawning a new reaction when a type is emitted.
+         *          different type of message user in its own location the system knows exactly which reactions to
+         *          executing without having to do an expensive lookup. This reduces the latency and computational
+         *          power involved in spawning a new reaction when a type is emitted.
          *
          * @tparam TriggeringType the type that when emitted will start this function
          */

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -20,61 +20,65 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER I
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-find_package(CATCH)
-
-if(CATCH_FOUND)
-  # Supported options:
-  option(BUILD_TESTS "Builds all of the NUClear unit tests." TRUE)
-
-  if(BUILD_TESTS)
-    enable_testing()
-
-    add_compile_definitions(CATCH_CONFIG_CONSOLE_WIDTH=120)
-
-    file(
-      GLOB
-      test_src
-      test.cpp
-      "api/*.cpp"
-      "dsl/*.cpp"
-      "dsl/emit/*.cpp"
-      "log/*.cpp"
-      "util/*.cpp"
-      "util/network/*.cpp"
-      "util/serialise/*.cpp"
-    )
-
-    file(GLOB test_util_src "test_util/*.cpp")
-    add_library(test_util STATIC ${test_util_src})
-    target_link_libraries(test_util PUBLIC NUClear::nuclear)
-    target_include_directories(
-      test_util SYSTEM PUBLIC ${CATCH_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include "${PROJECT_SOURCE_DIR}/src"
-    )
-
-    # Some tests must be executed as individual binaries
-    file(GLOB individual_tests "${CMAKE_CURRENT_SOURCE_DIR}/individual/*.cpp")
-
-    foreach(test_src ${individual_tests})
-      get_filename_component(test_name ${test_src} NAME_WE)
-
-      add_executable(${test_name} ${test_src})
-      target_link_libraries(${test_name} NUClear::nuclear test_util)
-      set_target_properties(${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/individual")
-      target_include_directories(${test_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-      # Enable warnings, and all warnings are errors
-
-      add_test(${test_name} test_nuclear)
-
-    endforeach(test_src)
-
-    add_executable(test_nuclear ${test_src})
-    target_include_directories(test_nuclear PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-    target_link_libraries(test_nuclear NUClear::nuclear test_util)
-    add_test(test_nuclear test_nuclear)
-
-    add_executable(test_network networktest.cpp)
-    target_link_libraries(test_network NUClear::nuclear test_util)
-    target_include_directories(test_network PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-  endif(BUILD_TESTS)
-endif(CATCH_FOUND)
+option(BUILD_TESTS "Builds all of the NUClear unit tests." TRUE)
+
+if(BUILD_TESTS)
+  # Get catch2 using FetchContent
+  include(FetchContent)
+  FetchContent_Declare(
+    Catch2
+    GIT_SHALLOW TRUE
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG v3.6.0
+  )
+  FetchContent_MakeAvailable(Catch2)
+
+  enable_testing()
+
+  file(
+    GLOB
+    test_src
+    test.cpp
+    "api/*.cpp"
+    "dsl/*.cpp"
+    "dsl/emit/*.cpp"
+    "log/*.cpp"
+    "util/*.cpp"
+    "util/network/*.cpp"
+    "util/serialise/*.cpp"
+  )
+
+  # Create a test_util library that is used by all tests
+  file(GLOB test_util_src "test_util/*.cpp")
+  add_library(test_util STATIC ${test_util_src})
+  target_link_libraries(test_util PUBLIC NUClear::nuclear)
+  target_include_directories(
+    test_util SYSTEM PUBLIC ${CATCH_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include "${PROJECT_SOURCE_DIR}/src"
+  )
+
+  # Some tests must be executed as individual binaries
+  file(GLOB individual_tests "${CMAKE_CURRENT_SOURCE_DIR}/individual/*.cpp")
+
+  foreach(test_src ${individual_tests})
+    get_filename_component(test_name ${test_src} NAME_WE)
+
+    add_executable(${test_name} ${test_src})
+    target_link_libraries(${test_name} PRIVATE test_util)
+    target_link_libraries(${test_name} PRIVATE Catch2::Catch2WithMain)
+    set_target_properties(${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/individual")
+    target_include_directories(${test_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+    add_test(${test_name} test_nuclear)
+  endforeach(test_src)
+
+  add_executable(test_nuclear ${test_src})
+  target_include_directories(test_nuclear PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+  target_link_libraries(test_nuclear test_util)
+  target_link_libraries(test_nuclear Catch2::Catch2WithMain)
+  add_test(test_nuclear test_nuclear)
+
+  # Special test binary for testing NUClearNet
+  add_executable(test_network networktest.cpp)
+  target_link_libraries(test_network test_util)
+  target_include_directories(test_network PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+endif(BUILD_TESTS)
diff --git a/tests/api/ReactionHandle.cpp b/tests/api/ReactionHandle.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/api/ReactionStatistics.cpp b/tests/api/ReactionStatistics.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/api/ReactorArgs.cpp b/tests/api/ReactorArgs.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 // Anonymous namespace to keep everything file local

diff --git a/tests/dsl/Always.cpp b/tests/dsl/Always.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/ArgumentFission.cpp b/tests/dsl/ArgumentFission.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 #include <utility>
 

diff --git a/tests/dsl/BlockNoData.cpp b/tests/dsl/BlockNoData.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/Buffer.cpp b/tests/dsl/Buffer.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/CommandLineArguments.cpp b/tests/dsl/CommandLineArguments.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 #include <sstream>
 

diff --git a/tests/dsl/CustomGet.cpp b/tests/dsl/CustomGet.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/DSLOrdering.cpp b/tests/dsl/DSLOrdering.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/DSLProxy.cpp b/tests/dsl/DSLProxy.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/Every.cpp b/tests/dsl/Every.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 #include <numeric>
 

diff --git a/tests/dsl/FlagMessage.cpp b/tests/dsl/FlagMessage.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 #include "test_util/TestBase.hpp"

diff --git a/tests/dsl/FusionInOrder.cpp b/tests/dsl/FusionInOrder.cpp
@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nuclear>
 
 namespace {