refactor: test setup and improve test isolation

.github/workflows/analysis-reviewdog-cppcheck.yml

@@ -5,9 +5,11 @@ on:
   pull_request:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
 
 jobs:
   cppcheck:

.github/workflows/build-docker.yml

@@ -7,10 +7,12 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
     branches:
       - main
 

.github/workflows/build-macos.yml

@@ -7,10 +7,12 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
     branches:
       - main
 

.github/workflows/build-ubuntu.yml

@@ -7,10 +7,12 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
     branches:
       - main
 

.github/workflows/build-windows-cmake.yml

@@ -6,10 +6,12 @@
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
     branches:
       - main
 env:
@@ -57,7 +59,7 @@
 
       - name: Restore artifacts and install vcpkg
         id: vcpkg-step
         run: |
           $json=Get-Content vcpkg.json -Raw | ConvertFrom-Json
           $vcpkgCommitId=$json.'builtin-baseline'
           Write-Host "vcpkg commit ID: $vcpkgCommitId"

.github/workflows/build-windows-solution.yml

@@ -7,10 +7,12 @@
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
     branches:
       - main
 
@@ -52,7 +54,7 @@
         uses: actions/checkout@main
 
       - name: Install vcpkg
         run: |
           $vcpkgJson = Get-Content .\vcpkg.json -Raw | ConvertFrom-Json
           $vcpkgCommitId = $vcpkgJson.'builtin-baseline'.Trim()
           Write-Host "vcpkg commit ID: $vcpkgCommitId"

.github/workflows/clang-lint.yml

@@ -4,10 +4,12 @@
   pull_request:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
   merge_group:
   push:
     paths:
       - "src/**"
+      - "tests/**/*.cpp"
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
@@ -29,7 +31,7 @@
 
       - name: Actions checkout
         if: ${{ github.ref != 'refs/heads/main' }}
         uses: actions/checkout@v3
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
@@ -39,7 +41,7 @@
         if: ${{ github.ref != 'refs/heads/main' }}
         uses: DoozyX/[email protected]
         with:
-          source: "src"
+          source: "src tests"
           exclude: "src/protobuf"
           extensions: "cpp,hpp,h"
           clangFormatVersion: 17

CMakeLists.txt

@@ -106,5 +106,9 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests
 add_subdirectory(src)
 
 if(BUILD_TESTS OR PACKAGE_TESTS)
+    log_option_enabled("tests")
     add_subdirectory(tests)
+    add_compile_definitions(BUILD_TESTS)
+else()
+    log_option_disabled("tests")
 endif()

tests/CMakeLists.txt

@@ -5,26 +5,33 @@ enable_testing()
 function(setup_test TARGET_NAME DIR)
     add_executable(${TARGET_NAME} main.cpp)
 
-    target_compile_definitions(${TARGET_NAME} PUBLIC -DDEBUG_LOG)
+    target_compile_definitions(${TARGET_NAME} PUBLIC -DDEBUG_LOG -DBUILD_TESTS)
     target_link_libraries(${TARGET_NAME}  PRIVATE Boost::ut ${PROJECT_NAME}_lib)
     target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/tests/fixture PRIVATE ${CMAKE_SOURCE_DIR}/tests/${DIR})
 
-    if(SPEED_UP_BUILD_UNITY AND (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release"))
-        set_target_properties(${TARGET_NAME} PROPERTIES UNITY_BUILD ON)
-        log_option_enabled("Build unity for speed up compilation for target ${TARGET_NAME}")
-    else()
-        log_option_disabled("Build unity")
-    endif()
+    setup_target(${TARGET_NAME})
+
+    set_target_properties(${TARGET_NAME} PROPERTIES
+        UNITY_BUILD OFF
+        INTERPROCEDURAL_OPTIMIZATION OFF
+    )
+    log_option_disabled("Build unity")
 
     configure_linking(${TARGET_NAME})
 
-    add_test(NAME ${DIR} COMMAND ${TARGET_NAME})
+    add_test(NAME ${DIR} COMMAND ${TARGET_NAME} --reporter console --success)
+    set_tests_properties(${DIR} PROPERTIES
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/${DIR}
+        ENVIRONMENT "CATCH_CONFIG_CONSOLE_WIDTH=160"
+        TIMEOUT 120
+    )
+
     if(RUN_TESTS_AFTER_BUILD)
         add_custom_command(
                 TARGET ${TARGET_NAME} POST_BUILD
-                COMMAND ${CMAKE_CTEST_COMMAND} --verbose
+                COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> --output-on-failure --tests-regex "^${DIR}$"
                 COMMENT "Running ctest ${DIR} after building ${TARGET_NAME}"
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests/${DIR}
+                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )
     endif (RUN_TESTS_AFTER_BUILD)
 endfunction()

tests/fixture/account/in_memory_account_repository.hpp

@@ -30,6 +30,9 @@ namespace tests {
 		}
 
 		void addAccount(const std::string &descriptor, const AccountInfo &acc) {
+			phmap::erase_if(accounts, [&](const auto &entry) {
+				return entry.second.id == acc.id;
+			});
 			accounts[descriptor] = acc;
 		}
 

tests/integration/main.cpp

@@ -56,9 +56,9 @@ int main() {
 		std::string database = "otservbr-global";
 		uint32_t port = 3306;
 		std::string sock;
-    };
-	Database db{};
-	DbConfig dbConfig{};
+	};
+	Database db {};
+	DbConfig dbConfig {};
 
 	db.connect(
 		&dbConfig.host,
@@ -70,8 +70,8 @@ int main() {
 	);
 
 	test("AccountRepositoryDB::loadByID") = databaseTest(db, [&db] {
-		InMemoryLogger logger{};
-		AccountRepositoryDB accRepo{};
+		InMemoryLogger logger {};
+		AccountRepositoryDB accRepo {};
 		createAccount(db);
 
 		auto acc = std::make_unique<AccountInfo>();
@@ -104,8 +104,8 @@ int main() {
 	});
 
 	test("AccountRepositoryDB load sets premium day purchased = remaining days, if needed") = databaseTest(db, [&db] {
-		InMemoryLogger logger{};
-		AccountRepositoryDB accRepo{};
+		InMemoryLogger logger {};
+		AccountRepositoryDB accRepo {};
 
 		auto acc = std::make_unique<AccountInfo>();
 		accRepo.loadByID(1, acc);