From 15ed0271e7ce3bb3754e770579d74c82eff204f0 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Thu, 4 Apr 2024 12:30:02 +0200 Subject: [PATCH] Refs #20401: Fix segfault in Mac tests Signed-off-by: JesusPoderoso --- test/unittest/dds/publisher/DataWriterTests.cpp | 8 +++++--- test/unittest/dds/subscriber/DataReaderTests.cpp | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index 7485f801e8e..9b7de755dee 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -1587,9 +1587,11 @@ TEST(DataWriterTests, history_depth_max_samples_per_instance_warning) ASSERT_EQ(wait_for_log_entries(expected_entries, retries, wait_ms), expected_entries); /* Tear down */ - participant->delete_contained_entities(); - DomainParticipantFactory::get_instance()->delete_participant(participant); - Log::KillThread(); + ASSERT_EQ(publisher->delete_datawriter(datawriter_1), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(publisher->delete_datawriter(datawriter_2), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(participant->delete_publisher(publisher), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(participant->delete_topic(topic), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(DomainParticipantFactory::get_instance()->delete_participant(participant), ReturnCode_t::RETCODE_OK); } } // namespace dds diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index bdc9d43af31..d0afc841d57 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -2723,9 +2723,12 @@ TEST_F(DataReaderTests, history_depth_max_samples_per_instance_warning) ASSERT_EQ(wait_for_log_entries(expected_entries, retries, wait_ms), expected_entries); /* Tear down */ - participant->delete_contained_entities(); - DomainParticipantFactory::get_instance()->delete_participant(participant); - Log::KillThread(); + ASSERT_EQ(subscriber->delete_datareader(datareader_1), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(subscriber->delete_datareader(datareader_2), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(participant->delete_subscriber(subscriber), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(participant->delete_topic(topic), ReturnCode_t::RETCODE_OK); + ASSERT_EQ(DomainParticipantFactory::get_instance()->delete_participant(participant), ReturnCode_t::RETCODE_OK); + } } // namespace dds