Refs #21096: Little fixes on existing unittests an BB tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Jun 3, 2024 · faad69b · faad69b
1 parent 7e83b72
commit faad69b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
@@ -102,14 +102,15 @@ class MonitorServiceParticipant
 
     void setup(
             std::string profiles_file,
-            std::string profile)
+            std::string profile,
+            uint32_t domain_id)
     {
         //! Load XML profiles
         eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->load_XML_profiles_file(profiles_file);
 
         eprosima::fastdds::dds::DomainParticipant* participant =
                 eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->
-                        create_participant_with_profile((uint32_t)GET_PID() % 230, profile);
+                        create_participant_with_profile(domain_id, profile);
 
         setup(participant);
     }
@@ -1205,11 +1206,11 @@ TEST(DDSMonitorServiceTest, monitor_service_property)
     MonitorServiceParticipant MSP;
 
     //! Procedure
-    MSP.setup(xml_file, participant_profile_names.first);
+    MSP.setup(xml_file, participant_profile_names.first, 0);
     ASSERT_EQ(eprosima::fastdds::dds::RETCODE_OK, MSP.disable_monitor_service());
 
     MSP.reset();
-    MSP.setup(xml_file, participant_profile_names.second);
+    MSP.setup(xml_file, participant_profile_names.second, 0);
 
     //! Assertions
     ASSERT_EQ(eprosima::fastdds::dds::RETCODE_OK, MSP.disable_monitor_service());
@@ -1350,8 +1351,8 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_connection_list)
     std::pair<std::string, std::string> participant_profiles =
     {"monitor_service_connections_list_participant_1", "monitor_service_connections_list_participant_2"};
 
-    MSP1.setup(xml_profile, participant_profiles.first);
-    MSP2.setup(xml_profile, participant_profiles.second);
+    MSP1.setup(xml_profile, participant_profiles.first, 0);
+    MSP2.setup(xml_profile, participant_profiles.second, 0);
 
     MSP1.enable_monitor_service();
     MSP2.enable_monitor_service();

diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt
@@ -98,6 +98,7 @@ set(DATAWRITERTESTS_SOURCE DataWriterTests.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
     ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp

diff --git a/test/unittest/statistics/dds/CMakeLists.txt b/test/unittest/statistics/dds/CMakeLists.txt
@@ -199,6 +199,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX)
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+        ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
@@ -374,6 +375,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX)
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+        ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
         ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp