mgmt: replace FaceFlags with individual fields
refs #1992
Change-Id: I41d55b3227c916a253705aaeefbe66c7c18e22a9
diff --git a/tests/daemon/face/face-flags.cpp b/tests/daemon/face/face-flags.cpp
deleted file mode 100644
index 764d2b6..0000000
--- a/tests/daemon/face/face-flags.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014 Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology
- *
- * This file is part of NFD (Named Data Networking Forwarding Daemon).
- * See AUTHORS.md for complete list of NFD authors and contributors.
- *
- * NFD is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- *
- * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-#include "face/face-flags.hpp"
-
-#include "tests/test-common.hpp"
-#include "tests/daemon/face/dummy-face.hpp"
-
-namespace nfd {
-namespace tests {
-
-BOOST_FIXTURE_TEST_SUITE(FaceFaceFlags, BaseFixture)
-
-template<typename DummyFaceBase>
-class DummyOnDemandFace : public DummyFaceBase
-{
-public:
- DummyOnDemandFace()
- {
- this->setOnDemand(true);
- }
-};
-
-BOOST_AUTO_TEST_CASE(Get)
-{
- DummyFace face1;
- BOOST_CHECK_EQUAL(getFaceFlags(face1), 0);
-
- DummyLocalFace face2;
- BOOST_CHECK_EQUAL(getFaceFlags(face2), static_cast<uint64_t>(ndn::nfd::FACE_IS_LOCAL));
-
- DummyOnDemandFace<DummyFace> face3;
- BOOST_CHECK_EQUAL(getFaceFlags(face3), static_cast<uint64_t>(ndn::nfd::FACE_IS_ON_DEMAND));
-
- DummyOnDemandFace<DummyLocalFace> face4;
- BOOST_CHECK_EQUAL(getFaceFlags(face4), static_cast<uint64_t>(ndn::nfd::FACE_IS_LOCAL |
- ndn::nfd::FACE_IS_ON_DEMAND));
-
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-} // namespace tests
-} // namespace nfd
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
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());