Skip to content

Commit 02ce904

Browse files
JLBuenoLopezJLBuenoLopez
authored
Update ContentFilter test TypeObject using upcoming Fast DDS-Gen v2.1.2 (#2576)
* Refs #14093: regenerate type object using Fast DDS Gen 2.1.2 Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #14093: remove constant conditional expression (Windows issues a warning) Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
1 parent ee8f5d2 commit 02ce904

File tree

3 files changed

+153
-478
lines changed

3 files changed

+153
-478
lines changed

‎test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx

Lines changed: 84 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ char dummy;
2727
#endif // _WIN32
2828

2929
#include "ContentFilterTestType.h"
30+
#include "ContentFilterTestTypeTypeObject.h"
3031
#include <fastcdr/Cdr.h>
3132

3233
#include <fastcdr/exceptions/BadParamException.h>
@@ -38,37 +39,39 @@ using namespace eprosima::fastcdr::exception;
3839

3940
StructType::StructType()
4041
{
41-
// m_char_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@799d4f69
42+
// m_char_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@76329302
4243
m_char_field = 0;
43-
// m_uint8_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@12028586
44+
// m_uint8_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@b59d31
4445
m_uint8_field = 0;
45-
// m_int16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@17776a8
46+
// m_int16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@62fdb4a6
4647
m_int16_field = 0;
47-
// m_uint16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@69a10787
48+
// m_uint16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@11e21d0e
4849
m_uint16_field = 0;
49-
// m_int32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@11c20519
50+
// m_int32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@3e77a1ed
5051
m_int32_field = 0;
51-
// m_uint32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@70beb599
52+
// m_uint32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@3ffcd140
5253
m_uint32_field = 0;
53-
// m_int64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@4e41089d
54+
// m_int64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@23bb8443
5455
m_int64_field = 0;
55-
// m_uint64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@32a068d1
56+
// m_uint64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@1176dcec
5657
m_uint64_field = 0;
57-
// m_float_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@33cb5951
58+
// m_float_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@120d6fe6
5859
m_float_field = 0.0;
59-
// m_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@365c30cc
60+
// m_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@4ba2ca36
6061
m_double_field = 0.0;
61-
// m_long_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@701fc37a
62+
// m_long_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@3444d69d
6263
m_long_double_field = 0.0;
63-
// m_bool_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@4148db48
64+
// m_bool_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@1372ed45
6465
m_bool_field = false;
65-
// m_string_field com.eprosima.idl.parser.typecode.StringTypeCode@282003e1
66+
// m_string_field com.eprosima.idl.parser.typecode.StringTypeCode@6a79c292
6667
m_string_field ="";
67-
// m_enum_field com.eprosima.idl.parser.typecode.EnumTypeCode@7fad8c79
68+
// m_enum_field com.eprosima.idl.parser.typecode.EnumTypeCode@37574691
6869
m_enum_field = ::RED;
69-
// m_enum2_field com.eprosima.idl.parser.typecode.EnumTypeCode@71a794e5
70+
// m_enum2_field com.eprosima.idl.parser.typecode.EnumTypeCode@25359ed8
7071
m_enum2_field = ::WOOD;
7172

73+
// Just to register all known types
74+
registerContentFilterTestTypeTypes();
7275
}
7376

7477
StructType::~StructType()
@@ -821,135 +824,137 @@ void StructType::serializeKey(
821824

822825
ContentFilterTestType::ContentFilterTestType()
823826
{
824-
// m_char_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@55040f2f
827+
// m_char_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@7d68ef40
825828
m_char_field = 0;
826-
// m_uint8_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@275710fc
829+
// m_uint8_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@1f1c7bf6
827830
m_uint8_field = 0;
828-
// m_int16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@525f1e4e
831+
// m_int16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@25b485ba
829832
m_int16_field = 0;
830-
// m_uint16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@75f9eccc
833+
// m_uint16_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2b546384
831834
m_uint16_field = 0;
832-
// m_int32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@67e2d983
835+
// m_int32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@20d3d15a
833836
m_int32_field = 0;
834-
// m_uint32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@5d47c63f
837+
// m_uint32_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2893de87
835838
m_uint32_field = 0;
836-
// m_int64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@5ea434c8
839+
// m_int64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@55ca8de8
837840
m_int64_field = 0;
838-
// m_uint64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@3bbc39f8
841+
// m_uint64_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2c34f934
839842
m_uint64_field = 0;
840-
// m_float_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@4ae3c1cd
843+
// m_float_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@12d3a4e9
841844
m_float_field = 0.0;
842-
// m_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@29f69090
845+
// m_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@240237d2
843846
m_double_field = 0.0;
844-
// m_long_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@568bf312
847+
// m_long_double_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@25a65b77
845848
m_long_double_field = 0.0;
846-
// m_bool_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@ca263c2
849+
// m_bool_field com.eprosima.idl.parser.typecode.PrimitiveTypeCode@2ed0fbae
847850
m_bool_field = false;
848-
// m_string_field com.eprosima.idl.parser.typecode.StringTypeCode@589b3632
851+
// m_string_field com.eprosima.idl.parser.typecode.StringTypeCode@212bf671
849852
m_string_field ="";
850-
// m_enum_field com.eprosima.idl.parser.typecode.EnumTypeCode@7fad8c79
853+
// m_enum_field com.eprosima.idl.parser.typecode.EnumTypeCode@37574691
851854
m_enum_field = ::RED;
852-
// m_enum2_field com.eprosima.idl.parser.typecode.EnumTypeCode@71a794e5
855+
// m_enum2_field com.eprosima.idl.parser.typecode.EnumTypeCode@25359ed8
853856
m_enum2_field = ::WOOD;
854-
// m_struct_field com.eprosima.fastdds.idl.parser.typecode.StructTypeCode@45f45fa1
857+
// m_struct_field com.eprosima.fastdds.idl.parser.typecode.StructTypeCode@14a2f921
855858

856-
// m_array_char_field com.eprosima.idl.parser.typecode.ArrayTypeCode@4c6e276e
859+
// m_array_char_field com.eprosima.idl.parser.typecode.ArrayTypeCode@3c87521
857860
memset(&m_array_char_field, 0, (max_array_size) * 1);
858-
// m_array_uint8_field com.eprosima.idl.parser.typecode.ArrayTypeCode@534df152
861+
// m_array_uint8_field com.eprosima.idl.parser.typecode.ArrayTypeCode@2aece37d
859862
memset(&m_array_uint8_field, 0, (max_array_size) * 1);
860-
// m_array_int16_field com.eprosima.idl.parser.typecode.ArrayTypeCode@52e677af
863+
// m_array_int16_field com.eprosima.idl.parser.typecode.ArrayTypeCode@548a102f
861864
memset(&m_array_int16_field, 0, (max_array_size) * 2);
862-
// m_array_uint16_field com.eprosima.idl.parser.typecode.ArrayTypeCode@35083305
865+
// m_array_uint16_field com.eprosima.idl.parser.typecode.ArrayTypeCode@5762806e
863866
memset(&m_array_uint16_field, 0, (max_array_size) * 2);
864-
// m_array_int32_field com.eprosima.idl.parser.typecode.ArrayTypeCode@8e0379d
867+
// m_array_int32_field com.eprosima.idl.parser.typecode.ArrayTypeCode@17c386de
865868
memset(&m_array_int32_field, 0, (max_array_size) * 4);
866-
// m_array_uint32_field com.eprosima.idl.parser.typecode.ArrayTypeCode@341b80b2
869+
// m_array_uint32_field com.eprosima.idl.parser.typecode.ArrayTypeCode@5af97850
867870
memset(&m_array_uint32_field, 0, (max_array_size) * 4);
868-
// m_array_int64_field com.eprosima.idl.parser.typecode.ArrayTypeCode@55a1c291
871+
// m_array_int64_field com.eprosima.idl.parser.typecode.ArrayTypeCode@5ef60048
869872
memset(&m_array_int64_field, 0, (max_array_size) * 8);
870-
// m_array_uint64_field com.eprosima.idl.parser.typecode.ArrayTypeCode@2145433b
873+
// m_array_uint64_field com.eprosima.idl.parser.typecode.ArrayTypeCode@1d548a08
871874
memset(&m_array_uint64_field, 0, (max_array_size) * 8);
872-
// m_array_float_field com.eprosima.idl.parser.typecode.ArrayTypeCode@1b083826
875+
// m_array_float_field com.eprosima.idl.parser.typecode.ArrayTypeCode@16aa0a0a
873876
memset(&m_array_float_field, 0, (max_array_size) * 4);
874-
// m_array_double_field com.eprosima.idl.parser.typecode.ArrayTypeCode@105fece7
877+
// m_array_double_field com.eprosima.idl.parser.typecode.ArrayTypeCode@780cb77
875878
memset(&m_array_double_field, 0, (max_array_size) * 8);
876-
// m_array_long_double_field com.eprosima.idl.parser.typecode.ArrayTypeCode@3ec300f1
879+
// m_array_long_double_field com.eprosima.idl.parser.typecode.ArrayTypeCode@691a7f8f
877880
memset(&m_array_long_double_field, 0, (max_array_size) * 16);
878-
// m_array_bool_field com.eprosima.idl.parser.typecode.ArrayTypeCode@482cd91f
881+
// m_array_bool_field com.eprosima.idl.parser.typecode.ArrayTypeCode@50a7bc6e
879882
memset(&m_array_bool_field, 0, (max_array_size) * 1);
880-
// m_array_string_field com.eprosima.idl.parser.typecode.ArrayTypeCode@123f1134
883+
// m_array_string_field com.eprosima.idl.parser.typecode.ArrayTypeCode@161b062a
881884

882-
// m_array_enum_field com.eprosima.idl.parser.typecode.ArrayTypeCode@7d68ef40
885+
// m_array_enum_field com.eprosima.idl.parser.typecode.ArrayTypeCode@17c1bced
883886
memset(&m_array_enum_field, 0, (max_array_size) * 4);
884-
// m_array_enum2_field com.eprosima.idl.parser.typecode.ArrayTypeCode@5b0abc94
887+
// m_array_enum2_field com.eprosima.idl.parser.typecode.ArrayTypeCode@2d9d4f9d
885888
memset(&m_array_enum2_field, 0, (max_array_size) * 4);
886-
// m_array_struct_field com.eprosima.idl.parser.typecode.ArrayTypeCode@25b485ba
889+
// m_array_struct_field com.eprosima.idl.parser.typecode.ArrayTypeCode@14ec4505
887890

888-
// m_bounded_sequence_char_field com.eprosima.idl.parser.typecode.SequenceTypeCode@214b199c
891+
// m_bounded_sequence_char_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3ee0fea4
889892

890-
// m_bounded_sequence_uint8_field com.eprosima.idl.parser.typecode.SequenceTypeCode@20d3d15a
893+
// m_bounded_sequence_uint8_field com.eprosima.idl.parser.typecode.SequenceTypeCode@48524010
891894

892-
// m_bounded_sequence_int16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2893de87
895+
// m_bounded_sequence_int16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@4b168fa9
893896

894-
// m_bounded_sequence_uint16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@55ca8de8
897+
// m_bounded_sequence_uint16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@1a84f40f
895898

896-
// m_bounded_sequence_int32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2c34f934
899+
// m_bounded_sequence_int32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@23282c25
897900

898-
// m_bounded_sequence_uint32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@12d3a4e9
901+
// m_bounded_sequence_uint32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@7920ba90
899902

900-
// m_bounded_sequence_int64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@240237d2
903+
// m_bounded_sequence_int64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@6b419da
901904

902-
// m_bounded_sequence_uint64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@25a65b77
905+
// m_bounded_sequence_uint64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3b2da18f
903906

904-
// m_bounded_sequence_float_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2ed0fbae
907+
// m_bounded_sequence_float_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5906ebcb
905908

906-
// m_bounded_sequence_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@212bf671
909+
// m_bounded_sequence_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@258e2e41
907910

908-
// m_bounded_sequence_long_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@14a2f921
911+
// m_bounded_sequence_long_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3d299e3
909912

910-
// m_bounded_sequence_bool_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3c87521
913+
// m_bounded_sequence_bool_field com.eprosima.idl.parser.typecode.SequenceTypeCode@55a561cf
911914

912-
// m_bounded_sequence_string_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2aece37d
915+
// m_bounded_sequence_string_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3b938003
913916

914-
// m_bounded_sequence_enum_field com.eprosima.idl.parser.typecode.SequenceTypeCode@548a102f
917+
// m_bounded_sequence_enum_field com.eprosima.idl.parser.typecode.SequenceTypeCode@6f3b5d16
915918

916-
// m_bounded_sequence_enum2_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5762806e
919+
// m_bounded_sequence_enum2_field com.eprosima.idl.parser.typecode.SequenceTypeCode@78b1cc93
917920

918-
// m_bounded_sequence_struct_field com.eprosima.idl.parser.typecode.SequenceTypeCode@17c386de
921+
// m_bounded_sequence_struct_field com.eprosima.idl.parser.typecode.SequenceTypeCode@6646153
919922

920-
// m_unbounded_sequence_char_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5af97850
923+
// m_unbounded_sequence_char_field com.eprosima.idl.parser.typecode.SequenceTypeCode@21507a04
921924

922-
// m_unbounded_sequence_uint8_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5ef60048
925+
// m_unbounded_sequence_uint8_field com.eprosima.idl.parser.typecode.SequenceTypeCode@143640d5
923926

924-
// m_unbounded_sequence_int16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@1d548a08
927+
// m_unbounded_sequence_int16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@6295d394
925928

926-
// m_unbounded_sequence_uint16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@16aa0a0a
929+
// m_unbounded_sequence_uint16_field com.eprosima.idl.parser.typecode.SequenceTypeCode@475e586c
927930

928-
// m_unbounded_sequence_int32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@780cb77
931+
// m_unbounded_sequence_int32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@657c8ad9
929932

930-
// m_unbounded_sequence_uint32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@691a7f8f
933+
// m_unbounded_sequence_uint32_field com.eprosima.idl.parser.typecode.SequenceTypeCode@436a4e4b
931934

932-
// m_unbounded_sequence_int64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@50a7bc6e
935+
// m_unbounded_sequence_int64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@f2f2cc1
933936

934-
// m_unbounded_sequence_uint64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@161b062a
937+
// m_unbounded_sequence_uint64_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3a079870
935938

936-
// m_unbounded_sequence_float_field com.eprosima.idl.parser.typecode.SequenceTypeCode@17c1bced
939+
// m_unbounded_sequence_float_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3b2cf7ab
937940

938-
// m_unbounded_sequence_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2d9d4f9d
941+
// m_unbounded_sequence_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@2aa5fe93
939942

940-
// m_unbounded_sequence_long_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@4034c28c
943+
// m_unbounded_sequence_long_double_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5c1a8622
941944

942-
// m_unbounded_sequence_bool_field com.eprosima.idl.parser.typecode.SequenceTypeCode@e50a6f6
945+
// m_unbounded_sequence_bool_field com.eprosima.idl.parser.typecode.SequenceTypeCode@5ad851c9
943946

944-
// m_unbounded_sequence_string_field com.eprosima.idl.parser.typecode.SequenceTypeCode@14ec4505
947+
// m_unbounded_sequence_string_field com.eprosima.idl.parser.typecode.SequenceTypeCode@6156496
945948

946-
// m_unbounded_sequence_enum_field com.eprosima.idl.parser.typecode.SequenceTypeCode@53ca01a2
949+
// m_unbounded_sequence_enum_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3c153a1
947950

948-
// m_unbounded_sequence_enum2_field com.eprosima.idl.parser.typecode.SequenceTypeCode@358c99f5
951+
// m_unbounded_sequence_enum2_field com.eprosima.idl.parser.typecode.SequenceTypeCode@b62fe6d
949952

950-
// m_unbounded_sequence_struct_field com.eprosima.idl.parser.typecode.SequenceTypeCode@3ee0fea4
953+
// m_unbounded_sequence_struct_field com.eprosima.idl.parser.typecode.SequenceTypeCode@13acb0d1
951954

952955

956+
// Just to register all known types
957+
registerContentFilterTestTypeTypes();
953958
}
954959

955960
ContentFilterTestType::~ContentFilterTestType()
@@ -1692,7 +1697,6 @@ size_t ContentFilterTestType::getCdrSerializedSize(
16921697

16931698
current_alignment += ((max_array_size) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
16941699

1695-
16961700
for(size_t a = 0; a < data.array_string_field().size(); ++a)
16971701
{
16981702
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.array_string_field().at(a).size() + 1;
@@ -1702,7 +1706,6 @@ size_t ContentFilterTestType::getCdrSerializedSize(
17021706

17031707
current_alignment += ((max_array_size) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
17041708

1705-
17061709
for(size_t a = 0; a < data.array_struct_field().size(); ++a)
17071710
{
17081711
current_alignment += StructType::getCdrSerializedSize(data.array_struct_field().at(a), current_alignment);

0 commit comments

Comments
 (0)