Skip to content

Commit 23914aa

Browse files
committed
Refs #21808: Update UnsupportedData*Methods
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
1 parent 5bb5ffc commit 23914aa

2 files changed

Lines changed: 4 additions & 26 deletions

File tree

test/unittest/dds/publisher/DataWriterTests.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,9 +1733,7 @@ class DataWriterUnsupportedTests : public ::testing::Test
17331733
/*
17341734
* This test checks that the DataWriter methods defined in the standard not yet implemented in FastDDS return
17351735
* RETCODE_UNSUPPORTED. The following methods are checked:
1736-
* 1. get_matched_subscription_data
1737-
* 2. get_matched_subscriptions
1738-
* 3. lookup_instance
1736+
* 1. lookup_instance
17391737
*/
17401738
TEST_F(DataWriterUnsupportedTests, UnsupportedDataWriterMethods)
17411739
{
@@ -1755,15 +1753,6 @@ TEST_F(DataWriterUnsupportedTests, UnsupportedDataWriterMethods)
17551753
DataWriter* data_writer = publisher->create_datawriter(topic, DATAWRITER_QOS_DEFAULT);
17561754
ASSERT_NE(publisher, nullptr);
17571755

1758-
SubscriptionBuiltinTopicData subscription_data;
1759-
fastdds::rtps::InstanceHandle_t subscription_handle;
1760-
EXPECT_EQ(
1761-
RETCODE_UNSUPPORTED,
1762-
data_writer->get_matched_subscription_data(subscription_data, subscription_handle));
1763-
1764-
std::vector<InstanceHandle_t> subscription_handles;
1765-
EXPECT_EQ(RETCODE_UNSUPPORTED, data_writer->get_matched_subscriptions(subscription_handles));
1766-
17671756
EXPECT_EQ(HANDLE_NIL, data_writer->lookup_instance(nullptr /* instance */));
17681757

17691758
// Expected logWarnings: lookup_instance

test/unittest/dds/subscriber/DataReaderTests.cpp

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2623,11 +2623,9 @@ class DataReaderUnsupportedTests : public ::testing::Test
26232623
/*
26242624
* This test checks that the DataReader methods defined in the standard not yet implemented in FastDDS return
26252625
* RETCODE_UNSUPPORTED. The following methods are checked:
2626-
* 1. get_matched_publication_data
2627-
* 2. create_querycondition
2628-
* 3. get_matched_publications
2629-
* 4. get_key_value
2630-
* 5. wait_for_historical_data
2626+
* 1. create_querycondition
2627+
* 2. get_key_value
2628+
* 3. wait_for_historical_data
26312629
*/
26322630
TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26332631
{
@@ -2648,12 +2646,6 @@ TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26482646
DataReader* data_reader = subscriber->create_datareader(topic, DATAREADER_QOS_DEFAULT);
26492647
ASSERT_NE(data_reader, nullptr);
26502648

2651-
PublicationBuiltinTopicData publication_data;
2652-
InstanceHandle_t publication_handle;
2653-
EXPECT_EQ(
2654-
RETCODE_UNSUPPORTED,
2655-
data_reader->get_matched_publication_data(publication_data, publication_handle));
2656-
26572649
{
26582650
SampleStateMask sample_states = ANY_SAMPLE_STATE;
26592651
ViewStateMask view_states = ANY_VIEW_STATE;
@@ -2670,9 +2662,6 @@ TEST_F(DataReaderUnsupportedTests, UnsupportedDataReaderMethods)
26702662
query_parameters));
26712663
}
26722664

2673-
std::vector<InstanceHandle_t> publication_handles;
2674-
EXPECT_EQ(RETCODE_UNSUPPORTED, data_reader->get_matched_publications(publication_handles));
2675-
26762665
InstanceHandle_t key_handle;
26772666
EXPECT_EQ(RETCODE_UNSUPPORTED, data_reader->get_key_value(nullptr, key_handle));
26782667

0 commit comments

Comments
 (0)