commit f9c2bb19fe6044381f1f4202c495e647e4a2e846
author Chengyu Fan <chengy.fan@gmail.com> Mon Oct 06 11:52:44 2014 -0600
committer Chengyu Fan <chengy.fan@gmail.com> Wed Oct 08 21:56:38 2014 -0600
tree b8515166a863ffd15126c2c609c172945027281d
parent 77c8751576bc5765aa570be219c26a243486bf11

mgmt: replace FaceFlags with individual fields

refs #1992

Change-Id: I41d55b3227c916a253705aaeefbe66c7c18e22a9

tests/daemon/mgmt/face-manager.cpp

diff --git a/tests/daemon/mgmt/face-manager.cpp b/tests/daemon/mgmt/face-manager.cpp
index 855c7bd..608ea95 100644
--- a/tests/daemon/mgmt/face-manager.cpp
+++ b/tests/daemon/mgmt/face-manager.cpp
@@ -1493,6 +1493,9 @@
     BOOST_CHECK_EQUAL(notification.getFaceId(), expectedFaceEvent.getFaceId());
     BOOST_CHECK_EQUAL(notification.getRemoteUri(), expectedFaceEvent.getRemoteUri());
     BOOST_CHECK_EQUAL(notification.getLocalUri(), expectedFaceEvent.getLocalUri());
+    BOOST_CHECK_EQUAL(notification.getFaceScope(), expectedFaceEvent.getFaceScope());
+    BOOST_CHECK_EQUAL(notification.getFacePersistency(), expectedFaceEvent.getFacePersistency());
+    BOOST_CHECK_EQUAL(notification.getLinkType(), expectedFaceEvent.getLinkType());
   }
 
   bool

tests/daemon/mgmt/face-status-publisher-common.hpp

diff --git a/tests/daemon/mgmt/face-status-publisher-common.hpp b/tests/daemon/mgmt/face-status-publisher-common.hpp
index b2a485e..e2f19f1 100644
--- a/tests/daemon/mgmt/face-status-publisher-common.hpp
+++ b/tests/daemon/mgmt/face-status-publisher-common.hpp
@@ -29,7 +29,6 @@
 #include "mgmt/face-status-publisher.hpp"
 #include "mgmt/app-face.hpp"
 #include "mgmt/internal-face.hpp"
-#include "face/face-flags.hpp"
 #include "fw/forwarder.hpp"
 
 #include "tests/test-common.hpp"
@@ -135,7 +134,28 @@
     BOOST_CHECK_EQUAL(status.getFaceId(), reference->getId());
     BOOST_CHECK_EQUAL(status.getRemoteUri(), reference->getRemoteUri().toString());
     BOOST_CHECK_EQUAL(status.getLocalUri(), reference->getLocalUri().toString());
-    BOOST_CHECK_EQUAL(status.getFlags(), getFaceFlags(*reference));
+
+    if (reference->isLocal()) {
+      BOOST_CHECK_EQUAL(status.getFaceScope(), ndn::nfd::FACE_SCOPE_LOCAL);
+    }
+    else {
+      BOOST_CHECK_EQUAL(status.getFaceScope(), ndn::nfd::FACE_SCOPE_NON_LOCAL);
+    }
+
+    if (reference->isOnDemand()) {
+      BOOST_CHECK_EQUAL(status.getFacePersistency(), ndn::nfd::FACE_PERSISTENCY_ON_DEMAND);
+    }
+    else {
+      BOOST_CHECK_EQUAL(status.getFacePersistency(), ndn::nfd::FACE_PERSISTENCY_PERSISTENT);
+    }
+
+    if (reference->isMultiAccess()) {
+      BOOST_CHECK_EQUAL(status.getLinkType(), ndn::nfd::LINK_TYPE_MULTI_ACCESS);
+    }
+    else {
+      BOOST_CHECK_EQUAL(status.getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);
+    }
+
     BOOST_CHECK_EQUAL(status.getNInInterests(), counters.getNInInterests());
     BOOST_CHECK_EQUAL(status.getNInDatas(), counters.getNInDatas());
     BOOST_CHECK_EQUAL(status.getNOutInterests(), counters.getNOutInterests());