commit 946a51cc0e3b1765c3f4396dbb59a0b73c9d705b
author Junxiao Shi <git@mail1.yoursunny.com> Sat Nov 24 00:25:57 2018 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sat Nov 24 00:25:57 2018 +0000
tree 86d5d84656f00673bec4e9c6cbc5c63bbb8bba31
parent 74daf741cd9349e634698f70e5bf723e38a0cdf2

util: stop using ChildSelector in NotificationSubscriber

refs #4664

Change-Id: I9e6c39d49949f0b097c220eafbe4ce990549b54d

tests/unit/util/notification-subscriber.t.cpp

diff --git a/tests/unit/util/notification-subscriber.t.cpp b/tests/unit/util/notification-subscriber.t.cpp
index 3fe3fd6..886e651 100644
--- a/tests/unit/util/notification-subscriber.t.cpp
+++ b/tests/unit/util/notification-subscriber.t.cpp
@@ -64,7 +64,7 @@
     data.setFreshnessPeriod(1_s);
     m_keyChain.sign(data);
 
-    lastDeliveredSeqNo = nextSendNotificationNo;
+    lastDeliveredSeqNum = nextSendNotificationNo;
     lastNotification.setMessage("");
     ++nextSendNotificationNo;
     subscriberFace.receive(data);
@@ -133,7 +133,7 @@
 
     const Interest& interest = subscriberFace.sentInterests[0];
     return interest.getName() == streamPrefix &&
-           interest.getChildSelector() == 1 &&
+           interest.getCanBePrefix() &&
            interest.getMustBeFresh() &&
            interest.getInterestLifetime() == subscriber.getInterestLifetime();
   }
@@ -142,7 +142,7 @@
    *          or 0 if there's no such request as sole sent Interest
    */
   uint64_t
-  getRequestSeqNo() const
+  getRequestSeqNum() const
   {
     if (subscriberFace.sentInterests.size() != 1)
       return 0;
@@ -164,7 +164,7 @@
   util::signal::Connection notificationConn;
   util::signal::Connection nackConn;
   uint64_t nextSendNotificationNo;
-  uint64_t lastDeliveredSeqNo;
+  uint64_t lastDeliveredSeqNum;
   SimpleNotification lastNotification;
   lp::Nack lastNack;
   bool hasTimeout;
@@ -205,14 +205,14 @@
   this->deliverNotification("n1");
   advanceClocks(1_ms);
   BOOST_CHECK_EQUAL(lastNotification.getMessage(), "n1");
-  BOOST_CHECK_EQUAL(this->getRequestSeqNo(), lastDeliveredSeqNo + 1);
+  BOOST_CHECK_EQUAL(this->getRequestSeqNum(), lastDeliveredSeqNum + 1);
 
   // respond to continuation request
   subscriberFace.sentInterests.clear();
   this->deliverNotification("n2");
   advanceClocks(1_ms);
   BOOST_CHECK_EQUAL(lastNotification.getMessage(), "n2");
-  BOOST_CHECK_EQUAL(this->getRequestSeqNo(), lastDeliveredSeqNo + 1);
+  BOOST_CHECK_EQUAL(this->getRequestSeqNum(), lastDeliveredSeqNum + 1);
 }
 
 BOOST_AUTO_TEST_CASE(Nack)