Only insert the used topic into builtin topics

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
eProsima · Sep 2, 2024 · e2bf4b3 · e2bf4b3
1 parent 46fc0d2
commit e2bf4b3
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
@@ -51,7 +51,8 @@ constexpr const uint32_t DEFAULT_MESSAGE_SIZE = 1; // x50 bytes
  */
 DdsRouterConfiguration dds_test_simple_configuration(
         bool disable_dynamic_discovery = false,
-        bool transient_local_readers = false)
+        bool transient_local_readers = false,
+        bool keyed = false)
 {
     DdsRouterConfiguration conf;
 
@@ -80,13 +81,22 @@ DdsRouterConfiguration dds_test_simple_configuration(
         topic.type_name = "HelloWorld";
         topic.topic_qos = qos;
 
-        core::types::DdsTopic topic_keyed(topic);
-        topic_keyed.type_name = "HelloWorldKeyed";
-        topic_keyed.topic_qos.keyed = true;
+        // DDS Participants cannot have two topics with the same name.
+        // Since this test does not require two distinct topics, we can simply avoid inserting
+        // the other topic if it isn't needed.
+        if (!keyed)
+        {
+            conf.ddspipe_configuration.builtin_topics.insert(utils::Heritable<core::types::DdsTopic>::make_heritable(topic));
+        }
+        else
+        {
+            core::types::DdsTopic topic_keyed(topic);
+            topic_keyed.type_name = "HelloWorldKeyed";
+            topic_keyed.topic_qos.keyed = true;
 
-        conf.ddspipe_configuration.builtin_topics.insert(utils::Heritable<core::types::DdsTopic>::make_heritable(topic));
-        conf.ddspipe_configuration.builtin_topics.insert(utils::Heritable<core::types::DdsTopic>::make_heritable(
-                    topic_keyed));
+            conf.ddspipe_configuration.builtin_topics.insert(utils::Heritable<core::types::DdsTopic>::make_heritable(
+                        topic_keyed));
+        }
 
         conf.ddspipe_configuration.discovery_trigger = core::DiscoveryTrigger::NONE;
     }
@@ -228,7 +238,7 @@ TEST(DDSTestLocal, end_to_end_local_communication)
 TEST(DDSTestLocal, end_to_end_local_communication_keyed)
 {
     test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
-        test::dds_test_simple_configuration());
+        test::dds_test_simple_configuration(false, false, true));
 }
 
 /**
@@ -245,7 +255,7 @@ TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery)
 TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery_keyed)
 {
     test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
-        test::dds_test_simple_configuration(true));
+        test::dds_test_simple_configuration(true,false,true));
 }
 
 /**