From 9a6e632290d6e5b75c43deb9be0350483994d073 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Thu, 26 Sep 2024 09:28:45 +0200 Subject: [PATCH] Refs #21710: Rename get_matched_guids() method to matched_writers/readers_guids() Signed-off-by: Mario Dominguez --- include/fastdds/rtps/reader/RTPSReader.h | 2 +- include/fastdds/rtps/writer/RTPSWriter.h | 2 +- src/cpp/rtps/reader/RTPSReader.cpp | 2 +- src/cpp/rtps/writer/RTPSWriter.cpp | 2 +- test/blackbox/common/RTPSBlackboxTestsReader.cpp | 8 ++++---- test/blackbox/common/RTPSBlackboxTestsWriter.cpp | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.h index 000a64bc841..124d7258d53 100644 --- a/include/fastdds/rtps/reader/RTPSReader.h +++ b/include/fastdds/rtps/reader/RTPSReader.h @@ -282,7 +282,7 @@ class RTPSReader * @param[out] guids Vector to be filled with the GUIDs of the matched writers. * @return True if the operation was successful. */ - RTPS_DllAPI bool get_matched_guids( + RTPS_DllAPI bool matched_writers_guids( std::vector& guids) const; /*! diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.h index 6a821ce98e1..d8d0c753a7d 100644 --- a/include/fastdds/rtps/writer/RTPSWriter.h +++ b/include/fastdds/rtps/writer/RTPSWriter.h @@ -323,7 +323,7 @@ class RTPSWriter * @param[out] guids Vector to be filled with the GUIDs of the matched readers. * @return True if the operation was successful. */ - RTPS_DllAPI bool get_matched_guids( + RTPS_DllAPI bool matched_readers_guids( std::vector& guids) const; /** diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp index 3bacdab992d..17822930d3a 100644 --- a/src/cpp/rtps/reader/RTPSReader.cpp +++ b/src/cpp/rtps/reader/RTPSReader.cpp @@ -435,7 +435,7 @@ bool RTPSReader::is_sample_valid( return true; } -bool RTPSReader::get_matched_guids( +bool RTPSReader::matched_writers_guids( std::vector&) const { return false; diff --git a/src/cpp/rtps/writer/RTPSWriter.cpp b/src/cpp/rtps/writer/RTPSWriter.cpp index 316a7b5994e..8ce1b9eb3e2 100644 --- a/src/cpp/rtps/writer/RTPSWriter.cpp +++ b/src/cpp/rtps/writer/RTPSWriter.cpp @@ -462,7 +462,7 @@ bool RTPSWriter::send_nts( locator_selector.locator_selector.end(), max_blocking_time_point); } -bool RTPSWriter::get_matched_guids( +bool RTPSWriter::matched_readers_guids( std::vector&) const { return false; diff --git a/test/blackbox/common/RTPSBlackboxTestsReader.cpp b/test/blackbox/common/RTPSBlackboxTestsReader.cpp index 2ddb8d0210f..1099f01567c 100644 --- a/test/blackbox/common/RTPSBlackboxTestsReader.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsReader.cpp @@ -79,9 +79,9 @@ class RTPSReaderTests : public testing::TestWithParam }; /** - * Tests get_matched_guids() RTPSReader API + * Tests matched_writers_guids() RTPSReader API */ -TEST_P(RTPSReaderTests, rtpsreader_get_matched_guids) +TEST_P(RTPSReaderTests, rtpsreader_matched_writers_guids) { RTPSWithRegistrationReader reader(TEST_TOPIC_NAME); RTPSWithRegistrationWriter writer(TEST_TOPIC_NAME); @@ -101,7 +101,7 @@ TEST_P(RTPSReaderTests, rtpsreader_get_matched_guids) std::vector matched_guids; auto& native_rtps_reader = reader.get_native_reader(); - ASSERT_FALSE(native_rtps_reader.get_matched_guids(matched_guids)); + ASSERT_FALSE(native_rtps_reader.matched_writers_guids(matched_guids)); ASSERT_TRUE(matched_guids.empty()); writer.destroy(); @@ -123,7 +123,7 @@ TEST_P(RTPSReaderTests, rtpsreader_get_matched_guids) reader.wait_discovery(num_matched_writers, std::chrono::seconds::zero()); ASSERT_EQ(num_matched_writers, reader.get_matched()); - native_rtps_reader.get_matched_guids(matched_guids); + native_rtps_reader.matched_writers_guids(matched_guids); ASSERT_EQ(expected_matched_guids.size(), matched_guids.size()); ASSERT_TRUE(std::is_permutation(expected_matched_guids.begin(), expected_matched_guids.end(), matched_guids.begin())); diff --git a/test/blackbox/common/RTPSBlackboxTestsWriter.cpp b/test/blackbox/common/RTPSBlackboxTestsWriter.cpp index 5a48f620f04..f75275ad8d0 100644 --- a/test/blackbox/common/RTPSBlackboxTestsWriter.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsWriter.cpp @@ -79,9 +79,9 @@ class RTPSWriterTests : public testing::TestWithParam }; /** - * Tests get_matched_guids() RTPSWriter API + * Tests matched_readers_guids() RTPSWriter API */ -TEST_P(RTPSWriterTests, rtpswriter_get_matched_guids) +TEST_P(RTPSWriterTests, rtpswriter_matched_readers_guids) { RTPSWithRegistrationWriter writer(TEST_TOPIC_NAME); RTPSWithRegistrationReader reader(TEST_TOPIC_NAME); @@ -101,7 +101,7 @@ TEST_P(RTPSWriterTests, rtpswriter_get_matched_guids) std::vector matched_guids; auto& native_rtps_writer = writer.get_native_writer(); - ASSERT_FALSE(native_rtps_writer.get_matched_guids(matched_guids)); + ASSERT_FALSE(native_rtps_writer.matched_readers_guids(matched_guids)); ASSERT_TRUE(matched_guids.empty()); reader.destroy(); @@ -123,7 +123,7 @@ TEST_P(RTPSWriterTests, rtpswriter_get_matched_guids) writer.wait_discovery(num_matched_readers, std::chrono::seconds::zero()); ASSERT_EQ(num_matched_readers, writer.get_matched()); - native_rtps_writer.get_matched_guids(matched_guids); + native_rtps_writer.matched_readers_guids(matched_guids); ASSERT_EQ(expected_matched_guids.size(), matched_guids.size()); ASSERT_TRUE(std::is_permutation(expected_matched_guids.begin(), expected_matched_guids.end(), matched_guids.begin()));