Refs #20419: Fixes for unions

adriancampo · adriancampo · commit 1992c8069acc · 2024-03-25T12:47:51.000+01:00
Signed-off-by: adriancampo &lt;adriancampo@eprosima.com&gt;
diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg
@@ -831,17 +831,17 @@ check_union_member(member, parent) ::= <<
     EXPECT_EQ($member.name$_expected_flags, type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().member_flags());
     TypeIdentifierPair member_type_ids;
     $get_type_identifier(type=member.typecode, var="member_type_ids")$
-    EXPECT_TRUE(member_type_ids.type_identifier1() == type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id() ||
-        member_type_ids.type_identifier1() == type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());
+    EXPECT_TRUE(compare_type_identifiers(member_type_ids.type_identifier1(), type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id()) ||
+        compare_type_identifiers(member_type_ids.type_identifier1(), type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));
     if (TK_NONE == member_type_ids.type_identifier2()._d())
     {
-        EXPECT_EQ(type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id(),
-                type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());
+        EXPECT_TRUE(compare_type_identifiers(type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id(),
+                type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));
     }
     else
     {
-        EXPECT_TRUE(member_type_ids.type_identifier2() == type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id() ||
-            member_type_ids.type_identifier2() == type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());
+        EXPECT_TRUE(compare_type_identifiers(member_type_ids.type_identifier2(), type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id()) ||
+            compare_type_identifiers(member_type_ids.type_identifier2(), type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));
     }
     $member.labels: { label | $check_label(label=label)$}; separator="\n"$
     ASSERT_EQ($member.labelsSize$, type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().label_seq().size());
diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test
@@ -1 +1 @@
-Subproject commit ef234fb8071c0a93fee23a40537592df7e1778bc
+Subproject commit 2defa4b988559e38b21c0f5a46624ba58f64c9b4

Original file line number	Diff line number	Diff line change
`@@ -831,17 +831,17 @@ check_union_member(member, parent) ::= <<`
`831`	`831`	`EXPECT_EQ($member.name$_expected_flags, type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().member_flags());`
`832`	`832`	`TypeIdentifierPair member_type_ids;`
`833`	`833`	$get_type_identifier(type=member.typecode, var="member_type_ids")$
`834`		`- EXPECT_TRUE(member_type_ids.type_identifier1() == type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id() \|\|`
`835`		`- member_type_ids.type_identifier1() == type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());`
	`834`	`+ EXPECT_TRUE(compare_type_identifiers(member_type_ids.type_identifier1(), type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id()) \|\|`
	`835`	`+ compare_type_identifiers(member_type_ids.type_identifier1(), type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));`
`836`	`836`	`if (TK_NONE == member_type_ids.type_identifier2()._d())`
`837`	`837`	`{`
`838`		`- EXPECT_EQ(type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id(),`
`839`		`- type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());`
	`838`	`+ EXPECT_TRUE(compare_type_identifiers(type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id(),`
	`839`	`+ type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));`
`840`	`840`	`}`
`841`	`841`	`else`
`842`	`842`	`{`
`843`		`- EXPECT_TRUE(member_type_ids.type_identifier2() == type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id() \|\|`
`844`		`- member_type_ids.type_identifier2() == type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id());`
	`843`	`+ EXPECT_TRUE(compare_type_identifiers(member_type_ids.type_identifier2(), type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().type_id()) \|\|`
	`844`	`+ compare_type_identifiers(member_type_ids.type_identifier2(), type_objects.complete_type_object.complete().union_type().member_seq()[pos].common().type_id()));`
`845`	`845`	`}`
`846`	`846`	`$member.labels: { label \| $check_label(label=label)$}; separator="\n"$`
`847`	`847`	`ASSERT_EQ($member.labelsSize$, type_objects.minimal_type_object.minimal().union_type().member_seq()[pos].common().label_seq().size());`