commit c69da0a350e7e195256547109d44cbb5fff88461
author Muktadir R Chowdhury <mrchwdhr@memphis.edu> Fri Dec 18 13:24:38 2015 -0600
committer Vince Lehman <vslehman@memphis.edu> Mon Jan 11 12:05:24 2016 -0600
tree babab2fbeed6cf20208236d249a57f4cabfd8389
parent 0ff5d45ba85d54468cf3d2a5274bb2b59b299afb

tests: Use ndn-cxx/DummyClientFace

refs: #2637

Change-Id: Ife16a81d08e538b4b0a82f1f5d4cc819fc764257

tests/test-nlsr.cpp

diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index 4407a55..c0dfc47 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -21,7 +21,6 @@
 
 #include "test-common.hpp"
 #include "control-commands.hpp"
-#include "dummy-face.hpp"
 
 #include "nlsr.hpp"
 
@@ -31,14 +30,13 @@
 namespace nlsr {
 namespace test {
 
-using ndn::DummyFace;
 using ndn::shared_ptr;
 
 BOOST_FIXTURE_TEST_SUITE(TestNlsr, BaseFixture)
 
 BOOST_AUTO_TEST_CASE(HyperbolicOn_ZeroCostNeighbors)
 {
-  shared_ptr<DummyFace> face = ndn::makeDummyFace();
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>();
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
 
   // Simulate loading configuration file
@@ -65,7 +63,7 @@
 
 BOOST_AUTO_TEST_CASE(HyperbolicOff_LinkStateCost)
 {
-  shared_ptr<DummyFace> face = ndn::makeDummyFace();
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>();
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
 
   // Simulate loading configuration file
@@ -90,7 +88,7 @@
 
 BOOST_AUTO_TEST_CASE(SetEventIntervals)
 {
-  shared_ptr<DummyFace> face = ndn::makeDummyFace();
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>();
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
 
   // Simulate loading configuration file
@@ -111,7 +109,7 @@
 
 BOOST_FIXTURE_TEST_CASE(FaceDestroyEvent, UnitTestTimeFixture)
 {
-  shared_ptr<ndn::util::DummyClientFace> face = ndn::util::makeDummyClientFace(g_ioService);
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>(g_ioService);
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
   Lsdb& lsdb = nlsr.getLsdb();
 
@@ -224,7 +222,7 @@
 // refresh will not cause RIB entries for other nodes' name prefixes to be refreshed.
 BOOST_FIXTURE_TEST_CASE(FaceDestroyEventInactive, UnitTestTimeFixture)
 {
-  shared_ptr<ndn::util::DummyClientFace> face = ndn::util::makeDummyClientFace(g_ioService);
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>(g_ioService);
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
   Lsdb& lsdb = nlsr.getLsdb();
 
@@ -329,7 +327,7 @@
 
 BOOST_FIXTURE_TEST_CASE(GetCertificate, UnitTestTimeFixture)
 {
-  shared_ptr<ndn::util::DummyClientFace> face = ndn::util::makeDummyClientFace(g_ioService);
+  shared_ptr<ndn::util::DummyClientFace> face = make_shared<ndn::util::DummyClientFace>(g_ioService);
   Nlsr nlsr(g_ioService, g_scheduler, ndn::ref(*face));
 
   // Create certificate