Fix StatisticsQosTests & RTPSStatisticsTests fixture linking (#3005)

* Refs #15897: Fix StatisticsDataWriterQosTest Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #15897: Fix RTPSStatisticsTests fixture Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
eProsima · Oct 11, 2022 · 1f1ecac · 1f1ecac
1 parent 1578b72
commit 1f1ecac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/test/unittest/statistics/dds/StatisticsQosTests.cpp b/test/unittest/statistics/dds/StatisticsQosTests.cpp
@@ -127,7 +127,7 @@ class StatisticsFromXMLProfileTests : public ::testing::Test
  * 3. Pull mode enabled
  * 4. Publication mode ASYNCHRONOUS with custom flow controller
  * 5. History kind KEEP LAST
- * 6. History depth 1
+ * 6. History depth 10
  */
 TEST(StatisticsQosTests, StatisticsDataWriterQosTest)
 {
@@ -141,7 +141,7 @@ TEST(StatisticsQosTests, StatisticsDataWriterQosTest)
     EXPECT_EQ(STATISTICS_DATAWRITER_QOS.publish_mode().flow_controller_name,
             eprosima::fastdds::rtps::FASTDDS_STATISTICS_FLOW_CONTROLLER_DEFAULT);
     EXPECT_EQ(STATISTICS_DATAWRITER_QOS.history().kind, eprosima::fastdds::dds::KEEP_LAST_HISTORY_QOS);
-    EXPECT_EQ(STATISTICS_DATAWRITER_QOS.history().depth, 1);
+    EXPECT_EQ(STATISTICS_DATAWRITER_QOS.history().depth, 10);
 }
 
 /*

diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
@@ -13,6 +13,11 @@
 // limitations under the License.
 
 #include <map>
+#if defined(_WIN32)
+#include <process.h>
+#else
+#include <unistd.h>
+#endif // if defined(_WIN32)
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -231,7 +236,13 @@ class RTPSStatisticsTestsImpl
         p_attr.userTransports.push_back(descriptor);
 
         // random domain_id
-        uint32_t domain_id = SystemInfo::instance().process_id() % 100;
+#if defined(__cplusplus_winrt)
+        uint32_t domain_id = static_cast<uint32_t>(GetCurrentProcessId()) % 100;
+#elif defined(_WIN32)
+        uint32_t domain_id = static_cast<uint32_t>(_getpid()) % 100;
+#else
+        uint32_t domain_id = static_cast<uint32_t>(getpid()) % 100;
+#endif // if defined(__cplusplus_winrt)
 
         participant_ = RTPSDomain::createParticipant(
             domain_id, true, p_attr);