commit 7e3f6d75c8485cb722616fb86329e55ea1bb0c99
author Ashlesh Gawande <agawande@memphis.edu> Fri Jan 25 13:13:43 2019 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Fri Feb 01 11:54:48 2019 -0600
tree f3cfb225cb4431896126297235ec0599ab67ed8c
parent e3c741da9a68c5014288f9cb1efe92200f7d6bca

src: move and simplify canonize functionality to ConfFileProcessor

refs: #4817

Change-Id: I0a7f448f50994906d0403bcb97a3973dc1a25917

tests/test-nlsr.cpp

diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index c4ca308..f318d33 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -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.
  *
@@ -429,44 +429,6 @@
   BOOST_CHECK_EQUAL(lsa->getAdl().size(), 2);
 }
 
-BOOST_AUTO_TEST_CASE(CanonizeUris)
-{
-  ndn::Name neighborAName("/ndn/site/%C1.Router/routerA");
-  ndn::FaceUri faceUriA("udp://10.0.0.1");
-  Adjacent neighborA(neighborAName, faceUriA, 0, Adjacent::STATUS_INACTIVE, 0, 0);
-  neighbors.insert(neighborA);
-
-  ndn::Name neighborBName("/ndn/site/%C1.Router/routerB");
-  ndn::FaceUri faceUriB("udp://10.0.0.2");
-  Adjacent neighborB(neighborBName, faceUriB, 0, Adjacent::STATUS_INACTIVE, 0, 0);
-  neighbors.insert(neighborB);
-
-  int nCanonizationsLeft = nlsr.getAdjacencyList().getAdjList().size();
-  std::function<void(void)> finallyCallback = [this] {
-    nlsr.initialize();
-  };
-  std::function<void(std::list<Adjacent>::iterator)> thenCallback =
-    [this, &thenCallback, &finallyCallback, &nCanonizationsLeft]
-    (std::list<Adjacent>::iterator iterator) {
-      nCanonizationsLeft--;
-      nlsr.canonizeNeighborUris(iterator, thenCallback, finallyCallback);
-  };
-  nlsr.canonizeNeighborUris(nlsr.getAdjacencyList().getAdjList().begin(),
-                            [&] (std::list<Adjacent>::iterator iterator) {
-                              thenCallback(iterator);
-                            },
-                            finallyCallback);
-  while (nCanonizationsLeft != 0) {
-    this->advanceClocks(ndn::time::milliseconds(1), 10);
-  }
-
-  BOOST_CHECK_EQUAL(nlsr.getAdjacencyList().getAdjacent(neighborAName).getFaceUri(),
-                    ndn::FaceUri("udp4://10.0.0.1:6363"));
-
-  BOOST_CHECK_EQUAL(nlsr.getAdjacencyList().getAdjacent(neighborBName).getFaceUri(),
-                    ndn::FaceUri("udp4://10.0.0.2:6363"));
-}
-
 BOOST_AUTO_TEST_CASE(FaceDatasetFetchSuccess)
 {
   bool hasResult = false;