Refs #20160: Fixed tests.

Signed-off-by: adriancampo <[email protected]>
eProsima · Apr 5, 2024 · 27a861e · 27a861e
1 parent 6d3bdd2
commit 27a861e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp b/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file connection_fwd.hpp
+ * @file connections_fwd.hpp
  *
  */
 

diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp
@@ -693,11 +693,18 @@ const TypeIdentifier TypeObjectRegistry::get_complementary_type_identifier(
     std::lock_guard<std::mutex> data_guard(type_object_registry_mutex_);
     for (const auto& it : local_type_identifiers_)
     {
-        if (it.second.type_identifier1() == type_id && TK_NONE != it.second.type_identifier2()._d())
+        if (it.second.type_identifier1() == type_id)
         {
-            return it.second.type_identifier2();
+            if (TK_NONE != it.second.type_identifier2()._d())
+            {
+                return it.second.type_identifier2();
+            }
+            else
+            {
+                return it.second.type_identifier1();
+            }
         }
-        else if (it.second.type_identifier2() == type_id || TK_NONE == it.second.type_identifier2()._d())
+        else if (it.second.type_identifier2() == type_id)
         {
             return it.second.type_identifier1();
         }

diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -141,6 +141,7 @@ TEST(BuiltinDataSerializationTests, ok_with_defaults)
 }
 
 // Regression test for redmine issue #10547
+// After XTypes1.3 readFromCDRMessage is expected to return false when reading fails
 TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
 {
     // DATA(w)
@@ -189,7 +190,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
         msg.length = msg.max_size;
 
         WriterProxyData out(max_unicast_locators, max_multicast_locators);
-        EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));
+        EXPECT_NO_THROW(EXPECT_FALSE(out.readFromCDRMessage(&msg, network, false, true)));
     }
 
     // DATA(r)
@@ -241,7 +242,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
         msg.length = msg.max_size;
 
         ReaderProxyData out(max_unicast_locators, max_multicast_locators);
-        EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));
+        EXPECT_NO_THROW(EXPECT_FALSE(out.readFromCDRMessage(&msg, network, false, true)));
     }
 }