commit a91aab47654743b142ac5a51ea28a82335ed5a09
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 15:47:38 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 11:42:40 2016 -0700
tree c35fe33d52e86e1a840ec6415ba2c8d64e574da3
parent 91018738bdee32ecfa6648a5af2708567ead2444

model+helper+ndn-cxx: Adjust ndn::L3Protocol and ndn::StackHelper for NFD 0.4+ model

This commit also restores ndn-cxx Face emulation, which is now necessary
for all NFD's management operations.

Change-Id: Id04cf69a2b0c81972248b6d80055e7c743fa869d
Refs: #3560

tests/unit-tests/model/ndn-l3-protocol.t.cpp

diff --git a/tests/unit-tests/model/ndn-l3-protocol.t.cpp b/tests/unit-tests/model/ndn-l3-protocol.t.cpp
index c594139..2863de1 100644
--- a/tests/unit-tests/model/ndn-l3-protocol.t.cpp
+++ b/tests/unit-tests/model/ndn-l3-protocol.t.cpp
@@ -55,7 +55,7 @@
       "/localhost/nfd/rib/list",
       "/localhost/nfd/faces/list",
       "/localhost/nfd/strategy-choice/list",
-      "/localhost/nfd/status"
+      "/localhost/nfd/status/general"
     };
 
     FactoryCallbackApp::Install(getNode("1"), [this] () -> shared_ptr<void> {
@@ -105,19 +105,19 @@
                                 receivedDatasets.begin(), receivedDatasets.end());
 }
 
-BOOST_AUTO_TEST_CASE(DisabledFaceManager)
-{
-  // Disable Face manager
-  disableFaceManager();
+// BOOST_AUTO_TEST_CASE(DisabledFaceManager)
+// {
+//   // Disable Face manager
+//   disableFaceManager();
 
-  setupAndRun();
+//   setupAndRun();
 
-  BOOST_CHECK_EQUAL(requestedDatasets.size(), receivedDatasets.size() + 1);
+//   BOOST_CHECK_EQUAL(requestedDatasets.size(), receivedDatasets.size() + 1);
 
-  requestedDatasets.erase("/localhost/nfd/faces/list");
-  BOOST_CHECK_EQUAL_COLLECTIONS(requestedDatasets.begin(), requestedDatasets.end(),
-                                receivedDatasets.begin(), receivedDatasets.end());
-}
+//   requestedDatasets.erase("/localhost/nfd/faces/list");
+//   BOOST_CHECK_EQUAL_COLLECTIONS(requestedDatasets.begin(), requestedDatasets.end(),
+//                                 receivedDatasets.begin(), receivedDatasets.end());
+// }
 
 BOOST_AUTO_TEST_CASE(DisabledStrategyChoiceManager)
 {
@@ -142,7 +142,7 @@
 
   BOOST_CHECK_EQUAL(requestedDatasets.size(), receivedDatasets.size() + 1);
 
-  requestedDatasets.erase("/localhost/nfd/status");
+  requestedDatasets.erase("/localhost/nfd/status/general");
   BOOST_CHECK_EQUAL_COLLECTIONS(requestedDatasets.begin(), requestedDatasets.end(),
                                 receivedDatasets.begin(), receivedDatasets.end());
 }