Refs 13326: Fix Fast RTPS tests

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
eProsima · Dec 23, 2021 · 2f0a2e7 · 2f0a2e7
1 parent 2507b7b
commit 2f0a2e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp b/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp
@@ -67,14 +67,14 @@ void ReqRepHelloWorldReplier::init()
 
     //Create subscriber
     sattr.topic.topicKind = NO_KEY;
-    sattr.topic.topicDataType = "HelloWorldType";
+    sattr.topic.topicDataType = type_.getName();
     configSubscriber("Request");
     request_subscriber_ = Domain::createSubscriber(participant_, sattr, &request_listener_);
     ASSERT_NE(request_subscriber_, nullptr);
 
     //Create publisher
     puattr.topic.topicKind = NO_KEY;
-    puattr.topic.topicDataType = "HelloWorldType";
+    puattr.topic.topicDataType = type_.getName();
     puattr.topic.topicName = "HelloWorldTopicReply";
     configPublisher("Reply");
     reply_publisher_ = Domain::createPublisher(participant_, puattr, &reply_listener_);

diff --git a/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldRequester.cpp b/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldRequester.cpp
@@ -69,14 +69,14 @@ void ReqRepHelloWorldRequester::init()
 
     //Create subscriber
     sattr.topic.topicKind = NO_KEY;
-    sattr.topic.topicDataType = "HelloWorldType";
+    sattr.topic.topicDataType = type_.getName();
     configSubscriber("Reply");
     reply_subscriber_ = Domain::createSubscriber(participant_, sattr, &reply_listener_);
     ASSERT_NE(reply_subscriber_, nullptr);
 
     //Create publisher
     puattr.topic.topicKind = NO_KEY;
-    puattr.topic.topicDataType = "HelloWorldType";
+    puattr.topic.topicDataType = type_.getName();
     configPublisher("Request");
     request_publisher_ = Domain::createPublisher(participant_, puattr, &request_listener_);
     ASSERT_NE(request_publisher_, nullptr);
@@ -97,14 +97,14 @@ void ReqRepHelloWorldRequester::init_with_latency(
 
     //Create subscriber
     sattr.topic.topicKind = NO_KEY;
-    sattr.topic.topicDataType = "HelloWorldType";
+    sattr.topic.topicDataType = type_.getName();
     sattr.qos.m_latencyBudget.duration = latency_budget_duration_sub;
     reply_subscriber_ = Domain::createSubscriber(participant_, sattr, &reply_listener_);
     ASSERT_NE(reply_subscriber_, nullptr);
 
     //Create publisher
     puattr.topic.topicKind = NO_KEY;
-    puattr.topic.topicDataType = "HelloWorldType";
+    puattr.topic.topicDataType = type_.getName();
     puattr.qos.m_latencyBudget.duration = latency_budget_duration_pub;
     request_publisher_ = Domain::createPublisher(participant_, puattr, &request_listener_);
     ASSERT_NE(request_publisher_, nullptr);

diff --git a/test/blackbox/common/BlackboxTestsDiscovery.cpp b/test/blackbox/common/BlackboxTestsDiscovery.cpp
@@ -567,7 +567,7 @@ TEST(Discovery, PubXmlLoadedPartition)
     <topic>
       <name>)" + writer.topic_name() +
             R"(</name>
-      <dataType>HelloWorldPubSubType</dataType>
+      <dataType>HelloWorld</dataType>
     </topic>
     <qos>
       <partition>