commit 1d80cd057fba4fefab65e2e39f33edb9997ce8a6
author Steve DiBenedetto <dibenede@cs.colostate.edu> Sat Feb 08 10:21:06 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Feb 10 10:21:10 2014 -0800
tree de85d54e84d127b072c34e7e007ef9d40a3ff93a
parent b78ec7d1111de774335d0304fbd551cd99932e3c

test/mgmt: remove unnecessary fib and fib manager references

Clean up in preperation for FibManager construction
changes to support configuration files.

refs: #1120

Change-Id: I0864c6048a906fd2a3a539c83e62754fc8936921

tests/mgmt/internal-face.cpp

diff --git a/tests/mgmt/internal-face.cpp b/tests/mgmt/internal-face.cpp
index 5953fc6..0c08190 100644
--- a/tests/mgmt/internal-face.cpp
+++ b/tests/mgmt/internal-face.cpp
@@ -5,14 +5,8 @@
  */
 
 #include "mgmt/internal-face.hpp"
-#include "mgmt/fib-manager.hpp"
-#include "table/fib.hpp"
 #include "../face/dummy-face.hpp"
 
-#include <ndn-cpp-dev/management/fib-management-options.hpp>
-#include <ndn-cpp-dev/management/control-response.hpp>
-#include <ndn-cpp-dev/encoding/block.hpp>
-
 #include <boost/test/unit_test.hpp>
 
 namespace nfd {
@@ -30,16 +24,6 @@
 
   }
 
-  shared_ptr<Face>
-  getFace(FaceId id)
-  {
-    if (m_faces.size() < id)
-      {
-        BOOST_FAIL("Attempted to access invalid FaceId: " << id);
-      }
-    return m_faces[id-1];
-  }
-
   void
   validateOnInterestCallback(const Name& name, const Interest& interest)
   {
@@ -102,11 +86,6 @@
   addFace(make_shared<DummyFace>());
 
   shared_ptr<InternalFace> face(new InternalFace);
-  Fib fib;
-  FibManager manager(fib,
-                     bind(&InternalFaceFixture::getFace,
-                          this, _1),
-                          face);
 
   bool didPutData = false;
   Name dataName("/hello");
@@ -124,11 +103,6 @@
   addFace(make_shared<DummyFace>());
 
   shared_ptr<InternalFace> face(new InternalFace);
-  Fib fib;
-  FibManager manager(fib,
-                     bind(&InternalFaceFixture::getFace,
-                          this, _1),
-                          face);
 
   face->setInterestFilter("/localhost/nfd/fib",
                           bind(&InternalFaceFixture::validateOnInterestCallback,
@@ -153,11 +127,6 @@
   addFace(make_shared<DummyFace>());
 
   shared_ptr<InternalFace> face(new InternalFace);
-  Fib fib;
-  FibManager manager(fib,
-                     bind(&InternalFaceFixture::getFace,
-                          this, _1),
-                          face);
 
   face->setInterestFilter("/localhost/nfd/fib",
                           bind(&InternalFaceFixture::validateNoOnInterestCallback,
@@ -181,11 +150,6 @@
   addFace(make_shared<DummyFace>());
 
   shared_ptr<InternalFace> face(new InternalFace);
-  Fib fib;
-  FibManager manager(fib,
-                     bind(&InternalFaceFixture::getFace,
-                          this, _1),
-                          face);
 
   face->setInterestFilter("/localhost/nfd/eib",
                           bind(&InternalFaceFixture::validateNoOnInterestCallback,
@@ -217,11 +181,6 @@
   addFace(make_shared<DummyFace>());
 
   shared_ptr<InternalFace> face(new InternalFace);
-  Fib fib;
-  FibManager manager(fib,
-                     bind(&InternalFaceFixture::getFace,
-                          this, _1),
-                          face);
 
   face->setInterestFilter("/localhost/nfd/fib",
                           bind(&InternalFaceFixture::validateOnInterestCallback,