commit 7f35843d583d831ac051102857128e0b4fdac179
author Junxiao Shi <git@mail1.yoursunny.com> Thu Aug 11 17:06:33 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Aug 11 17:06:33 2016 +0000
tree 19a413d8eafd06834795924ab95bfc7d3301f17c
parent f2420fc7a310ba91093549c1be37ac2477e8f81f

table: NameTree::lookup return Entry& instead of shared_ptr

refs #3687

Change-Id: Ie86057337dd36ff2bc6ef3ea0c73fd4ffc4b13d0

tests/daemon/table/name-tree.t.cpp

diff --git a/tests/daemon/table/name-tree.t.cpp b/tests/daemon/table/name-tree.t.cpp
index b5d37d0..bf46022 100644
--- a/tests/daemon/table/name-tree.t.cpp
+++ b/tests/daemon/table/name-tree.t.cpp
@@ -245,33 +245,35 @@
   BOOST_CHECK_EQUAL(nt.size(), 0);
   BOOST_CHECK_EQUAL(nt.getNBuckets(), nBuckets);
 
+  // lookup
+
   Name nameABC("ndn:/a/b/c");
-  shared_ptr<Entry> npeABC = nt.lookup(nameABC);
+  Entry& npeABC = nt.lookup(nameABC);
   BOOST_CHECK_EQUAL(nt.size(), 4);
 
   Name nameABD("/a/b/d");
-  shared_ptr<Entry> npeABD = nt.lookup(nameABD);
+  Entry& npeABD = nt.lookup(nameABD);
   BOOST_CHECK_EQUAL(nt.size(), 5);
 
   Name nameAE("/a/e/");
-  shared_ptr<Entry> npeAE = nt.lookup(nameAE);
+  Entry& npeAE = nt.lookup(nameAE);
   BOOST_CHECK_EQUAL(nt.size(), 6);
 
   Name nameF("/f");
-  shared_ptr<Entry> npeF = nt.lookup(nameF);
+  Entry& npeF = nt.lookup(nameF);
   BOOST_CHECK_EQUAL(nt.size(), 7);
 
-  // validate lookup() and findExactMatch()
+  // getParent and findExactMatch
 
   Name nameAB("/a/b");
-  BOOST_CHECK_EQUAL(npeABC->getParent(), nt.findExactMatch(nameAB));
-  BOOST_CHECK_EQUAL(npeABD->getParent(), nt.findExactMatch(nameAB));
+  BOOST_CHECK_EQUAL(npeABC.getParent(), nt.findExactMatch(nameAB));
+  BOOST_CHECK_EQUAL(npeABD.getParent(), nt.findExactMatch(nameAB));
 
-  Name nameA ("/a");
-  BOOST_CHECK_EQUAL(npeAE->getParent(), nt.findExactMatch(nameA));
+  Name nameA("/a");
+  BOOST_CHECK_EQUAL(npeAE.getParent(), nt.findExactMatch(nameA));
 
-  Name nameRoot ("/");
-  BOOST_CHECK_EQUAL(npeF->getParent(), nt.findExactMatch(nameRoot));
+  Name nameRoot("/");
+  BOOST_CHECK_EQUAL(npeF.getParent(), nt.findExactMatch(nameRoot));
   BOOST_CHECK_EQUAL(nt.size(), 7);
 
   Name name0("/does/not/exist");
@@ -279,7 +281,8 @@
   BOOST_CHECK(npe0 == nullptr);
 
 
-  // Longest Prefix Matching
+  // findLongestPrefixMatch
+
   Entry* temp = nullptr;
   Name nameABCLPM("/a/b/c/def/asdf/nlf");
   temp = nt.findLongestPrefixMatch(nameABCLPM);
@@ -639,11 +642,11 @@
 
   Name prefix("/a/b/c/d/e/f/g/h"); // requires 9 buckets
 
-  shared_ptr<Entry> entry = nameTree.lookup(prefix);
+  Entry& entry = nameTree.lookup(prefix);
   BOOST_CHECK_EQUAL(nameTree.size(), 9);
   BOOST_CHECK_EQUAL(nameTree.getNBuckets(), 32);
 
-  nameTree.eraseIfEmpty(entry.get());
+  nameTree.eraseIfEmpty(&entry);
   BOOST_CHECK_EQUAL(nameTree.size(), 0);
   BOOST_CHECK_EQUAL(nameTree.getNBuckets(), 16);
 }