SunnyQjm/NFD
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/mgmt: remove unnecessary fib and fib manager references

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

refs: #1120

Change-Id: I0864c6048a906fd2a3a539c83e62754fc8936921
This commit is contained in:
Steve DiBenedetto authored and Alexander Afanasyev committed 2014-02-10 10:21:10 -08:00
1 parent b78ec7d111
commit 1d80cd057f
1 file changed
-41
Download Patch File Download Diff File Expand all files Collapse all files
tests/mgmt/internal-face.cpp
-41
View File
@@ -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 @@ public:
}
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 @@ BOOST_FIXTURE_TEST_CASE(PutData, InternalFaceFixture)
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 @@ BOOST_FIXTURE_TEST_CASE(SendInterestHitEnd, InternalFaceFixture)
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 @@ BOOST_FIXTURE_TEST_CASE(SendInterestHitBegin, InternalFaceFixture)
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 @@ BOOST_FIXTURE_TEST_CASE(SendInterestHitExact, InternalFaceFixture)
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 @@ BOOST_FIXTURE_TEST_CASE(SendInterestHitPrevious, InternalFaceFixture)
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,