enhancement: enable common libraries UT

wazuh · Feb 14, 2025 · 32bb6d4 · 32bb6d4
1 parent 16def19
commit 32bb6d4
Show file tree

Hide file tree

Showing 60 changed files with 382 additions and 1,182 deletions.
diff --git a/src/common/byteArrayHelper/CMakeLists.txt b/src/common/byteArrayHelper/CMakeLists.txt
@@ -1,5 +1,17 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+project(byte_array_helper)
+
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
+
+add_library(byte_array_helper INTERFACE)
+
+target_include_directories(byte_array_helper INTERFACE include)
+
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/byteArrayHelper/tests/CMakeLists.txt b/src/common/byteArrayHelper/tests/CMakeLists.txt
@@ -1,84 +1,18 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(utils_unit_test)
-
-file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
+find_package(GTest CONFIG REQUIRED)
 
 file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
     "byteArrayHelper_test.cpp"
     "main.cpp"
 )
 
-file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
-
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
-      ${UTIL_CXX_UNITTEST_COMMON_SRC}
-      ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
-      ${UTIL_CXX_UNITTEST_CPP17_SRC}
-    )
-    add_definitions(-DWIN32=1
-                    -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
-        -static-libgcc
-        ws2_32
-        crypt32
-    )
-else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
-        ${UTIL_CXX_UNITTEST_COMMON_SRC}
-        ${UTIL_CXX_UNITTEST_CPP17_SRC}
-      )
-    else()
-      add_executable(utils_unit_test
-        ${UTIL_CXX_UNITTEST_COMMON_SRC}
-        ${UTIL_CXX_UNITTEST_LINUX_SRC}
-        ${UTIL_CXX_UNITTEST_CPP17_SRC}
-      )
-    endif(APPLE)
+add_executable(byte_array_helper_tests
+    ${UTIL_CXX_UNITTEST_COMMON_SRC}
+)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
-    )
-endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+target_include_directories(byte_array_helper_tests PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
+)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+target_link_libraries(byte_array_helper_tests PRIVATE byte_array_helper GTest::gtest)
 
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME byteArrayHelperTests COMMAND byte_array_helper_tests)
diff --git a/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp b/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp
@@ -16,16 +16,16 @@ void ByteArrayHelperTest::SetUp() {};
 
 void ByteArrayHelperTest::TearDown() {};
 
-constexpr uint8_t bufferBE[] = {0x12, 0x34, 0x56, 0x78};
-constexpr uint8_t bufferLE[] = {0x78, 0x56, 0x34, 0x12};
-constexpr int32_t result {305419896};
+constexpr uint8_t BUFFER_BE[] = {0x12, 0x34, 0x56, 0x78};
+constexpr uint8_t BUFFER_LE[] = {0x78, 0x56, 0x34, 0x12};
+constexpr int32_t RESULT {305419896};
 
 TEST_F(ByteArrayHelperTest, toInt32BE)
 {
-    EXPECT_EQ(result, Utils::toInt32BE(bufferBE));
+    EXPECT_EQ(RESULT, Utils::toInt32BE(BUFFER_BE));
 }
 
 TEST_F(ByteArrayHelperTest, toInt32LE)
 {
-    EXPECT_EQ(result, Utils::toInt32LE(bufferLE));
+    EXPECT_EQ(RESULT, Utils::toInt32LE(BUFFER_LE));
 }
diff --git a/src/common/cmdHelper/CMakeLists.txt b/src/common/cmdHelper/CMakeLists.txt
@@ -1,5 +1,17 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+project(cmd_helper)
+
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
+
+add_library(cmd_helper INTERFACE)
+
+target_include_directories(cmd_helper INTERFACE include)
+
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/cmdHelper/tests/CMakeLists.txt b/src/common/cmdHelper/tests/CMakeLists.txt
@@ -1,84 +1,18 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(utils_unit_test)
-
-file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
+find_package(GTest CONFIG REQUIRED)
 
 file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
     "cmdHelper_test.cpp"
     "main.cpp"
 )
 
-file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
-
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
-      ${UTIL_CXX_UNITTEST_COMMON_SRC}
-      ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
-      ${UTIL_CXX_UNITTEST_CPP17_SRC}
-    )
-    add_definitions(-DWIN32=1
-                    -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
-        -static-libgcc
-        ws2_32
-        crypt32
-    )
-else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
-        ${UTIL_CXX_UNITTEST_COMMON_SRC}
-        ${UTIL_CXX_UNITTEST_CPP17_SRC}
-      )
-    else()
-      add_executable(utils_unit_test
-        ${UTIL_CXX_UNITTEST_COMMON_SRC}
-        ${UTIL_CXX_UNITTEST_LINUX_SRC}
-        ${UTIL_CXX_UNITTEST_CPP17_SRC}
-      )
-    endif(APPLE)
+add_executable(cmd_helper_tests
+    ${UTIL_CXX_UNITTEST_COMMON_SRC}
+)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
-    )
-endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+target_include_directories(cmd_helper_tests PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
+)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+target_link_libraries(cmd_helper_tests PRIVATE cmd_helper GTest::gtest)
 
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME cmdHelperTests COMMAND cmd_helper_tests)
diff --git a/src/common/data_provider/CMakeLists.txt b/src/common/data_provider/CMakeLists.txt
@@ -2,12 +2,13 @@ cmake_minimum_required(VERSION 3.22)
 
 project(sysinfo)
 
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
+
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
-enable_testing()
-
 get_filename_component(SRC_FOLDER     ${CMAKE_CURRENT_SOURCE_DIR}/../../ ABSOLUTE)
 
 if(COVERITY)
@@ -207,17 +208,14 @@ target_link_libraries(sysinfo PUBLIC
 
 if(BUILD_TESTS)
   if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      target_link_libraries(sysinfo PRIVATE -fprofile-arcs)
-    else()
-      target_link_libraries(sysinfo PRIVATE gcov)
-    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
+    enable_testing()
     add_subdirectory(tests)
   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-else()
+endif(BUILD_TESTS)
+
+if(NOT DEFINED COVERITY AND NOT DEFINED BUILD_TESTS)
   if(FSANITIZE)
       target_link_libraries(sysinfo PRIVATE gcov)
   endif(FSANITIZE)
   add_subdirectory(testtool)
-endif(BUILD_TESTS)
+endif(NOT DEFINED COVERITY AND NOT DEFINED BUILD_TESTS)
diff --git a/src/common/data_provider/tests/CMakeLists.txt b/src/common/data_provider/tests/CMakeLists.txt
@@ -23,11 +23,5 @@ if(HAS_FILESYSTEM OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
   add_subdirectory(sysInfoPackages)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs ")
-else()
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -lgcov ")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
 add_subdirectory(sysInfo)
 add_subdirectory(sysInfoPorts)
diff --git a/src/common/data_provider/tests/sysInfo/CMakeLists.txt b/src/common/data_provider/tests/sysInfo/CMakeLists.txt
@@ -24,7 +24,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         unofficial::sqlite3::sqlite3
         cjson
         utils
-        -static-libgcc
     )
 else()
     target_link_libraries(sysinfo_unit_test PRIVATE

diff --git a/src/common/data_provider/tests/sysInfoNetworkWindows/CMakeLists.txt b/src/common/data_provider/tests/sysInfoNetworkWindows/CMakeLists.txt
@@ -26,7 +26,6 @@ target_link_libraries(sysInfoNetworkWindows_unit_test
     pthread
     sqlite3
     cjson
-    -static-libgcc
 )
 
 add_test(NAME sysInfoNetworkWindows_unit_test

diff --git a/src/common/data_provider/tests/sysInfoWin/CMakeLists.txt b/src/common/data_provider/tests/sysInfoWin/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(sysInfoWindows_unit_test
     pthread
     sqlite3
     cjson
-    -static-libgcc
 )
 
 add_test(NAME sysInfoWindows_unit_test

diff --git a/src/common/dbsync/CMakeLists.txt b/src/common/dbsync/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.22)
 
 project(dbsync)
 
-enable_testing()
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
@@ -16,7 +17,7 @@ if(COVERITY)
 endif(COVERITY)
 
 if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wshadow -Wnon-virtual-dtor -Woverloaded-virtual -Wunused -Wcast-align -Wformat=2 -std=c++14 -pthread")
+  set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wshadow -Wnon-virtual-dtor -Woverloaded-virtual -Wunused -Wcast-align -Wformat=2")
   set(CMAKE_CXX_FLAGS_DEBUG "-g")
   if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
@@ -28,7 +29,7 @@ if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS_DEBUG "-g -fsanitize=address,leak,undefined")
   endif(FSANITIZE)
 else()
-  set(CMAKE_CXX_FLAGS "/W4 /permissive- /std:c++14 /MT /EHsc")
+  set(CMAKE_CXX_FLAGS "/W4 /permissive- /MT /EHsc")
 endif()
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -71,12 +72,7 @@ target_link_libraries(dbsync PUBLIC utils nlohmann_json::nlohmann_json cjson uno
 
 if(BUILD_TESTS)
   if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      target_link_libraries(dbsync PRIVATE -fprofile-arcs)
-    else()
-      target_link_libraries(dbsync PRIVATE gcov)
-    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
+    enable_testing()
     add_subdirectory(tests)
     add_subdirectory(integrationTests)
   endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")

diff --git a/src/common/dbsync/example/CMakeLists.txt b/src/common/dbsync/example/CMakeLists.txt
@@ -21,7 +21,6 @@ add_executable(dbsync_example
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_link_libraries(dbsync_example
         dbsync
-        -static-libgcc
     )
 else()
     target_link_libraries(dbsync_example

diff --git a/src/common/dbsync/integrationTests/CMakeLists.txt b/src/common/dbsync/integrationTests/CMakeLists.txt
@@ -6,10 +6,4 @@ include_directories(${CMAKE_SOURCE_DIR}/include/)
 
 find_package(GTest CONFIG REQUIRED)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs ")
-else()
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -lgcov ")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
 add_subdirectory(fim)
diff --git a/src/common/dbsync/integrationTests/fim/CMakeLists.txt b/src/common/dbsync/integrationTests/fim/CMakeLists.txt
@@ -29,7 +29,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         pthread
         utils
         pal
-        -static-libgcc
     )
 else()
     target_link_libraries(fim_integration_test
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") @@
             unofficial::sqlite3::sqlite3
             cjson
             utils
-            -static-libgcc
         )
     else()
         target_link_libraries(sysinfo_unit_test PRIVATE
@@ Expand Down @@