commit 84d62cbbc6d92957ec19fdda1b5d9872b0e7bc1a
author Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 12 16:15:18 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 12 16:15:18 2017 +0000
tree e85a6901e17a8fd44de9854fb58321cb3b57c7c5
parent 7b0071e6a913d6a82fd0bc320a4c9627aa14b2cc

face: use NetworkMonitor::listNetworkInterfaces() in tests

refs #4021

Change-Id: I6daccc3872a0c6b2e2e49390bc5881c796503926

tests/daemon/face/udp-factory.t.cpp

diff --git a/tests/daemon/face/udp-factory.t.cpp b/tests/daemon/face/udp-factory.t.cpp
index d74ba69..b5ddb8a 100644
--- a/tests/daemon/face/udp-factory.t.cpp
+++ b/tests/daemon/face/udp-factory.t.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
@@ -28,6 +28,7 @@
 #include "factory-test-common.hpp"
 #include "face-system-fixture.hpp"
 #include "tests/limited-io.hpp"
+#include "test-netif-ip.hpp"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/range/algorithm.hpp>
 
@@ -114,8 +115,8 @@
 protected:
   UdpMcastConfigFixture()
   {
-    for (const auto& netif : listNetworkInterfaces()) {
-      if (netif.isUp() && netif.isMulticastCapable() && !netif.ipv4Addresses.empty()) {
+    for (const auto& netif : collectNetworkInterfaces()) {
+      if (netif->isUp() && netif->canMulticast() && hasAddressFamily<AddressFamily::V4>(*netif)) {
         netifs.push_back(netif);
       }
     }
@@ -136,16 +137,17 @@
   /** \brief determine whether a UDP multicast face is created on \p netif
    */
   static bool
-  isFaceOnNetif(const Face& face, const NetworkInterfaceInfo& netif)
+  isFaceOnNetif(const Face& face, const shared_ptr<const ndn::net::NetworkInterface>& netif)
   {
     auto ip = boost::asio::ip::address_v4::from_string(face.getLocalUri().getHost());
-    return boost::count(netif.ipv4Addresses, ip) > 0;
+    return std::any_of(netif->getNetworkAddresses().begin(), netif->getNetworkAddresses().end(),
+                       [ip] (const ndn::net::NetworkAddress& a) { return a.getIp() == ip; });
   }
 
 protected:
   /** \brief MulticastUdpTransport-capable network interfaces
    */
-  std::vector<NetworkInterfaceInfo> netifs;
+  std::vector<shared_ptr<const ndn::net::NetworkInterface>> netifs;
 };
 
 #define SKIP_IF_UDP_MCAST_NETIF_COUNT_LT(n) \
@@ -282,7 +284,7 @@
       }
     }
   )CONFIG";
-  boost::replace_first(CONFIG, "%ifname", netifs.front().name);
+  boost::replace_first(CONFIG, "%ifname", netifs.front()->getName());
 
   parseConfig(CONFIG, false);
   auto udpMcastFaces = this->listUdpMcastFaces();
@@ -310,7 +312,7 @@
       }
     }
   )CONFIG";
-  boost::replace_first(CONFIG, "%ifname", netifs.front().name);
+  boost::replace_first(CONFIG, "%ifname", netifs.front()->getName());
 
   parseConfig(CONFIG, false);
   auto udpMcastFaces = this->listUdpMcastFaces();
@@ -341,8 +343,8 @@
     }
   )CONFIG";
   std::string CONFIG2 = CONFIG1;
-  boost::replace_first(CONFIG1, "%ifname", netifs.front().name);
-  boost::replace_first(CONFIG2, "%ifname", netifs.back().name);
+  boost::replace_first(CONFIG1, "%ifname", netifs.front()->getName());
+  boost::replace_first(CONFIG2, "%ifname", netifs.back()->getName());
 
   parseConfig(CONFIG1, false);
   auto udpMcastFaces = this->listUdpMcastFaces();