Rework tests to be compilable with installed openDAQ

external/CMakeLists.txt

@@ -1,5 +1,10 @@
 set(CMAKE_FOLDER external)
 list(APPEND CMAKE_MESSAGE_CONTEXT external)
 
+if (${REPO_OPTION_PREFIX}_ENABLE_TESTS AND NOT TARGET gtest)
+    set(BUILD_GMOCK ON)
+    opendaq_module_setup_gtest(1.12.1)
+endif()
+
 add_subdirectory(PcapPlusPlus)
 add_subdirectory(AsamCmpLib)

modules/asam_cmp_capture_module/tests/CMakeLists.txt

@@ -27,8 +27,9 @@ endif()
 add_executable(${TEST_APP} ${TEST_SOURCES} ${TEST_HEADERS}
 )
 
-target_link_libraries(${TEST_APP} PRIVATE daq::opendaq
-                                          daq::test_utils
+target_link_libraries(${TEST_APP} PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq_test_utils
+                                          gtest
+                                          gmock
                                           asam_cmp_capture_module_lib
 )
 
@@ -38,6 +39,6 @@ add_test(NAME ${TEST_APP}
 
 set_target_properties(${TEST_APP} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:${TEST_APP}>)
 
-if (OPENDAQ_ENABLE_COVERAGE)
+if (COMMAND setup_target_for_coverage AND OPENDAQ_ENABLE_COVERAGE)
     setup_target_for_coverage(${TEST_APP}coverage ${TEST_APP} ${TEST_APP}coverage)
 endif()

modules/asam_cmp_capture_module/tests/test_app.cpp

@@ -1,27 +1,20 @@
+#include <opendaq/module_manager_factory.h>
+
 #include <testutils/testutils.h>
 #include <testutils/daq_memcheck_listener.h>
-#include <coreobjects/util.h>
-#include <opendaq/module_manager_init.h>
-#include <asam_cmp_capture_module/common.h>
-#include <asam_cmp_capture_module/module_dll.h>
-#include <opendaq/context_factory.h>
-#include <coretypes/stringobject_factory.h>
-#include <opendaq/module_ptr.h>
-
 
 int main(int argc, char** args)
 {
     using namespace daq;
 
-    daq::daqInitializeCoreObjectsTesting();
-    daqInitModuleManagerLibrary();
+    {
+        daq::ModuleManager(".");
+    }
 
     testing::InitGoogleTest(&argc, args);
 
     testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners();
     listeners.Append(new DaqMemCheckListener());
 
-    auto res = RUN_ALL_TESTS();
-
-    return  res;
+    return RUN_ALL_TESTS();
 }

modules/asam_cmp_data_sink/tests/CMakeLists.txt

@@ -18,7 +18,9 @@ endif()
 add_executable(${TEST_APP} ${TEST_SOURCES}
 )
 
-target_link_libraries(${TEST_APP} PRIVATE daq::test_utils
+target_link_libraries(${TEST_APP} PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq_test_utils
+                                          gtest
+                                          gmock
                                           asam_cmp_data_sink_lib
 )
 
@@ -28,6 +30,6 @@ add_test(NAME ${TEST_APP}
 
 set_target_properties(${TEST_APP} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:${TEST_APP}>)
 
-if (OPENDAQ_ENABLE_COVERAGE)
+if (COMMAND setup_target_for_coverage AND OPENDAQ_ENABLE_COVERAGE)
     setup_target_for_coverage(${TEST_APP}coverage ${TEST_APP} ${TEST_APP}coverage)
 endif()

modules/asam_cmp_data_sink/tests/test_app.cpp

@@ -1,19 +1,18 @@
+#include <opendaq/module_manager_factory.h>
+
 #include <EthLayer.h>
 #include <Packet.h>
-#include <coreobjects/util.h>
-#include <opendaq/context_factory.h>
-#include <opendaq/module_manager_init.h>
-#include <testutils/daq_memcheck_listener.h>
-#include <testutils/testutils.h>
 
-#include <asam_cmp_data_sink/module_dll.h>
+#include <testutils/testutils.h>
+#include <testutils/daq_memcheck_listener.h>
 
 int main(int argc, char** args)
 {
     using namespace daq;
 
-    daqInitializeCoreObjectsTesting();
-    daqInitModuleManagerLibrary();
+    {
+        daq::ModuleManager(".");
+    }
 
     testing::InitGoogleTest(&argc, args);
 
@@ -25,7 +24,5 @@ int main(int argc, char** args)
     testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners();
     listeners.Append(new DaqMemCheckListener());
 
-    auto res = RUN_ALL_TESTS();
-
-    return res;
+    return RUN_ALL_TESTS();
 }

shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt

@@ -42,7 +42,6 @@ endif()
 target_link_libraries(${PROJECT_NAME} PUBLIC daq::opendaq
                                           Pcap++
                                           asam_cmp
-                                          daq::test_utils
 )
 
 target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>

shared/libraries/asam_cmp_common_lib/tests/CMakeLists.txt

@@ -7,7 +7,9 @@ set(TEST_SOURCES test_app.cpp
 add_executable(${TEST_APP} ${TEST_SOURCES}
 )
 
-target_link_libraries(${TEST_APP} PRIVATE daq::test_utils
+target_link_libraries(${TEST_APP} PRIVATE ${OPENDAQ_SDK_TARGET_NAMESPACE}::opendaq_test_utils
+                                          gtest
+                                          gmock
                                           asam_cmp_data_sink
 )
 
@@ -17,6 +19,6 @@ add_test(NAME ${TEST_APP}
 
 set_target_properties(${TEST_APP} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:${TEST_APP}>)
 
-if (OPENDAQ_ENABLE_COVERAGE)
+if (COMMAND setup_target_for_coverage AND OPENDAQ_ENABLE_COVERAGE)
     setup_target_for_coverage(${TEST_APP}coverage ${TEST_APP} ${TEST_APP}coverage)
 endif()

shared/libraries/asam_cmp_common_lib/tests/test_app.cpp

@@ -1,21 +1,20 @@
+#include <opendaq/module_manager_factory.h>
+
 #include <testutils/testutils.h>
 #include <testutils/daq_memcheck_listener.h>
-#include <coreobjects/util.h>
-#include <opendaq/module_manager_init.h>
 
 int main(int argc, char** args)
 {
     using namespace daq;
 
-    daqInitializeCoreObjectsTesting();
-    daqInitModuleManagerLibrary();
+    {
+        daq::ModuleManager(".");
+    }
 
     testing::InitGoogleTest(&argc, args);
 
     testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners();
     listeners.Append(new DaqMemCheckListener());
 
-    auto res = RUN_ALL_TESTS();
-
-    return  res;
+    return RUN_ALL_TESTS();
 }