From 2b7b576badd200179e2052f357c53af0ec9b894a Mon Sep 17 00:00:00 2001
From: Lucia Echevarria <luciaechevarria@eprosima.com>
Date: Tue, 16 Jul 2024 08:29:42 +0200
Subject: [PATCH] Change DataWriter::write return value from bool to
 ReturnCode_t and fix tests

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
---
 .../ddsrouter_core/dds/local/DDSTestLocal.cpp | 10 ++++----
 .../dds/local/DDSTestLocalDisposeKey.cpp      | 12 ++++++----
 .../dds/types/test_participants.hpp           | 23 ++++++++++---------
 3 files changed, 25 insertions(+), 20 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
index 5bb094af9..8b0c876b2 100644
--- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
+++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
@@ -15,11 +15,11 @@
 #include <atomic>
 #include <thread>
 
-#include <cpp_utils/testing/gtest_aux.hpp>
-#include <gtest/gtest.h>
+#include <fastdds/dds/core/detail/DDSReturnCode.hpp>
 
-#include <cpp_utils/testing/LogChecker.hpp>
 #include <cpp_utils/Log.hpp>
+#include <cpp_utils/testing/gtest_aux.hpp>
+#include <cpp_utils/testing/LogChecker.hpp>
 
 #include <ddspipe_core/types/topic/filter/WildcardDdsFilterTopic.hpp>
 
@@ -27,6 +27,8 @@
 
 #include <test_participants.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace eprosima;
 using namespace eprosima::ddspipe;
 using namespace eprosima::ddsrouter::core;
@@ -163,7 +165,7 @@ void test_local_communication(
         for (samples_sent = 0; samples_sent < samples_to_receive; samples_sent++)
         {
             msg.index(samples_sent);
-            ASSERT_TRUE(publisher.publish(msg));
+            ASSERT_EQ(publisher.publish(msg), eprosima::fastdds::dds::RETCODE_OK);
 
             // If time is 0 do not wait
             if (time_between_samples > 0)
diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
index 5c22a3b47..761fbeb10 100644
--- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
+++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
@@ -15,11 +15,11 @@
 #include <atomic>
 #include <thread>
 
-#include <cpp_utils/testing/gtest_aux.hpp>
-#include <gtest/gtest.h>
+#include <fastdds/dds/core/detail/DDSReturnCode.hpp>
 
-#include <cpp_utils/testing/LogChecker.hpp>
 #include <cpp_utils/Log.hpp>
+#include <cpp_utils/testing/gtest_aux.hpp>
+#include <cpp_utils/testing/LogChecker.hpp>
 
 #include <ddspipe_core/types/topic/filter/WildcardDdsFilterTopic.hpp>
 
@@ -27,6 +27,8 @@
 
 #include <test_participants.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace eprosima;
 using namespace eprosima::ddspipe;
 using namespace eprosima::ddsrouter::core;
@@ -132,7 +134,7 @@ void test_local_communication_key_dispose(
     while (samples_received.load() < samples_to_receive)
     {
         msg.index(++samples_sent);
-        ASSERT_TRUE(publisher.publish(msg)) << samples_sent;
+        ASSERT_EQ(publisher.publish(msg), fastdds::dds::RETCODE_OK) << samples_sent;
 
         // If time is 0 do not wait
         if (time_between_samples > 0)
@@ -150,7 +152,7 @@ void test_local_communication_key_dispose(
     while (samples_received.load() < samples_to_receive)
     {
         msg.index(++samples_sent);
-        ASSERT_TRUE(publisher.publish(msg)) << samples_sent;
+        ASSERT_EQ(publisher.publish(msg), fastdds::dds::RETCODE_OK) << samples_sent;
 
         // If time is 0 do not wait
         if (time_between_samples > 0)
diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp
index 07ee49e57..e2d806b79 100644
--- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp
+++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp
@@ -18,17 +18,9 @@
 #include <iostream>
 #include <condition_variable>
 
-#include <gtest/gtest.h>
-
-#include <cpp_utils/testing/gtest_aux.hpp>
-#include <cpp_utils/Log.hpp>
-
-#include <ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp>
-
-#include <ddsrouter_core/core/DdsRouter.hpp>
-
 #include <fastdds/dds/common/InstanceHandle.hpp>
 #include <fastdds/dds/core/detail/DDSReturnCode.hpp>
+#include <fastdds/dds/core/detail/DDSReturnCode.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
@@ -45,9 +37,18 @@
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
+#include <cpp_utils/Log.hpp>
+
+#include <ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp>
+
+#include <ddsrouter_core/core/DdsRouter.hpp>
+
 #include "HelloWorld/HelloWorldPubSubTypes.hpp"
 #include "HelloWorldKeyed/HelloWorldKeyedPubSubTypes.hpp"
 
+#include <gtest/gtest.h>
+
 
 namespace test {
 
@@ -154,7 +155,7 @@ class TestPublisher
     }
 
     //! Publish a sample
-    bool publish(
+    eprosima::fastdds::dds::ReturnCode_t publish(
             MsgStruct msg)
     {
         hello_.index(msg.index());
@@ -238,7 +239,7 @@ class TestPublisher
 };
 
 template <>
-bool TestPublisher<HelloWorldKeyed>::publish(
+eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::publish(
         HelloWorldKeyed msg)
 {
     hello_.index(msg.index());