From 8585eb61965bd388e42fd7e3cf87839b9122a697 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Mon, 21 Oct 2024 16:37:46 +0200
Subject: [PATCH] Refs #21841: Update unittests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .../StatisticsBase/statistics/rtps/StatisticsBase.hpp  | 10 ++++++----
 .../statistics/rtps/monitor-service/MonitorService.hpp |  7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
index 5ff2fd97d81..e1bc1d83d31 100644
--- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
+++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
@@ -25,6 +25,8 @@
 #include <set>
 
 #include <fastdds/config.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <statistics/types/types.hpp>
 
@@ -35,25 +37,25 @@ namespace statistics {
 #ifdef FASTDDS_STATISTICS
 
 // auxiliary conversion functions
-detail::Locator_s to_statistics_type(
+inline detail::Locator_s to_statistics_type(
         fastdds::rtps::Locator_t locator)
 {
     return *reinterpret_cast<detail::Locator_s*>(&locator);
 }
 
-fastdds::rtps::Locator_t to_fastdds_type(
+inline fastdds::rtps::Locator_t to_fastdds_type(
         detail::Locator_s locator)
 {
     return *reinterpret_cast<fastdds::rtps::Locator_t*>(&locator);
 }
 
-detail::GUID_s to_statistics_type(
+inline detail::GUID_s to_statistics_type(
         fastdds::rtps::GUID_t guid)
 {
     return *reinterpret_cast<detail::GUID_s*>(&guid);
 }
 
-fastdds::rtps::GUID_t to_fastdds_type(
+inline fastdds::rtps::GUID_t to_fastdds_type(
         detail::GUID_s guid)
 {
     return *reinterpret_cast<fastdds::rtps::GUID_t*>(&guid);
diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
index 7c35c22dc88..96a6420f18d 100644
--- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
+++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
@@ -58,6 +58,8 @@ class MonitorService
 {
     static constexpr int MIN_TIME_BETWEEN_PUBS_MS = 500;
 
+    friend class MonitorServiceListener;
+
 public:
 
     using endpoint_creator_t = std::function<bool (fastdds::rtps::RTPSWriter**,
@@ -261,6 +263,11 @@ class MonitorService
     endpoint_registrator_t endpoint_registrator_;
 
     MonitorServiceStatusDataPubSubType type_;
+
+    std::map<fastdds::rtps::GUID_t, ExtendedIncompatibleQoSStatusSeq_s>
+        extended_incompatible_qos_collection_;
+
+    std::mutex extended_incompatible_qos_mtx_;
 };
 
 #endif // FASTDDS_STATISTICS