From 27d05575c5d8bc714d5bb0d8bc2732854e566dc7 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 9 Jul 2024 13:16:22 +0200 Subject: [PATCH] Refs #21137. Namespace suggestion. Signed-off-by: Miguel Company --- src/cpp/rtps/flowcontrol/FlowController.hpp | 14 +- src/cpp/rtps/writer/StatefulWriter.cpp | 3 - src/cpp/rtps/writer/StatefulWriter.hpp | 2 +- src/cpp/rtps/writer/StatelessWriter.cpp | 3 - src/cpp/rtps/writer/StatelessWriter.hpp | 14 +- .../rtps/writer/StatefulWriter.hpp | 8 +- .../rtps/writer/StatelessWriter.hpp | 2 +- ...FlowControllerPublishModesOnAsyncTests.cpp | 94 ++++----- ...trollerPublishModesOnLimitedAsyncTests.cpp | 182 +++++++++--------- ...wControllerPublishModesOnPureSyncTests.cpp | 22 +-- .../FlowControllerPublishModesOnSyncTests.cpp | 78 ++++---- 11 files changed, 208 insertions(+), 214 deletions(-) diff --git a/src/cpp/rtps/flowcontrol/FlowController.hpp b/src/cpp/rtps/flowcontrol/FlowController.hpp index 6ca227b9ce4..8a25ccb8dcd 100644 --- a/src/cpp/rtps/flowcontrol/FlowController.hpp +++ b/src/cpp/rtps/flowcontrol/FlowController.hpp @@ -33,7 +33,7 @@ class FlowController * @param writer Pointer to the writer to be registered. Cannot be nullptr. */ virtual void register_writer( - fastdds::rtps::BaseWriter* writer) = 0; + BaseWriter* writer) = 0; /*! * Unregister a writer. @@ -42,7 +42,7 @@ class FlowController * @param writer Pointer to the writer to be unregistered. Cannot be nullptr. */ virtual void unregister_writer( - fastdds::rtps::BaseWriter* writer) = 0; + BaseWriter* writer) = 0; /*! * Adds a CacheChange_t to be managed by this object. @@ -55,8 +55,8 @@ class FlowController * @return true if the sample could be added. false otherwise. */ virtual bool add_new_sample( - fastdds::rtps::BaseWriter* writer, - fastdds::rtps::CacheChange_t* change, + BaseWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) = 0; /*! @@ -69,8 +69,8 @@ class FlowController * @return true if the sample could be added. false otherwise. */ virtual bool add_old_sample( - fastdds::rtps::BaseWriter* writer, - fastdds::rtps::CacheChange_t* change) = 0; + BaseWriter* writer, + CacheChange_t* change) = 0; /*! * If the CacheChange_t is currently managed by this object, remove it. @@ -81,7 +81,7 @@ class FlowController * @return true if the sample could be removed. false otherwise. */ virtual bool remove_change( - fastdds::rtps::CacheChange_t* change, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) = 0; /*! diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp index 7188bcc6355..d978fff6bc4 100644 --- a/src/cpp/rtps/writer/StatefulWriter.cpp +++ b/src/cpp/rtps/writer/StatefulWriter.cpp @@ -64,9 +64,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using BaseReader = fastdds::rtps::BaseReader; -using BaseWriter = fastdds::rtps::BaseWriter; - /** * Loops over all the readers in the vector, applying the given routine. * The loop continues until the result of the routine is true for any reader diff --git a/src/cpp/rtps/writer/StatefulWriter.hpp b/src/cpp/rtps/writer/StatefulWriter.hpp index e3e64e126af..ed7768ddac7 100644 --- a/src/cpp/rtps/writer/StatefulWriter.hpp +++ b/src/cpp/rtps/writer/StatefulWriter.hpp @@ -44,7 +44,7 @@ class TimedEvent; * Class StatefulWriter, specialization of BaseWriter that maintains information of each matched Reader. * @ingroup WRITER_MODULE */ -class StatefulWriter : public fastdds::rtps::BaseWriter +class StatefulWriter : public BaseWriter { friend class RTPSParticipantImpl; friend class ReaderProxy; diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp index cbc77906bef..bf121eab703 100644 --- a/src/cpp/rtps/writer/StatelessWriter.cpp +++ b/src/cpp/rtps/writer/StatelessWriter.cpp @@ -49,9 +49,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using BaseReader = fastdds::rtps::BaseReader; -using BaseWriter = fastdds::rtps::BaseWriter; - /** * Loops over all the readers in the vector, applying the given routine. * The loop continues until the result of the routine is true for any reader diff --git a/src/cpp/rtps/writer/StatelessWriter.hpp b/src/cpp/rtps/writer/StatelessWriter.hpp index 0c1584ab896..18183950af3 100644 --- a/src/cpp/rtps/writer/StatelessWriter.hpp +++ b/src/cpp/rtps/writer/StatelessWriter.hpp @@ -46,7 +46,7 @@ class RTPSMessageGroup; * Class StatelessWriter, specialization of BaseWriter that manages writers that don't keep state of the matched readers. * @ingroup WRITER_MODULE */ -class StatelessWriter : public fastdds::rtps::BaseWriter +class StatelessWriter : public BaseWriter { friend class RTPSParticipantImpl; friend class RTPSMessageGroup; @@ -57,7 +57,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter RTPSParticipantImpl* participant, const GUID_t& guid, const WriterAttributes& attributes, - fastdds::rtps::FlowController* flow_controller, + FlowController* flow_controller, WriterHistory* history, WriterListener* listener = nullptr); @@ -118,7 +118,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter * (i.e. treat all samples as relevant). */ void reader_data_filter( - fastdds::rtps::IReaderDataFilter* filter) final + IReaderDataFilter* filter) final { reader_data_filter_ = filter; } @@ -128,7 +128,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter * * @return The content filter used on this writer. */ - const fastdds::rtps::IReaderDataFilter* reader_data_filter() const final + const IReaderDataFilter* reader_data_filter() const final { return reader_data_filter_; } @@ -183,7 +183,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter * @param max_blocking_time_point Future timepoint where blocking send should end. */ bool send_nts( - const std::vector& buffers, + const std::vector& buffers, const uint32_t& total_bytes, const LocatorSelectorSender& locator_selector, std::chrono::steady_clock::time_point& max_blocking_time_point) const override; @@ -202,7 +202,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter /*! * Tells writer the sample can be sent to the network. - * This function should be used by a fastdds::rtps::FlowController. + * This function should be used by a FlowController. * * @param cache_change Pointer to the CacheChange_t that represents the sample which can be sent. * @param group RTPSMessageGroup reference uses for generating the RTPS message. @@ -271,7 +271,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter LocatorSelectorSender locator_selector_; - fastdds::rtps::IReaderDataFilter* reader_data_filter_ = nullptr; + IReaderDataFilter* reader_data_filter_ = nullptr; }; } // namespace rtps diff --git a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp index 609d63889fb..70d279285b0 100644 --- a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp +++ b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp @@ -32,7 +32,7 @@ namespace rtps { class RTPSParticipantImpl; class ReaderProxy; -class StatefulWriter : public fastdds::rtps::BaseWriter +class StatefulWriter : public BaseWriter { public: @@ -99,12 +99,12 @@ class StatefulWriter : public fastdds::rtps::BaseWriter } void reader_data_filter( - fastdds::rtps::IReaderDataFilter* filter) + IReaderDataFilter* filter) { reader_data_filter_ = filter; } - const fastdds::rtps::IReaderDataFilter* reader_data_filter() const + const IReaderDataFilter* reader_data_filter() const { return reader_data_filter_; } @@ -128,7 +128,7 @@ class StatefulWriter : public fastdds::rtps::BaseWriter WriterHistory* mp_history; - fastdds::rtps::IReaderDataFilter* reader_data_filter_; + IReaderDataFilter* reader_data_filter_; }; diff --git a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp index c267e5ed65b..ea0c45136b6 100644 --- a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp +++ b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp @@ -29,7 +29,7 @@ namespace rtps { class RTPSParticipantImpl; -class StatelessWriter : public fastdds::rtps::BaseWriter +class StatelessWriter : public BaseWriter { public: diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp index 620898ebcad..7b0b895d14a 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp @@ -29,14 +29,14 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) async.init(); // Instantiate writers. - eprosima::fastdds::rtps::BaseWriter writer1; - eprosima::fastdds::rtps::BaseWriter writer2; + BaseWriter writer1; + BaseWriter writer2; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastdds::rtps::CacheChange_t* change, - eprosima::fastdds::rtps::RTPSMessageGroup&, - eprosima::fastdds::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -50,16 +50,16 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Register writers. async.register_writer(&writer1); - eprosima::fastdds::rtps::CacheChange_t change_writer1; + CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer2; + CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -71,10 +71,10 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -86,7 +86,7 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -97,8 +97,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -107,59 +107,59 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (CacheChange_t*)1; + change_writer1.writer_info.next = (CacheChange_t*)1; // Send 10 samples using add_new_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer3; + CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer4; + CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer5; + CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer6; + CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer7; + CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer8; + CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer9; + CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer10; + CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -189,34 +189,34 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Send 10 samples using add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -236,8 +236,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Remove changes after add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -334,8 +334,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Remove changes after add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp index 55037add7ad..c70d4a23c61 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp @@ -24,21 +24,21 @@ using namespace testing; struct FlowControllerLimitedAsyncPublishModeMock : FlowControllerLimitedAsyncPublishMode { FlowControllerLimitedAsyncPublishModeMock( - eprosima::fastdds::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor) : FlowControllerLimitedAsyncPublishMode(participant, descriptor) { group_mock = &group; } - static eprosima::fastdds::rtps::RTPSMessageGroup* get_group() + static RTPSMessageGroup* get_group() { return group_mock; } - static eprosima::fastdds::rtps::RTPSMessageGroup* group_mock; + static RTPSMessageGroup* group_mock; }; -eprosima::fastdds::rtps::RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; +RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) { @@ -50,14 +50,14 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) async.init(); // Instantiate writers. - eprosima::fastdds::rtps::BaseWriter writer1; - eprosima::fastdds::rtps::BaseWriter writer2; + BaseWriter writer1; + BaseWriter writer2; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastdds::rtps::CacheChange_t* change, - eprosima::fastdds::rtps::RTPSMessageGroup&, - eprosima::fastdds::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -75,10 +75,10 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Register writers. async.register_writer(&writer1); - eprosima::fastdds::rtps::CacheChange_t change_writer1; + CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer2; + CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), @@ -92,7 +92,7 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) 0)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -104,10 +104,10 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -119,7 +119,7 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -130,8 +130,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -140,59 +140,59 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (CacheChange_t*)1; + change_writer1.writer_info.next = (CacheChange_t*)1; // Send 10 samples using add_new_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer3; + CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer4; + CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer5; + CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer6; + CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer7; + CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer8; + CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer9; + CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer10; + CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -222,34 +222,34 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Send 10 samples using add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -269,8 +269,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Remove changes after add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -367,8 +367,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Remove changes after add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -455,44 +455,44 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Sending 10 samples applying limitations with add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), get_current_bytes_processed()). WillOnce(Return(10100)). @@ -554,44 +554,44 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Sending 10 samples applying limitations with add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), get_current_bytes_processed()). WillOnce(Return(10100)). diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp index e6cbfa76d59..31bd5ff09a2 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp @@ -30,9 +30,9 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastdds::rtps::CacheChange_t*, - eprosima::fastdds::rtps::RTPSMessageGroup&, - eprosima::fastdds::rtps::LocatorSelectorSender&, + CacheChange_t*, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -40,22 +40,22 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Instantiate writers. - eprosima::fastdds::rtps::BaseWriter writer1; - eprosima::fastdds::rtps::BaseWriter writer2; + BaseWriter writer1; + BaseWriter writer2; // Register writers. pure_sync.register_writer(&writer1); - eprosima::fastdds::rtps::CacheChange_t change_writer1; + CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer2; + CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(pure_sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -64,7 +64,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer2.getMutex().lock(); ASSERT_TRUE(pure_sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -74,7 +74,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::NOT_DELIVERED))); writer1.getMutex().lock(); ASSERT_FALSE(pure_sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -83,7 +83,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::NOT_DELIVERED))); writer2.getMutex().lock(); ASSERT_FALSE(pure_sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp index 1b797f21e42..26a6bc17668 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp @@ -29,14 +29,14 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) sync.init(); // Instantiate writers. - eprosima::fastdds::rtps::BaseWriter writer1; - eprosima::fastdds::rtps::BaseWriter writer2; + BaseWriter writer1; + BaseWriter writer2; // Initialize callback to get info. auto send_functor_adding = [&]( - eprosima::fastdds::rtps::CacheChange_t* change, - eprosima::fastdds::rtps::RTPSMessageGroup&, - eprosima::fastdds::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -47,9 +47,9 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) this->number_changes_delivered_cv.notify_one(); }; auto send_functor_not_adding = [&]( - eprosima::fastdds::rtps::CacheChange_t*, - eprosima::fastdds::rtps::RTPSMessageGroup&, - eprosima::fastdds::rtps::LocatorSelectorSender&, + CacheChange_t*, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -58,16 +58,16 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Register writers. sync.register_writer(&writer1); - eprosima::fastdds::rtps::CacheChange_t change_writer1; + CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer2; + CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_not_adding, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -76,7 +76,7 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_not_adding, Return(DeliveryRetCode::DELIVERED))); writer2.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -86,10 +86,10 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -101,7 +101,7 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -112,8 +112,8 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -122,59 +122,59 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (CacheChange_t*)1; + change_writer1.writer_info.next = (CacheChange_t*)1; // Send 10 samples using add_old_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer3; + CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer4; + CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer5; + CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer6; + CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer7; + CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer8; + CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer9; + CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastdds::rtps::CacheChange_t change_writer10; + CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer2)); @@ -194,8 +194,8 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Remove changes EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor_adding, Return(DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer2));