Skip to content

Commit ce47e12

Browse files
committed
Refs #21711: Update unsupported api tests and fastrtps_deprecated api
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
1 parent 4eeb15d commit ce47e12

3 files changed

Lines changed: 5 additions & 28 deletions

File tree

test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ class PubSubWriter
11741174
return *this;
11751175
}
11761176

1177-
PubSubWriter& userData(
1177+
PubSubWriter& user_data(
11781178
std::vector<eprosima::fastrtps::rtps::octet> user_data)
11791179
{
11801180
participant_attr_.rtps.userData = user_data;

test/unittest/dds/publisher/DataWriterTests.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,9 +1755,7 @@ class DataWriterUnsupportedTests : public ::testing::Test
17551755
/*
17561756
* This test checks that the DataWriter methods defined in the standard not yet implemented in FastDDS return
17571757
* ReturnCode_t::RETCODE_UNSUPPORTED. The following methods are checked:
1758-
* 1. get_matched_subscription_data
1759-
* 2. get_matched_subscriptions
1760-
* 3. lookup_instance
1758+
* 1. lookup_instance
17611759
*/
17621760
TEST_F(DataWriterUnsupportedTests, UnsupportedDataWriterMethods)
17631761
{
@@ -1777,15 +1775,6 @@ TEST_F(DataWriterUnsupportedTests, UnsupportedDataWriterMethods)
17771775
DataWriter* data_writer = publisher->create_datawriter(topic, DATAWRITER_QOS_DEFAULT);
17781776
ASSERT_NE(publisher, nullptr);
17791777

1780-
builtin::SubscriptionBuiltinTopicData subscription_data;
1781-
fastrtps::rtps::InstanceHandle_t subscription_handle;
1782-
EXPECT_EQ(
1783-
ReturnCode_t::RETCODE_UNSUPPORTED,
1784-
data_writer->get_matched_subscription_data(subscription_data, subscription_handle));
1785-
1786-
std::vector<InstanceHandle_t> subscription_handles;
1787-
EXPECT_EQ(ReturnCode_t::RETCODE_UNSUPPORTED, data_writer->get_matched_subscriptions(subscription_handles));
1788-
17891778
EXPECT_EQ(HANDLE_NIL, data_writer->lookup_instance(nullptr /* instance */));
17901779

17911780
// Expected logWarnings: lookup_instance

test/unittest/dds/subscriber/DataReaderTests.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,11 +2597,9 @@ class DataReaderUnsupportedTests : public ::testing::Test
25972597
/*
25982598
* This test checks that the DataReader methods defined in the standard not yet implemented in FastDDS return
25992599
* ReturnCode_t::RETCODE_UNSUPPORTED. The following methods are checked:
2600-
* 1. get_matched_publication_data
2601-
* 2. create_querycondition
2602-
* 3. get_matched_publications
2603-
* 4. get_key_value
2604-
* 5. wait_for_historical_data
2600+
* 1. create_querycondition
2601+
* 2. get_key_value
2602+
* 3. wait_for_historical_data
26052603
*/
26062604
TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26072605
{
@@ -2621,13 +2619,6 @@ TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26212619

26222620
DataReader* data_reader = subscriber->create_datareader(topic, DATAREADER_QOS_DEFAULT);
26232621
ASSERT_NE(data_reader, nullptr);
2624-
2625-
builtin::PublicationBuiltinTopicData publication_data;
2626-
InstanceHandle_t publication_handle;
2627-
EXPECT_EQ(
2628-
ReturnCode_t::RETCODE_UNSUPPORTED,
2629-
data_reader->get_matched_publication_data(publication_data, publication_handle));
2630-
26312622
{
26322623
SampleStateMask sample_states = ANY_SAMPLE_STATE;
26332624
ViewStateMask view_states = ANY_VIEW_STATE;
@@ -2644,9 +2635,6 @@ TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26442635
query_parameters));
26452636
}
26462637

2647-
std::vector<InstanceHandle_t> publication_handles;
2648-
EXPECT_EQ(ReturnCode_t::RETCODE_UNSUPPORTED, data_reader->get_matched_publications(publication_handles));
2649-
26502638
InstanceHandle_t key_handle;
26512639
EXPECT_EQ(ReturnCode_t::RETCODE_UNSUPPORTED, data_reader->get_key_value(nullptr, key_handle));
26522640

0 commit comments

Comments
 (0)