Skip to content

Commit

Permalink
Refs #21709: Minor changes to be coherent with latest design updates
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Dominguez <[email protected]>
  • Loading branch information
Mario-DL committed Sep 27, 2024
1 parent 9a6e632 commit f357099
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions include/fastdds/rtps/participant/RTPSParticipant.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ class RTPS_DllAPI RTPSParticipant
* @return True if the writer was found and the data was filled.
*/
bool get_publication_info(
const GUID_t& writer_guid,
fastdds::dds::builtin::PublicationBuiltinTopicData& data) const;
fastdds::dds::builtin::PublicationBuiltinTopicData& data,
const GUID_t& writer_guid) const;

/**
* @brief Fills the provided SubscriptionBuiltinTopicData with the information of the
Expand All @@ -329,8 +329,8 @@ class RTPS_DllAPI RTPSParticipant
* @return True if the reader was found and the data was filled.
*/
bool get_subscription_info(
const GUID_t& reader_guid,
fastdds::dds::builtin::SubscriptionBuiltinTopicData& data) const;
fastdds::dds::builtin::SubscriptionBuiltinTopicData& data,
const GUID_t& reader_guid) const;

#if HAVE_SECURITY

Expand Down
8 changes: 4 additions & 4 deletions src/cpp/rtps/participant/RTPSParticipant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,15 @@ std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipant::get_netm
}

bool RTPSParticipant::get_publication_info(
const GUID_t&,
fastdds::dds::builtin::PublicationBuiltinTopicData&) const
fastdds::dds::builtin::PublicationBuiltinTopicData&,
const GUID_t&) const
{
return false;
}

bool RTPSParticipant::get_subscription_info(
const GUID_t&,
fastdds::dds::builtin::SubscriptionBuiltinTopicData&) const
fastdds::dds::builtin::SubscriptionBuiltinTopicData&,
const GUID_t&) const
{
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/common/RTPSBlackboxTestsBasic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1426,14 +1426,14 @@ TEST_P(RTPS, rtps_participant_get_pubsub_info)
eprosima::fastdds::dds::builtin::SubscriptionBuiltinTopicData subdata;

// Get publication info from the reader participant and validate it
bool ret = reader.get_rtps_participant()->get_publication_info(writer.guid(), pubdata);
bool ret = reader.get_rtps_participant()->get_publication_info(pubdata, writer.guid());
ASSERT_TRUE(ret);
ASSERT_TRUE(validate_publication_builtin_topic_data(pubdata, writer.get_native_writer(),
writer.get_topic_attributes(),
writer.get_writerqos(), reader.get_rtps_participant()->getGuid()));

// Get subscription info from the reader participant and validate it
ret = writer.get_rtps_participant()->get_subscription_info(reader.guid(), subdata);
ret = writer.get_rtps_participant()->get_subscription_info(subdata, reader.guid());
ASSERT_TRUE(ret);
ASSERT_TRUE(validate_subscription_builtin_topic_data(subdata, reader.get_native_reader(),
reader.get_topic_attributes(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@ class RTPS_DllAPI RTPSParticipant

MOCK_METHOD2(
get_publication_info, bool(
const GUID_t& writer_guid,
fastdds::dds::builtin::PublicationBuiltinTopicData& data));
fastdds::dds::builtin::PublicationBuiltinTopicData& data,
const GUID_t& writer_guid));

MOCK_METHOD2(
get_subscription_info, bool(
const GUID_t& writer_guid,
fastdds::dds::builtin::SubscriptionBuiltinTopicData& data));
fastdds::dds::builtin::SubscriptionBuiltinTopicData& data,
const GUID_t& reader_guid));

const RTPSParticipantAttributes& getRTPSParticipantAttributes()
{
Expand Down

0 comments on commit f357099

Please sign in to comment.