commit 771a0de40cbf858ad60051a84a5e53bb84f8ce3e
author Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 09 00:03:21 2023 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 14 10:49:07 2023 +0000
tree 8621dd4382e7da961451814906f9baa29c41e618
parent 907675bd06a7de95d4e9b9c5ee26b724bb523425

tests: change FaceId in test-nlsr and test-fib

DummyClientFace is no longer overwriting FaceId of prefix registration
reply, so that we can use FaceId other than 1.

refs #5011

Change-Id: I50ff0a6ee023ebe5cc78e6d62a45ce375798ad41

tests/test-nlsr.cpp

diff --git a/tests/test-nlsr.cpp b/tests/test-nlsr.cpp
index e888acf..b4f979c 100644
--- a/tests/test-nlsr.cpp
+++ b/tests/test-nlsr.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  The University of Memphis,
+ * Copyright (c) 2014-2023,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -207,7 +207,7 @@
 BOOST_AUTO_TEST_CASE(FaceCreateEvent)
 {
   // Setting constants for the unit test
-  const uint32_t faceId = 1;
+  const uint32_t faceId = 128;
   const std::string faceUri = "udp4://10.0.0.1:6363";
 
   Adjacent neighbor("/ndn/neighborA", ndn::FaceUri(faceUri), 10,
@@ -241,7 +241,7 @@
 BOOST_AUTO_TEST_CASE(FaceCreateEventNoMatch)
 {
   // Setting constants for the unit test
-  const uint32_t faceId = 1;
+  const uint32_t faceId = 128;
   const std::string eventUri = "udp4://10.0.0.1:6363";
   const std::string neighborUri = "udp4://10.0.0.2:6363";
 
@@ -272,10 +272,7 @@
 
 BOOST_AUTO_TEST_CASE(FaceCreateEventAlreadyConfigured)
 {
-  // So if NLSR gets the notification and registers prefixes it
-  // will change the Id to 1 and our tests will fail
-  // Need to disable registrationReply in dummy face and have own registration reply in the future
-  const uint32_t neighborFaceId = 1;
+  const uint32_t neighborFaceId = 128;
   const std::string faceUri = "udp4://10.0.0.1:6363";
 
   Adjacent neighbor("/ndn/neighborA", ndn::FaceUri(faceUri), 10,
@@ -289,7 +286,7 @@
   ndn::nfd::FaceEventNotification event;
   event.setKind(ndn::nfd::FACE_EVENT_CREATED)
     .setRemoteUri(faceUri)
-    .setFaceId(neighborFaceId); // Does not matter what we set here, dummy face always returns 1
+    .setFaceId(neighborFaceId);
   auto data = std::make_shared<ndn::Data>(ndn::Name("/localhost/nfd/faces/events").appendSequenceNumber(0));
   data->setFreshnessPeriod(1_s);
   data->setContent(event.wireEncode());
@@ -299,7 +296,6 @@
   // Move the clocks forward so that the Face processes the event.
   this->advanceClocks(10_ms);
 
-  // Check that the neighbor is configured with the face id of 1
   auto iterator = conf.getAdjacencyList().findAdjacent(ndn::FaceUri(faceUri));
   BOOST_REQUIRE(iterator != conf.getAdjacencyList().end());
   BOOST_CHECK_EQUAL(iterator->getFaceId(), neighborFaceId);