commit 85998a1dc942974a7d4bf3e9f642c5a22dffb6f8
author Ashlesh Gawande <agawande@memphis.edu> Thu Dec 07 22:22:13 2017 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Fri Feb 01 14:23:55 2019 -0600
tree f64308b63f55ea0ba7ac9a5495653b94cf31a4db
parent 7e3f6d75c8485cb722616fb86329e55ea1bb0c99

src: decouple classes from Nlsr object

refs: #1952, #2803, #3960, #4288

Change-Id: Ibe3ac3820f11e8107ee4b13e510d53c27467a6cb

tests/publisher/publisher-fixture.hpp

diff --git a/tests/publisher/publisher-fixture.hpp b/tests/publisher/publisher-fixture.hpp
index 05e5a0f..840de0b 100644
--- a/tests/publisher/publisher-fixture.hpp
+++ b/tests/publisher/publisher-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2018,  The University of Memphis,
+ * Copyright (c) 2014-2019,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -46,14 +46,13 @@
 public:
   PublisherFixture()
     : face(m_ioService, m_keyChain, {true, true})
-    , nlsr(m_ioService, m_scheduler, face, m_keyChain)
-    , lsdb(nlsr.getLsdb())
-    , rt1(nlsr.getRoutingTable())
+    , conf(face)
+    , confProcessor(conf)
+    , nlsr(face, m_keyChain, conf)
+    , lsdb(nlsr.m_lsdb)
+    , rt1(nlsr.m_routingTable)
   {
-    nlsr.getConfParameter().setNetwork("/ndn");
-    nlsr.getConfParameter().setRouterName("/This/Router");
-
-    routerId = addIdentity("/ndn/This/Router");
+    routerId = addIdentity(conf.getRouterPrefix());
 
     nlsr.initialize();
     face.processEvents(ndn::time::milliseconds(100));
@@ -178,7 +177,8 @@
 
 public:
   ndn::util::DummyClientFace face;
-
+  ConfParameter conf;
+  DummyConfFileProcessor confProcessor;
   Nlsr nlsr;
   Lsdb& lsdb;