commit 04c3d714ba0129f4746967f2d98985bae2b0a8fd
author Patrick Venture <venture@google.com> Mon Jan 07 13:49:16 2019 -0800
committer Ratan Gupta <ratagupt@linux.vnet.ibm.com> Tue Mar 12 06:21:58 2019 +0000
tree 5dac339d132fb5f65212d2ba1cd580be4ef68704
parent 3f19a51e5fcf369645585818b282a1c381b6d92c

test: rtnetlink: use manager interface query

Use the new interface query method provided by manager to know if the
interface was added instead of inspecting the manager itself.

Change-Id: I94600199fd60a014d6b376155555449f7af617f5
Signed-off-by: Patrick Venture <venture@google.com>

test/mock_network_manager.hpp

diff --git a/test/mock_network_manager.hpp b/test/mock_network_manager.hpp
index 141469b..df3efdf 100644
--- a/test/mock_network_manager.hpp
+++ b/test/mock_network_manager.hpp
@@ -19,8 +19,6 @@
     }
 
     MOCK_METHOD1(restartSystemdUnit, void(const std::string& service));
-
-    friend class TestRtNetlink;
 };
 
 } // namespace network

test/test_rtnetlink.cpp

diff --git a/test/test_rtnetlink.cpp b/test/test_rtnetlink.cpp
index 9284600..ecfa44a 100644
--- a/test/test_rtnetlink.cpp
+++ b/test/test_rtnetlink.cpp
@@ -77,13 +77,6 @@
         manager->setConfDir(confDir);
     }
 
-    bool isInterfaceAdded(std::string intf)
-    {
-        return manager->interfaces.find(intf) != manager->interfaces.end()
-                   ? true
-                   : false;
-    }
-
     void createNetLinkSocket()
     {
         // RtnetLink socket
@@ -109,7 +102,7 @@
     nlMsg->nlmsg_seq = 0;
     nlMsg->nlmsg_pid = getpid();
 
-    EXPECT_EQ(false, isInterfaceAdded("igb5"));
+    EXPECT_EQ(false, manager->hasInterface("igb5"));
     // Send the request
     send(smartSock(), nlMsg, nlMsg->nlmsg_len, 0);
 
@@ -121,7 +114,7 @@
         sd_event_run(eventPtr.get(), 10);
     };
 
-    EXPECT_EQ(true, isInterfaceAdded("igb5"));
+    EXPECT_EQ(true, manager->hasInterface("igb5"));
 }
 
 } // namespace network