Refs #20679: Apply Miguel's suggestions

Signed-off-by: EduPonz <[email protected]>
eProsima · Apr 2, 2024 · 670c7c7 · 670c7c7
1 parent 1c00b30
commit 670c7c7
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<uint32_t()> (
-                void* data, DataRepresentationId_t data_representation));
-
     MOCK_METHOD1(getSerializedSizeProvider, std::function<uint32_t()> (
                 void* data));
 

diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,9 +161,6 @@ class LoanableTopicDataTypeMock : public TopicDataType @@
             return true;
         }
-    private:
-        using TopicDataType::is_plain;
     };
@@ Expand Down @@