Remote writers considered volatile by default (#6085) (#6088)

mergify[bot] · MiguelCompany · web-flow · commit a552a33e3b8c · 2025-10-09T20:14:12.000+02:00
* Remote writers considered volatile by default (#6085) * Refs #23778. Regression test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23778. Fix issue. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23778. Improved solution. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 0e7204f) # Conflicts: # src/cpp/rtps/builtin/data/WriterProxyData.cpp # test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp * Fix conflicts in WriterProxyData.cpp Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix conflicts in test Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -272,6 +272,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
 
         WriterProxyData out(max_unicast_locators, max_multicast_locators);
         EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));
+        EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);
     }
 
     // DATA(r)
@@ -324,6 +325,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
 
         ReaderProxyData out(max_unicast_locators, max_multicast_locators);
         EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));
+        EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);
     }
 }
 
@@ -2006,6 +2008,7 @@ TEST(BuiltinDataSerializationTests, interoperability_with_intercomdds)
 
         WriterProxyData out(max_unicast_locators, max_multicast_locators);
         EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, true, true, intercom_vendor_id)));
+        EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);
     }
 
     // DATA(r)
@@ -2073,6 +2076,7 @@ TEST(BuiltinDataSerializationTests, interoperability_with_intercomdds)
 
         ReaderProxyData out(max_unicast_locators, max_multicast_locators);
         EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, true, true, intercom_vendor_id)));
+        EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)`
`272`	`272`
`273`	`273`	`WriterProxyData out(max_unicast_locators, max_multicast_locators);`
`274`	`274`	`EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));`
	`275`	`+ EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);`
`275`	`276`	`}`
`276`	`277`
`277`	`278`	`// DATA(r)`
`@@ -324,6 +325,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)`
`324`	`325`
`325`	`326`	`ReaderProxyData out(max_unicast_locators, max_multicast_locators);`
`326`	`327`	`EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));`
	`328`	`+ EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);`
`327`	`329`	`}`
`328`	`330`	`}`
`329`	`331`
`@@ -2006,6 +2008,7 @@ TEST(BuiltinDataSerializationTests, interoperability_with_intercomdds)`
`2006`	`2008`
`2007`	`2009`	`WriterProxyData out(max_unicast_locators, max_multicast_locators);`
`2008`	`2010`	`EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, true, true, intercom_vendor_id)));`
	`2011`	`+ EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);`
`2009`	`2012`	`}`
`2010`	`2013`
`2011`	`2014`	`// DATA(r)`
`@@ -2073,6 +2076,7 @@ TEST(BuiltinDataSerializationTests, interoperability_with_intercomdds)`
`2073`	`2076`
`2074`	`2077`	`ReaderProxyData out(max_unicast_locators, max_multicast_locators);`
`2075`	`2078`	`EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, true, true, intercom_vendor_id)));`
	`2079`	`+ EXPECT_EQ(out.m_qos.m_durability.kind, eprosima::fastdds::dds::VOLATILE_DURABILITY_QOS);`
`2076`	`2080`	`}`
`2077`	`2081`	`}`
`2078`	`2082`