commit 9cff779038ea266e784bde08dfb2e8fc94e906bc
author Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 01 21:45:11 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 01 21:45:11 2016 +0000
tree 387fb4569bc55c213348064a67f67919c4d2ef03
parent 02b73f5705f43cc49b4e7039ec6d18993ce8f7d1

table: pit::FaceRecord stores Face& instead of shared_ptr

refs #3164

Change-Id: Ib23ab2341a37213fee791f2070f13b76da851d53

tests/daemon/table/cleanup.t.cpp

diff --git a/tests/daemon/table/cleanup.t.cpp b/tests/daemon/table/cleanup.t.cpp
index 0df019c..20638ab 100644
--- a/tests/daemon/table/cleanup.t.cpp
+++ b/tests/daemon/table/cleanup.t.cpp
@@ -55,10 +55,10 @@
     shared_ptr<Interest> interest = makeInterest(name);
     shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
     if ((i & 0x01) != 0) {
-      pitEntry->insertOrUpdateInRecord(face1, *interest);
+      pitEntry->insertOrUpdateInRecord(*face1, *interest);
     }
     if ((i & 0x02) != 0) {
-      pitEntry->insertOrUpdateOutRecord(face1, *interest);
+      pitEntry->insertOrUpdateOutRecord(*face1, *interest);
     }
   }
   BOOST_CHECK_EQUAL(fib.size(), 300);
@@ -144,22 +144,22 @@
 
   shared_ptr<Interest> interestA = makeInterest("/A");
   shared_ptr<pit::Entry> entryA = pit.insert(*interestA).first;
-  entryA->insertOrUpdateInRecord(face1, *interestA);
-  entryA->insertOrUpdateInRecord(face2, *interestA);
-  entryA->insertOrUpdateOutRecord(face1, *interestA);
-  entryA->insertOrUpdateOutRecord(face2, *interestA);
+  entryA->insertOrUpdateInRecord(*face1, *interestA);
+  entryA->insertOrUpdateInRecord(*face2, *interestA);
+  entryA->insertOrUpdateOutRecord(*face1, *interestA);
+  entryA->insertOrUpdateOutRecord(*face2, *interestA);
   // {'/A':[1,2]}
 
   shared_ptr<Interest> interestB = makeInterest("/B");
   shared_ptr<pit::Entry> entryB = pit.insert(*interestB).first;
-  entryB->insertOrUpdateInRecord(face1, *interestB);
-  entryB->insertOrUpdateOutRecord(face1, *interestB);
+  entryB->insertOrUpdateInRecord(*face1, *interestB);
+  entryB->insertOrUpdateOutRecord(*face1, *interestB);
   // {'/A':[1,2], '/B':[1]}
 
   shared_ptr<Interest> interestC = makeInterest("/C");
   shared_ptr<pit::Entry> entryC = pit.insert(*interestC).first;
-  entryC->insertOrUpdateInRecord(face2, *interestC);
-  entryC->insertOrUpdateOutRecord(face2, *interestC);
+  entryC->insertOrUpdateInRecord(*face2, *interestC);
+  entryC->insertOrUpdateOutRecord(*face2, *interestC);
   // {'/A':[1,2], '/B':[1], '/C':[2]}
   BOOST_CHECK_EQUAL(pit.size(), 3);
 
@@ -172,9 +172,9 @@
   shared_ptr<pit::Entry> foundA = pit.find(*interestA);
   BOOST_REQUIRE(foundA != nullptr);
   BOOST_REQUIRE_EQUAL(foundA->getInRecords().size(), 1);
-  BOOST_CHECK_EQUAL(foundA->getInRecords().front().getFace(), face2);
+  BOOST_CHECK_EQUAL(&foundA->getInRecords().front().getFace(), face2.get());
   BOOST_REQUIRE_EQUAL(foundA->getOutRecords().size(), 1);
-  BOOST_CHECK_EQUAL(foundA->getOutRecords().front().getFace(), face2);
+  BOOST_CHECK_EQUAL(&foundA->getOutRecords().front().getFace(), face2.get());
 }
 
 BOOST_AUTO_TEST_SUITE_END() // FaceRemovalCleanup