commit 9461afb721c8cb5495deaf1216695a2049345123
author Nick Gordon <nmgordon@memphis.edu> Tue Apr 25 15:54:50 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Wed May 24 10:42:57 2017 -0700
tree a91b0fe2f996ea683da35c9458e1f3cc33d796e2
parent 2108808ae3706b972e7c22edc5de1b46b3f913b8

nlsr: canonize Adjacent FaceURIs on startup

Change-Id: I6a2b31631918c1ece79c3fc13e392917162efc2d
refs: #4063

tests/test-nlsr.cpp

diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index 39fbee5..3553a43 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -36,7 +36,7 @@
 {
 public:
   NlsrFixture()
-    : face(std::make_shared<ndn::util::DummyClientFace>())
+    : face(std::make_shared<ndn::util::DummyClientFace>(g_ioService))
     , nlsr(g_ioService, g_scheduler, std::ref(*face), g_keyChain)
     , lsdb(nlsr.getLsdb())
     , neighbors(nlsr.getAdjacencyList())
@@ -52,7 +52,7 @@
     std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(dataName);
 
     nlsr.m_helloProtocol.onContentValidated(data);
-  }
+ }
 
 public:
   std::shared_ptr<ndn::util::DummyClientFace> face;
@@ -447,6 +447,37 @@
   BOOST_CHECK_EQUAL(lsa->getAdl().getSize(), 2);
 }
 
+BOOST_AUTO_TEST_CASE(CanonizeUris)
+{
+  ndn::Name neighborAName("/ndn/site/%C1.router/routerA");
+  Adjacent neighborA(neighborAName, "udp://10.0.0.1", 0, Adjacent::STATUS_INACTIVE, 0, 0);
+  neighbors.insert(neighborA);
+
+  ndn::Name neighborBName("/ndn/site/%C1.router/routerB");
+  Adjacent neighborB(neighborBName, "udp://10.0.0.2", 0, Adjacent::STATUS_INACTIVE, 0, 0);
+  neighbors.insert(neighborB);
+
+  int nCanonizationsLeft = nlsr.getAdjacencyList().getAdjList().size();
+  std::function<void(std::list<Adjacent>::iterator)> thenCallback =
+    [this, &thenCallback, &nCanonizationsLeft] (std::list<Adjacent>::iterator iterator) {
+      nCanonizationsLeft--;
+      nlsr.canonizeNeighborUris(iterator, thenCallback);
+  };
+  nlsr.canonizeNeighborUris(nlsr.getAdjacencyList().getAdjList().begin(),
+                            [thenCallback] (std::list<Adjacent>::iterator iterator) {
+                              thenCallback(iterator);
+                            });
+  while (nCanonizationsLeft != 0) {
+    this->advanceClocks(ndn::time::milliseconds(1));
+  }
+
+  BOOST_CHECK_EQUAL(nlsr.getAdjacencyList().getAdjacent(neighborAName).getConnectingFaceUri(),
+                    "udp4://10.0.0.1:6363");
+
+  BOOST_CHECK_EQUAL(nlsr.getAdjacencyList().getAdjacent(neighborBName).getConnectingFaceUri(),
+                    "udp4://10.0.0.2:6363");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace test