Skip to content

Commit 3e1adec

Browse files
richiwarerichiware
committed
Refs #20734. Fix tests
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 598f64c commit 3e1adec

8 files changed

Lines changed: 324 additions & 324 deletions

File tree

‎fastdds_python/src/swig/fastdds/dds/topic/TypeSupport.i‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
// Do not worry about the heap allocation, SWIG recognizes the method as a constructor
3838
// and successfully deallocates on destruction
3939
%extend eprosima::fastdds::dds::TypeSupport {
40-
%apply SWIGTYPE *DISOWN { TopicDataType* ptr };
41-
TypeSupport(TopicDataType* ptr)
40+
%apply SWIGTYPE *DISOWN { eprosima::fastdds::dds::TopicDataType* ptr };
41+
TypeSupport(eprosima::fastdds::dds::TopicDataType* ptr)
4242
{
4343
return new eprosima::fastdds::dds::TypeSupport(ptr);
4444
}
4545

46-
%apply SWIGTYPE *DISOWN { TopicDataType* ptr };
47-
void set(TopicDataType* ptr)
46+
%apply SWIGTYPE *DISOWN { eprosima::fastdds::dds::TopicDataType* ptr };
47+
void set(eprosima::fastdds::dds::TopicDataType* ptr)
4848
{
4949
self->reset(ptr);
5050
}

‎fastdds_python/test/api/test_datareader.py‎

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

‎fastdds_python/test/api/test_datawriter.py‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ def datawriter(participant, topic, publisher, datawriter_qos):
7272

7373
yield datawriter
7474

75-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
75+
assert(fastdds.RETCODE_OK ==
7676
publisher.delete_datawriter(datawriter))
77-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
77+
assert(fastdds.RETCODE_OK ==
7878
participant.delete_topic(topic))
79-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
79+
assert(fastdds.RETCODE_OK ==
8080
participant.delete_publisher(publisher))
8181
factory = fastdds.DomainParticipantFactory.get_instance()
82-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
82+
assert(fastdds.RETCODE_OK ==
8383
factory.delete_participant(participant))
8484

8585

@@ -107,7 +107,7 @@ def test_assert_liveliness(manual_liveliness_datawriter_qos, datawriter):
107107
This test checks:
108108
- DataWriter::assert_liveliness
109109
"""
110-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
110+
assert(fastdds.RETCODE_OK ==
111111
datawriter.assert_liveliness())
112112

113113

@@ -119,7 +119,7 @@ def test_clear_history(keep_all_datawriter_qos, datawriter):
119119
sample = pytest.dds_type.CompleteTestType()
120120
sample.int16_field(4)
121121
assert(datawriter.write(sample))
122-
assert([fastdds.ReturnCode_t.RETCODE_OK, 1] ==
122+
assert([fastdds.RETCODE_OK, 1] ==
123123
datawriter.clear_history())
124124

125125

@@ -140,9 +140,9 @@ def test_dispose(test_keyed_type, datawriter):
140140
ih2 = datawriter.register_instance(sample2)
141141
assert(fastdds.c_InstanceHandle_Unknown != ih2)
142142
assert(ih2 != ih)
143-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
143+
assert(fastdds.RETCODE_OK ==
144144
datawriter.dispose(sample, ih))
145-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
145+
assert(fastdds.RETCODE_OK ==
146146
datawriter.dispose(sample2, ih2))
147147

148148
# Overload 2
@@ -153,7 +153,7 @@ def test_dispose(test_keyed_type, datawriter):
153153
timestamp.seconds = now.second
154154
ih = datawriter.register_instance_w_timestamp(sample, timestamp)
155155
assert(fastdds.c_InstanceHandle_Unknown != ih)
156-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
156+
assert(fastdds.RETCODE_OK ==
157157
datawriter.dispose_w_timestamp(sample, ih, timestamp))
158158

159159

@@ -188,39 +188,39 @@ def test_get_key_value(test_keyed_type, datawriter):
188188

189189
# Check wrong handle
190190
test_sample = pytest.dds_type.KeyedCompleteTestType()
191-
assert(fastdds.ReturnCode_t.RETCODE_BAD_PARAMETER ==
191+
assert(fastdds.RETCODE_BAD_PARAMETER ==
192192
datawriter.get_key_value(test_sample, fastdds.c_InstanceHandle_Unknown))
193193

194194
# Check wrong sample
195-
assert(fastdds.ReturnCode_t.RETCODE_BAD_PARAMETER ==
195+
assert(fastdds.RETCODE_BAD_PARAMETER ==
196196
datawriter.get_key_value(None, ih))
197197

198198
# Check correct case
199199
test_sample = pytest.dds_type.KeyedCompleteTestType()
200-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
200+
assert(fastdds.RETCODE_OK ==
201201
datawriter.get_key_value(test_sample, ih))
202202
assert(test_sample.id() == sample.id());
203203

204204
# Calling get_key_value on an unregistered instance should fail
205205
test_sample = pytest.dds_type.KeyedCompleteTestType()
206-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
206+
assert(fastdds.RETCODE_OK ==
207207
datawriter.unregister_instance(sample, ih))
208-
assert(fastdds.ReturnCode_t.RETCODE_BAD_PARAMETER ==
208+
assert(fastdds.RETCODE_BAD_PARAMETER ==
209209
datawriter.get_key_value(test_sample, ih))
210210

211211
# Calling get_key_value with a valid instance should work
212212
test_sample = pytest.dds_type.KeyedCompleteTestType()
213-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
213+
assert(fastdds.RETCODE_OK ==
214214
datawriter.write(sample, fastdds.c_InstanceHandle_Unknown))
215-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
215+
assert(fastdds.RETCODE_OK ==
216216
datawriter.get_key_value(test_sample, ih))
217217
assert(test_sample.id() == sample.id());
218218

219219
# Calling get_key_value on a disposed instance should work
220220
test_sample = pytest.dds_type.KeyedCompleteTestType()
221-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
221+
assert(fastdds.RETCODE_OK ==
222222
datawriter.dispose(sample, ih))
223-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
223+
assert(fastdds.RETCODE_OK ==
224224
datawriter.get_key_value(test_sample, ih))
225225
assert(test_sample.id() == sample.id());
226226

@@ -231,7 +231,7 @@ def test_get_sending_locators(datawriter):
231231
- DataWriter::get_sending_locators
232232
"""
233233
locator_list = fastdds.LocatorList()
234-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
234+
assert(fastdds.RETCODE_OK ==
235235
datawriter.get_sending_locators(locator_list))
236236
assert(0 < locator_list.size())
237237

@@ -248,7 +248,7 @@ def test_get_set_listener(datawriter):
248248
# Overload 1
249249
listener = DataWriterListener()
250250
assert(listener is not None)
251-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
251+
assert(fastdds.RETCODE_OK ==
252252
datawriter.set_listener(listener))
253253
assert(datawriter.get_listener() == listener)
254254
assert(fastdds.StatusMask.all() == datawriter.get_status_mask())
@@ -259,13 +259,13 @@ def test(status_mask_1, status_mask_2):
259259
"""
260260
listener = DataWriterListener()
261261
assert(listener is not None)
262-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
262+
assert(fastdds.RETCODE_OK ==
263263
datawriter.set_listener(listener, status_mask_1))
264264
assert(datawriter.get_listener() == listener)
265265
assert(status_mask_1 == datawriter.get_status_mask())
266266
listener = DataWriterListener()
267267
assert(listener is not None)
268-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
268+
assert(fastdds.RETCODE_OK ==
269269
datawriter.set_listener(listener, status_mask_2))
270270
assert(datawriter.get_listener() == listener)
271271
assert(status_mask_2 == datawriter.get_status_mask())
@@ -337,7 +337,7 @@ def test_get_liveliness_lost_status(datawriter):
337337
- DataWriter::get_liveliness_lost_status
338338
"""
339339
status = fastdds.LivelinessLostStatus()
340-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
340+
assert(fastdds.RETCODE_OK ==
341341
datawriter.get_liveliness_lost_status(status))
342342
assert(0 == status.total_count)
343343
assert(0 == status.total_count_change)
@@ -350,7 +350,7 @@ def test_get_matched_subscription_data(datawriter):
350350
"""
351351
sub_data = fastdds.SubscriptionBuiltinTopicData()
352352
ih = fastdds.InstanceHandle_t()
353-
assert(fastdds.ReturnCode_t.RETCODE_UNSUPPORTED ==
353+
assert(fastdds.RETCODE_UNSUPPORTED ==
354354
datawriter.get_matched_subscription_data(sub_data, ih))
355355

356356

@@ -360,7 +360,7 @@ def test_get_matched_subscriptions(datawriter):
360360
- DataWriter::get_matched_subscriptions
361361
"""
362362
ihs = fastdds.InstanceHandleVector()
363-
assert(fastdds.ReturnCode_t.RETCODE_UNSUPPORTED ==
363+
assert(fastdds.RETCODE_UNSUPPORTED ==
364364
datawriter.get_matched_subscriptions(ihs))
365365

366366

@@ -370,7 +370,7 @@ def test_get_offered_deadline_missed_status(datawriter):
370370
- DataWriter::get_offered_deadline_missed_status
371371
"""
372372
status = fastdds.OfferedDeadlineMissedStatus()
373-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
373+
assert(fastdds.RETCODE_OK ==
374374
datawriter.get_offered_deadline_missed_status(status))
375375
assert(0 == status.total_count)
376376
assert(0 == status.total_count_change)
@@ -383,7 +383,7 @@ def test_get_offered_incompatible_qos_status(datawriter):
383383
- DataWriter::get_offered_deadline_missed_status
384384
"""
385385
status = fastdds.OfferedIncompatibleQosStatus()
386-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
386+
assert(fastdds.RETCODE_OK ==
387387
datawriter.get_offered_incompatible_qos_status(status))
388388
assert(0 == status.total_count)
389389
assert(0 == status.total_count_change)
@@ -402,7 +402,7 @@ def test_get_publication_matched_status(datawriter):
402402
- DataWriter::get_publication_matched_status
403403
"""
404404
status = fastdds.PublicationMatchedStatus()
405-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
405+
assert(fastdds.RETCODE_OK ==
406406
datawriter.get_publication_matched_status(status))
407407
assert(0 == status.total_count)
408408
assert(0 == status.total_count_change)
@@ -469,11 +469,11 @@ def test_register_instance(test_keyed_type, datawriter):
469469
ih2 = datawriter.register_instance(sample2)
470470
assert(fastdds.c_InstanceHandle_Unknown != ih2)
471471
assert(ih2 != ih)
472-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
472+
assert(fastdds.RETCODE_OK ==
473473
datawriter.unregister_instance(sample, ih))
474-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
474+
assert(fastdds.RETCODE_OK ==
475475
datawriter.unregister_instance(sample2, ih2))
476-
assert(fastdds.ReturnCode_t.RETCODE_PRECONDITION_NOT_MET ==
476+
assert(fastdds.RETCODE_PRECONDITION_NOT_MET ==
477477
datawriter.unregister_instance(
478478
sample, fastdds.c_InstanceHandle_Unknown))
479479

@@ -485,7 +485,7 @@ def test_register_instance(test_keyed_type, datawriter):
485485
timestamp.seconds = now.second
486486
ih = datawriter.register_instance_w_timestamp(sample, timestamp)
487487
assert(fastdds.c_InstanceHandle_Unknown != ih)
488-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
488+
assert(fastdds.RETCODE_OK ==
489489
datawriter.unregister_instance_w_timestamp(sample, ih, timestamp))
490490

491491

@@ -498,13 +498,13 @@ def test_wait_for_acknowledgments(test_keyed_type, datawriter):
498498
sample = pytest.dds_type.KeyedCompleteTestType()
499499
sample.id(3)
500500
assert(datawriter.write(sample))
501-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
501+
assert(fastdds.RETCODE_OK ==
502502
datawriter.wait_for_acknowledgments(fastdds.Duration_t(1, 0)))
503503

504504
# Overload 2
505505
ih = datawriter.register_instance(sample)
506506
assert(fastdds.c_InstanceHandle_Unknown != ih)
507-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
507+
assert(fastdds.RETCODE_OK ==
508508
datawriter.wait_for_acknowledgments(
509509
sample, ih, fastdds.Duration_t(1, 0)))
510510

@@ -536,11 +536,11 @@ def test_write(test_keyed_type, datawriter):
536536
sample = pytest.dds_type.KeyedCompleteTestType()
537537
sample.id(1)
538538
ih = fastdds.InstanceHandle_t()
539-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
539+
assert(fastdds.RETCODE_OK ==
540540
datawriter.write(sample, ih))
541541
ih = fastdds.InstanceHandle_t()
542542
ih.value = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
543-
assert(fastdds.ReturnCode_t.RETCODE_PRECONDITION_NOT_MET ==
543+
assert(fastdds.RETCODE_PRECONDITION_NOT_MET ==
544544
datawriter.write(sample, ih))
545545

546546
# Overload 4
@@ -550,7 +550,7 @@ def test_write(test_keyed_type, datawriter):
550550
now = datetime.datetime.now().time()
551551
timestamp = fastdds.Time_t()
552552
timestamp.seconds = now.second
553-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
553+
assert(fastdds.RETCODE_OK ==
554554
datawriter.write_w_timestamp(sample, ih, timestamp))
555555

556556
def test_listener_ownership(participant, reader_participant, topic,
@@ -566,19 +566,19 @@ def create_datawriter():
566566
reader_topic, fastdds.DATAREADER_QOS_DEFAULT)
567567
time.sleep(1)
568568
factory = fastdds.DomainParticipantFactory.get_instance()
569-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
569+
assert(fastdds.RETCODE_OK ==
570570
subscriber.delete_datareader(datareader))
571-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
571+
assert(fastdds.RETCODE_OK ==
572572
reader_participant.delete_topic(reader_topic))
573-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
573+
assert(fastdds.RETCODE_OK ==
574574
reader_participant.delete_subscriber(subscriber))
575-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
575+
assert(fastdds.RETCODE_OK ==
576576
factory.delete_participant(reader_participant))
577-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
577+
assert(fastdds.RETCODE_OK ==
578578
publisher.delete_datawriter(datawriter))
579-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
579+
assert(fastdds.RETCODE_OK ==
580580
participant.delete_topic(topic))
581-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
581+
assert(fastdds.RETCODE_OK ==
582582
participant.delete_publisher(publisher))
583-
assert(fastdds.ReturnCode_t.RETCODE_OK ==
583+
assert(fastdds.RETCODE_OK ==
584584
factory.delete_participant(participant))

0 commit comments

Comments
 (0)