commit 04bfe0465addda77630a9100d2e8f99b9f7e5d20
author Eric Newberry <enewberry@cs.ucla.edu> Fri Mar 26 11:06:05 2021 -0700
committer Eric Newberry <enewberry@cs.ucla.edu> Fri Apr 02 11:03:51 2021 -0700
tree 6cab59888cc1b9ee452101cbb2694cb0aea88dee
parent 30d96e48750cac510d950191c71dba91a49be7cf

tests: make agnostic to whether name components typed or markers

refs #5044

Change-Id: If776224368556c864d6e1db74260cc00ff68d9fa

tests/test-nlsr.cpp

diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index 1f6c23c..cd4d0d2 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -147,7 +147,7 @@
   event.setKind(ndn::nfd::FACE_EVENT_CREATED)
     .setRemoteUri(faceUri)
     .setFaceId(faceId);
-  auto data = std::make_shared<ndn::Data>("/localhost/nfd/faces/events/%FE%00");
+  auto data = std::make_shared<ndn::Data>(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(0));
   data->setFreshnessPeriod(1_s);
   data->setContent(event.wireEncode());
   m_keyChain.sign(*data);
@@ -180,7 +180,7 @@
   event.setKind(ndn::nfd::FACE_EVENT_CREATED)
     .setRemoteUri(eventUri)
     .setFaceId(faceId);
-  auto data = std::make_shared<ndn::Data>("/localhost/nfd/faces/events/%FE%00");
+  auto data = std::make_shared<ndn::Data>(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(0));
   data->setFreshnessPeriod(1_s);
   data->setContent(event.wireEncode());
   m_keyChain.sign(*data);
@@ -215,7 +215,7 @@
   event.setKind(ndn::nfd::FACE_EVENT_CREATED)
     .setRemoteUri(faceUri)
     .setFaceId(neighborFaceId); // Does not matter what we set here, dummy face always returns 1
-  std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>("/localhost/nfd/faces/events/%FE%00");
+  auto data = std::make_shared<ndn::Data>(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(0));
   data->setFreshnessPeriod(1_s);
   data->setContent(event.wireEncode());
   m_keyChain.sign(*data);
@@ -231,7 +231,7 @@
 
   // Resend same event notification again
   m_face.sentInterests.clear();
-  data->setName("/localhost/nfd/faces/events/%FE%01");
+  data->setName(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(1));
   m_keyChain.sign(*data);
   m_face.receive(*data);
   this->advanceClocks(10_ms);
@@ -318,7 +318,7 @@
   event.setKind(ndn::nfd::FACE_EVENT_DESTROYED)
        .setFaceId(destroyFaceId);
 
-  auto data = std::make_shared<ndn::Data>("/localhost/nfd/faces/events/%FE%00");
+  auto data = std::make_shared<ndn::Data>(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(0));
   data->setFreshnessPeriod(1_s);
   data->setContent(event.wireEncode());
   m_keyChain.sign(*data);