Refs #20242. Update unsupported_type_info tests.

Now we works successfully against OpenDDS 3.27 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Apr 9, 2024 · 2510674 · 2510674
1 parent 27a861e
commit 2510674
Showing 1 changed file with 27 additions and 14 deletions.
diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -140,9 +140,9 @@ 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)
+// Regression test for redmine issue #10547.
+// Update against OpenDDS 3.27. With this version we can read the remote DATA(w).
+TEST(BuiltinDataSerializationTests, interoperability_with_opendds_3_27)
 {
  // DATA(w)
  {
@@ -154,16 +154,17 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
  // Topic name
  0x05, 0x00, 0x0c, 0x00,
  0x07, 0x00, 0x00, 0x00, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x00, 0x00,
- // Type information
- 0x75, 0x00, 0x50, 0x00,
- 0x4c, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x40, 0x24, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
- 0x14, 0x00, 0x00, 0x00, 0xf1, 0x80, 0x99, 0x5e, 0xfc, 0xdb, 0xda, 0xbe, 0xd5, 0xb3, 0x3d, 0xe3,
- 0xea, 0x3a, 0x4b, 0x00, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x02, 0x10, 0x00, 0x40, 0x18, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  // Type name
  0x07, 0x00, 0x10, 0x00,
  0x0a, 0x00, 0x00, 0x00, 0x53, 0x68, 0x61, 0x70, 0x65, 0x54, 0x79, 0x70, 0x65, 0x00, 0x00, 0x00,
+ // Type information
+ 0x75, 0x00, 0x58, 0x00,
+ 0x54, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x40, 0x28, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x00, 0x00, 0xf1, 0x8b, 0x4b, 0x28, 0x4d, 0xe3, 0xa2, 0x4e, 0x5f, 0x86, 0x58, 0x5c,
+ 0x57, 0x88, 0xf6, 0x00, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 0x40, 0x1c, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  // Reliability
  0x1a, 0x00, 0x0c, 0x00,
  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xf5, 0x05,
@@ -172,15 +173,27 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
  0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
  // Endpoint GUID
  0x5a, 0x00, 0x10, 0x00,
- 0x01, 0x03, 0x08, 0x00, 0x27, 0x5c, 0x4f, 0x05, 0x0f, 0x19, 0x05, 0xea, 0x00, 0x00, 0x00, 0x02,
+ 0x01, 0x03, 0x74, 0x04, 0xf1, 0x0b, 0x6b, 0x16, 0x94, 0x6c, 0x26, 0x73, 0x00, 0x00, 0x00, 0x02,
  // Multicast locator
  0x30, 0x00, 0x18, 0x00,
  0x01, 0x00, 0x00, 0x00, 0xe9, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0x00, 0x02,
  // Unicast locator
  0x2f, 0x00, 0x18, 0x00,
- 0x01, 0x00, 0x00, 0x00, 0x3e, 0xcd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0xb4,
+ 0x01, 0x00, 0x00, 0x00, 0x67, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0x27,
+ 0x2f, 0x00, 0x18, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x67, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xac, 0x11, 0x00, 0x01,
+ 0x2f, 0x00, 0x18, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x67, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x0a, 0x05, 0x00, 0x01,
+ 0x2f, 0x00, 0x18, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x67, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x50, 0x01,
+ 0x2f, 0x00, 0x18, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x67, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0x8b,
  // Sentinel
  0x01, 0x00, 0x00, 0x00
  };
@@ -190,7 +203,7 @@ TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info)
  msg.length = msg.max_size;
 
  WriterProxyData out(max_unicast_locators, max_multicast_locators);
- EXPECT_NO_THROW(EXPECT_FALSE(out.readFromCDRMessage(&msg, network, false, true)));
+ EXPECT_NO_THROW(EXPECT_TRUE(out.readFromCDRMessage(&msg, network, false, true)));
  }
 
  // DATA(r)