From 670c7c7f36c7b8960d717db865ea7eade5665ce4 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Tue, 2 Apr 2024 12:50:32 +0200 Subject: [PATCH] Refs #20679: Apply Miguel's suggestions Signed-off-by: EduPonz --- test/blackbox/common/DDSBlackboxTestsFindTopic.cpp | 4 ---- test/performance/latency/LatencyTestTypes.hpp | 4 ---- test/performance/throughput/ThroughputTypes.hpp | 4 ---- test/unittest/dds/participant/ParticipantTests.cpp | 3 --- test/unittest/dds/publisher/DataWriterTests.cpp | 1 - test/unittest/dds/publisher/PublisherTests.cpp | 3 --- test/unittest/dds/status/ListenerTests.cpp | 4 ---- test/unittest/dds/subscriber/DataReaderHistoryTests.cpp | 8 -------- test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp | 3 --- test/unittest/dds/subscriber/FooTypeSupport.hpp | 3 --- test/unittest/dds/topic/TopicTests.cpp | 4 ---- .../statistics/dds/StatisticsDomainParticipantTests.cpp | 4 ---- 12 files changed, 45 deletions(-) diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index ce274a7aab7..ae3cbda37c6 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -98,10 +98,6 @@ class DDSFindTopicTest : public testing::Test return false; } - private: - - using TopicDataType::getSerializedSizeProvider; - using TopicDataType::serialize; }; public: diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index a675110fcbf..b288cd8b6fa 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -142,10 +142,6 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType // Name static const std::string type_name_; - -private: - - using eprosima::fastrtps::TopicDataType::is_plain; }; enum TESTCOMMAND : uint32_t diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index 1ff9f06a2ac..d62abd894ae 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -179,10 +179,6 @@ class ThroughputDataType : public eprosima::fastrtps::TopicDataType // Name static const std::string type_name_; - -private: - - using eprosima::fastrtps::TopicDataType::is_plain; }; enum e_Command : uint32_t diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index c3741815c60..c18bfefdebd 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -219,9 +219,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } -private: - - using TopicDataType::is_plain; }; class BarType diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index 224c09be10b..c1ccfa460a1 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -1280,7 +1280,6 @@ class LoanableTypeSupport : public TopicDataType public: typedef LoanableType type; - using TopicDataType::is_plain; LoanableTypeSupport() : TopicDataType() diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index 253a41e3780..d1671125c29 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -161,9 +161,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } -private: - - using TopicDataType::is_plain; }; diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index 61afbb40dcf..ed4c3e962b1 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -535,10 +535,6 @@ class TopicDataTypeMock : public TopicDataType return true; } -private: - - using TopicDataType::getSerializedSizeProvider; - using TopicDataType::serialize; }; class UserListeners : public ::testing::Test diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 5efd99bf2b6..b80e24c6847 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -21,18 +21,10 @@ class TestType : public TopicDataType void* data, eprosima::fastrtps::rtps::SerializedPayload_t* payload)); - MOCK_METHOD3(serialize, bool( - void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, - DataRepresentationId_t data_representation)); - MOCK_METHOD2(deserialize, bool( eprosima::fastrtps::rtps::SerializedPayload_t* payload, void* data)); - MOCK_METHOD2(getSerializedSizeProvider, std::function ( - void* data, DataRepresentationId_t data_representation)); - MOCK_METHOD1(getSerializedSizeProvider, std::function ( void* data)); diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index 3f3cdb4a113..ec83066fa40 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -144,9 +144,6 @@ class FooBoundedTypeSupport : public TopicDataType return false; } -private: - - using TopicDataType::is_plain; }; } // namespace dds diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index bcf70414eb7..c85faf50c98 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -169,9 +169,6 @@ class FooTypeSupport : public TopicDataType return true; } -private: - - using TopicDataType::is_plain; }; } // namespace dds diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index 7f004619090..a5bb4c4aa9f 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -124,10 +124,6 @@ class TopicDataTypeMock : public TopicDataType return true; } -private: - - using TopicDataType::getSerializedSizeProvider; - using TopicDataType::serialize; }; TEST(TopicTests, ChangeTopicQos) diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index aaa34188199..50fc6ef1239 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -130,10 +130,6 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType return true; } -private: - - using eprosima::fastdds::dds::TopicDataType::getSerializedSizeProvider; - using eprosima::fastdds::dds::TopicDataType::serialize; }; class StatisticsDomainParticipantTests : public ::testing::Test