Skip to content

Commit 21c1cee

Browse files
LuciaEchevarria99LuciaEchevarria99
committed
Fix tests compilation
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
1 parent a77c37a commit 21c1cee

67 files changed

Lines changed: 839 additions & 3381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ddsrouter_core/test/blackbox/ddsrouter_core/dds/WAN/CMakeLists.txt‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,14 @@
1919
set(TEST_NAME
2020
DDSTestWAN)
2121

22-
# Determine Fast DDS version
23-
if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
24-
set(DDS_TYPES_VERSION "v1")
25-
else()
26-
set(DDS_TYPES_VERSION "v2")
27-
endif()
28-
2922
set(TEST_SOURCES
30-
DDSTestWAN.cpp
31-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorld.cxx
32-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldv1.cxx>
33-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldCdrAux.ipp>
34-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldPubSubTypes.cxx
35-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyed.cxx
36-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedv1.cxx>
37-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp>
38-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx)
23+
DDSTestWAN.cpp
24+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldPubSubTypes.cxx
25+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldCdrAux.ipp
26+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldTypeObjectSupport.cxx
27+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx
28+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp
29+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedTypeObjectSupport.cxx)
3930

4031
set(TEST_LIST
4132
end_to_end_discovery_server_WAN_communication_UDPv4
@@ -70,7 +61,7 @@ set(TEST_NEEDED_SOURCES
7061
)
7162

7263
set(TEST_EXTRA_HEADERS
73-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld
64+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld
7465
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types)
7566

7667
add_blackbox_executable(

‎ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/CMakeLists.txt‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,14 @@
1919
set(TEST_NAME
2020
DDSTestLocal)
2121

22-
# Determine Fast DDS version
23-
if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
24-
set(DDS_TYPES_VERSION "v1")
25-
else()
26-
set(DDS_TYPES_VERSION "v2")
27-
endif()
28-
2922
set(TEST_SOURCES
3023
DDSTestLocal.cpp
31-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorld.cxx
32-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldv1.cxx>
33-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldCdrAux.ipp>
34-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldPubSubTypes.cxx
35-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyed.cxx
36-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedv1.cxx>
37-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp>
38-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx)
24+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldPubSubTypes.cxx
25+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldCdrAux.ipp
26+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldTypeObjectSupport.cxx
27+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx
28+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp
29+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedTypeObjectSupport.cxx)
3930

4031
set(TEST_LIST
4132
end_to_end_local_communication
@@ -52,8 +43,8 @@ set(TEST_NEEDED_SOURCES
5243
)
5344

5445
set(TEST_EXTRA_HEADERS
55-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld
56-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed,
46+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld
47+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed,
5748
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types)
5849

5950
add_blackbox_executable(
@@ -72,14 +63,12 @@ set(TEST_NAME
7263

7364
set(TEST_SOURCES
7465
DDSTestLocalDisposeKey.cpp
75-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorld.cxx
76-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldv1.cxx>
77-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldCdrAux.ipp>
78-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldPubSubTypes.cxx
79-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyed.cxx
80-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedv1.cxx>
81-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp>
82-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx)
66+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldPubSubTypes.cxx
67+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldCdrAux.ipp
68+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldTypeObjectSupport.cxx
69+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx
70+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp
71+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedTypeObjectSupport.cxx)
8372

8473
set(TEST_LIST
8574
end_to_end_local_communication_key_dispose)
@@ -88,7 +77,7 @@ set(TEST_NEEDED_SOURCES
8877
)
8978

9079
set(TEST_EXTRA_HEADERS
91-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed,
80+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed,
9281
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types)
9382

9483
add_blackbox_executable(

‎ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,7 @@ DdsRouterConfiguration dds_test_simple_configuration(
111111
* The transient_local option changes the test behavior to verify that the communication is transient_local and all old data is sent
112112
* to Late Joiners.
113113
*/
114-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
115-
template <class MsgStruct>
116-
#else
117114
template <class MsgStruct, class MsgStructType>
118-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
119115
void test_local_communication(
120116
DdsRouterConfiguration ddsrouter_configuration,
121117
uint32_t samples_to_receive = DEFAULT_SAMPLES_TO_RECEIVE,
@@ -135,9 +131,7 @@ void test_local_communication(
135131
// Create a message with size specified by repeating the same string
136132
MsgStruct msg;
137133

138-
#if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
139134
MsgStructType type;
140-
#endif // if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
141135

142136
std::string msg_str;
143137

@@ -149,20 +143,12 @@ void test_local_communication(
149143
msg.message(msg_str);
150144

151145
// Create DDS Publisher in domain 0
152-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
153-
TestPublisher<MsgStruct> publisher(msg.isKeyDefined());
154-
#else
155146
TestPublisher<MsgStruct> publisher(type.m_isGetKeyDefined);
156-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
157147

158148
ASSERT_TRUE(publisher.init(0));
159149

160150
// Create DDS Subscriber in domain 1
161-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
162-
TestSubscriber<MsgStruct> subscriber(msg.isKeyDefined(), transient_local);
163-
#else
164151
TestSubscriber<MsgStruct> subscriber(type.m_isGetKeyDefined, transient_local);
165-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
166152

167153
ASSERT_TRUE(subscriber.init(1, &msg, &samples_received));
168154

@@ -226,14 +212,8 @@ void test_local_communication(
226212
*/
227213
TEST(DDSTestLocal, end_to_end_local_communication)
228214
{
229-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
230-
test::test_local_communication<HelloWorld>(
231-
test::dds_test_simple_configuration());
232-
#else
233215
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
234216
test::dds_test_simple_configuration());
235-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
236-
237217
}
238218

239219
/**
@@ -242,13 +222,8 @@ TEST(DDSTestLocal, end_to_end_local_communication)
242222
*/
243223
TEST(DDSTestLocal, end_to_end_local_communication_keyed)
244224
{
245-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
246-
test::test_local_communication<HelloWorldKeyed>(
247-
test::dds_test_simple_configuration());
248-
#else
249225
test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
250226
test::dds_test_simple_configuration());
251-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
252227
}
253228

254229
/**
@@ -258,24 +233,14 @@ TEST(DDSTestLocal, end_to_end_local_communication_keyed)
258233
*/
259234
TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery)
260235
{
261-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
262-
test::test_local_communication<HelloWorld>(
263-
test::dds_test_simple_configuration(true));
264-
#else
265236
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
266237
test::dds_test_simple_configuration(true));
267-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
268238
}
269239

270240
TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery_keyed)
271241
{
272-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
273-
test::test_local_communication<HelloWorldKeyed>(
274-
test::dds_test_simple_configuration(true));
275-
#else
276242
test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
277243
test::dds_test_simple_configuration(true));
278-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
279244
}
280245

281246
/**
@@ -287,17 +252,10 @@ TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery_keye
287252
*/
288253
TEST(DDSTestLocal, end_to_end_local_communication_high_frequency)
289254
{
290-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
291-
test::test_local_communication<HelloWorld>(
292-
test::dds_test_simple_configuration(),
293-
1000, // wait for 1000 samples received
294-
0); // send it without waiting from one sample to the other
295-
#else
296255
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
297256
test::dds_test_simple_configuration(),
298257
1000, // wait for 1000 samples received
299258
0); // send it without waiting from one sample to the other
300-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
301259
}
302260

303261
/**
@@ -309,19 +267,11 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_frequency)
309267
*/
310268
TEST(DDSTestLocal, end_to_end_local_communication_high_size)
311269
{
312-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
313-
test::test_local_communication<HelloWorld>(
314-
test::dds_test_simple_configuration(),
315-
test::DEFAULT_SAMPLES_TO_RECEIVE,
316-
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
317-
10000); // 500K message size
318-
#else
319270
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
320271
test::dds_test_simple_configuration(),
321272
test::DEFAULT_SAMPLES_TO_RECEIVE,
322273
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
323274
10000); // 500K message size
324-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
325275
}
326276

327277
/**
@@ -335,19 +285,11 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_size)
335285
*/
336286
TEST(DDSTestLocal, end_to_end_local_communication_high_throughput)
337287
{
338-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
339-
test::test_local_communication<HelloWorld>(
340-
test::dds_test_simple_configuration(),
341-
500,
342-
1,
343-
1000); // 50K message size
344-
#else
345288
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
346289
test::dds_test_simple_configuration(),
347290
500,
348291
1,
349292
1000); // 50K message size
350-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
351293
}
352294

353295
/**
@@ -356,21 +298,12 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_throughput)
356298
*/
357299
TEST(DDSTestLocal, end_to_end_local_communication_transient_local)
358300
{
359-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
360-
test::test_local_communication<HelloWorld>(
361-
test::dds_test_simple_configuration(),
362-
test::DEFAULT_SAMPLES_TO_RECEIVE,
363-
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
364-
test::DEFAULT_MESSAGE_SIZE,
365-
true);
366-
#else
367301
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
368302
test::dds_test_simple_configuration(),
369303
test::DEFAULT_SAMPLES_TO_RECEIVE,
370304
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
371305
test::DEFAULT_MESSAGE_SIZE,
372306
true);
373-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
374307
}
375308

376309
/**
@@ -379,21 +312,12 @@ TEST(DDSTestLocal, end_to_end_local_communication_transient_local)
379312
*/
380313
TEST(DDSTestLocal, end_to_end_local_communication_transient_local_disable_dynamic_discovery)
381314
{
382-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
383-
test::test_local_communication<HelloWorld>(
384-
test::dds_test_simple_configuration(true, true),
385-
test::DEFAULT_SAMPLES_TO_RECEIVE,
386-
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
387-
test::DEFAULT_MESSAGE_SIZE,
388-
true);
389-
#else
390315
test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
391316
test::dds_test_simple_configuration(true, true),
392317
test::DEFAULT_SAMPLES_TO_RECEIVE,
393318
test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
394319
test::DEFAULT_MESSAGE_SIZE,
395320
true);
396-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
397321
}
398322

399323
int main(

‎ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ void test_local_communication_key_dispose(
9999
// Create a message with size specified by repeating the same string
100100
HelloWorldKeyed msg;
101101

102-
#if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
103102
HelloWorldKeyedPubSubType type;
104-
#endif // if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
105103

106104
std::string msg_str;
107105

@@ -114,20 +112,12 @@ void test_local_communication_key_dispose(
114112
msg.id(666);
115113

116114
// Create DDS Publisher in domain 0
117-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
118-
TestPublisher<HelloWorldKeyed> publisher(msg.isKeyDefined());
119-
#else
120115
TestPublisher<HelloWorldKeyed> publisher(type.m_isGetKeyDefined);
121-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
122116

123117
ASSERT_TRUE(publisher.init(0));
124118

125119
// Create DDS Subscriber in domain 1
126-
#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
127-
TestSubscriber<HelloWorldKeyed> subscriber(msg.isKeyDefined());
128-
#else
129120
TestSubscriber<HelloWorldKeyed> subscriber(type.m_isGetKeyDefined);
130-
#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
131121

132122
ASSERT_TRUE(subscriber.init(1, &msg, &samples_received));
133123

@@ -152,7 +142,7 @@ void test_local_communication_key_dispose(
152142
}
153143

154144
// All samples received, now dispose key from publisher and check that subscriber has receive it
155-
ASSERT_TRUE(publisher.dispose_key(msg) == ReturnCode_t::RETCODE_OK);
145+
ASSERT_TRUE(publisher.dispose_key(msg) == fastdds::dds::RETCODE_OK);
156146
std::this_thread::sleep_for(std::chrono::milliseconds(DEFAULT_SUBSCRIBER_MESSAGE_RECEPTION));
157147
samples_received.store(0);
158148

@@ -170,7 +160,7 @@ void test_local_communication_key_dispose(
170160
}
171161

172162
// All samples received, now dispose key from publisher and check that subscriber has receive it
173-
ASSERT_TRUE(publisher.dispose_key(msg) == ReturnCode_t::RETCODE_OK);
163+
ASSERT_TRUE(publisher.dispose_key(msg) == fastdds::dds::RETCODE_OK);
174164
std::this_thread::sleep_for(std::chrono::milliseconds(DEFAULT_SUBSCRIBER_MESSAGE_RECEPTION));
175165

176166
ASSERT_EQ(2u, subscriber.n_disposed());

‎ddsrouter_core/test/blackbox/ddsrouter_core/dds/repeater/CMakeLists.txt‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,14 @@
1919
set(TEST_NAME
2020
DDSTestRepeater)
2121

22-
# Determine Fast DDS version
23-
if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
24-
set(DDS_TYPES_VERSION "v1")
25-
else()
26-
set(DDS_TYPES_VERSION "v2")
27-
endif()
28-
2922
set(TEST_SOURCES
3023
DDSTestRepeater.cpp
31-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorld.cxx
32-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldv1.cxx>
33-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldCdrAux.ipp>
34-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld/HelloWorldPubSubTypes.cxx
35-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyed.cxx
36-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedv1.cxx>
37-
$<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp>
38-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx)
24+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldPubSubTypes.cxx
25+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldCdrAux.ipp
26+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld/HelloWorldTypeObjectSupport.cxx
27+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedPubSubTypes.cxx
28+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedCdrAux.ipp
29+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorldKeyed/HelloWorldKeyedTypeObjectSupport.cxx)
3930

4031
set(TEST_LIST
4132
repeater_initial_peers_communication_UDPv4
@@ -45,7 +36,7 @@ set(TEST_NEEDED_SOURCES
4536
)
4637

4738
set(TEST_EXTRA_HEADERS
48-
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/${DDS_TYPES_VERSION}/HelloWorld
39+
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types/HelloWorld
4940
${PROJECT_SOURCE_DIR}/test/blackbox/ddsrouter_core/dds/types)
5041

5142
add_blackbox_executable(

0 commit comments

Comments
 (0)