Refs #22056: Review - Use map::insert and std::set in test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
eProsima · Nov 14, 2024 · 6b99a05 · 6b99a05
1 parent 039962e
commit 6b99a05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -303,11 +303,9 @@ ResponseCode TCPTransportInterface::bind_socket(
     unbound_channel_resources_.erase(it_remove);
 
     ResponseCode ret = RETCODE_OK;
-    if (channel_resources_.find(channel->locator()) == channel_resources_.end())
-    {
-        channel_resources_[channel->locator()] = channel;
-    }
-    else
+    const auto insert_ret = channel_resources_.insert(
+        decltype(channel_resources_)::value_type{channel->locator(), channel});
+    if (false == insert_ret.second)
     {
         // There is an existing channel that can be used. Force the Client to close unnecessary socket
         ret = RETCODE_SERVER_ERROR;
@@ -322,10 +320,7 @@ ResponseCode TCPTransportInterface::bind_socket(
         for (auto& interface_it : local_interfaces)
         {
             IPLocator::setIPv4(local_locator, interface_it.locator);
-            if (channel_resources_.find(local_locator) == channel_resources_.end())
-            {
-                channel_resources_[local_locator] = channel;
-            }
+            channel_resources_.insert(decltype(channel_resources_)::value_type{local_locator, channel});
         }
     }
     return ret;

diff --git a/test/unittest/transport/TCPv4Tests.cpp b/test/unittest/transport/TCPv4Tests.cpp
@@ -2035,7 +2035,12 @@ TEST_F(TCPv4Tests, client_announced_local_port_uniqueness)
 
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
-    ASSERT_GT(receiveTransportUnderTest.get_channel_resources().size(), 2u);
+    std::set<std::shared_ptr<TCPChannelResource>> channels_created;
+    for (const auto& channel_resource : receiveTransportUnderTest.get_channel_resources())
+    {
+        channels_created.insert(channel_resource.second);
+    }
+    ASSERT_EQ(channels_created.size(), 2u);
 }
 
 #ifndef _WIN32