feat: Setup unit tests with boost::ut

.github/workflows/build-ubuntu.yml

@@ -74,10 +74,16 @@ jobs:
         with:
           configurePreset: ${{ matrix.buildtype }}
           buildPreset: ${{ matrix.buildtype }}
+          configurePresetAdditionalArgs: "['-DBUILD_TESTS=ON']"
 
       - name: Create and Upload Artifact
         uses: actions/upload-artifact@main
         with:
           name: canary-${{ matrix.os }}-${{ matrix.buildtype }}-${{ github.sha }}
           path: |
             ${{ github.workspace }}/build/${{ matrix.buildtype }}/bin/
+
+      - name: Unit tests
+        run: |
+          chmod +x ${{ github.workspace }}/build/${{ matrix.buildtype }}/tests/canary_ut
+          ${{ github.workspace }}/build/${{ matrix.buildtype }}/tests/canary_ut

CMakeLists.txt

@@ -42,7 +42,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 include(MessageColors)
 include(LoggingHelper)
 
-
 # *****************************************************************************
 # Options
 # *****************************************************************************
@@ -95,9 +94,14 @@ else()
   log_option_disabled("ipo")
 endif()
 
+option(BUILD_TESTS "Build tests" OFF) # By default, tests will not be built
 
 # *****************************************************************************
 # Add project
 # *****************************************************************************
 add_subdirectory(src/protobuf)
 add_subdirectory(src)
+
+if(BUILD_TESTS)
+    add_subdirectory(tests)
+endif()

src/otserv.cpp

@@ -10,8 +10,6 @@
 #include "pch.hpp"
 #include "canary_server.hpp"
 
-#ifndef UNIT_TESTING
 int main() {
 	return inject<CanaryServer>().run();
-}
-#endif
+}

tests/CMakeLists.txt

@@ -1,24 +1,8 @@
-find_package(Catch2 REQUIRED)
-# include_directories(BEFORE ${PROJECT_SOURCE_DIR})
-include_directories(SYSTEM ${MYSQL_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
-                    ${Boost_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR}
-                    ${CRYPTOPP_INCLUDE_DIR})
+find_package(ut CONFIG REQUIRED)
 
-project(canary_unittest)
+set(CMAKE_CXX_FLAGS "-pipe -O0 -g -std=c++11 -lstdc++ -lpthread -ldl")
 
-set(CMAKE_CXX_FLAGS     "-pipe -O0 -g -Wno-everything -std=c++11 -lstdc++ -lpthread -ldl")
+add_executable(canary_ut main.cpp test1.cpp test2.cpp)
 
-add_executable(canary_unittest
-							main.cpp
-							account_test.cpp)
-
-target_compile_definitions(canary_unittest PUBLIC -DUNIT_TESTING -DDEBUG_LOG)
-
-target_link_libraries(canary_unittest Catch2::Catch2 canary_lib ${MYSQL_CLIENT_LIBS} ${LUA_LIBRARIES}
-						${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY}
-						${PUGIXML_LIBRARIES} ${CRYPTOPP_LIBRARIES}
-						${CMAKE_THREAD_LIBS_INIT})
-
-include(CTest)
-include(Catch)
-catch_discover_tests(canary_unittest)
+target_compile_definitions(canary_ut PUBLIC -DDEBUG_LOG)
+target_link_libraries(canary_ut PRIVATE Boost::ut ${PROJECT_NAME}_lib)