From 2f0a2e7469dcf57c2bb5b06025a17a7c0a23b6e7 Mon Sep 17 00:00:00 2001
From: Eduardo Ponz <eduardoponz@eprosima.com>
Date: Thu, 23 Dec 2021 10:48:04 +0100
Subject: [PATCH] Refs 13326: Fix Fast RTPS tests

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
---
 .../api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp   | 4 ++--
 .../api/fastrtps_deprecated/ReqRepHelloWorldRequester.cpp | 8 ++++----
 test/blackbox/common/BlackboxTestsDiscovery.cpp           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp b/test/blackbox/api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp
index ac925349379..b11efa3dee8 100644
--- 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
index 7d5854df9ee..5dd7bf8a0f4 100644
--- 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
index 3f1bd16f4ff..2b22c28c876 100644
--- 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>