tests: avoid hardcoding control command names

Change-Id: I98314d74d8f992e828af3d9b6c3e953ff4599bf9
named-data · Jan 14, 2025 · 1d2d337 · 1d2d337
1 parent a745025
commit 1d2d337
Show file tree

Hide file tree

Showing 10 changed files with 92 additions and 72 deletions.
diff --git a/tests/daemon/mgmt/cs-manager.t.cpp b/tests/daemon/mgmt/cs-manager.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2025,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -55,7 +55,7 @@ BOOST_FIXTURE_TEST_SUITE(TestCsManager, CsManagerFixture)
 BOOST_AUTO_TEST_CASE(Config)
 {
   using ndn::nfd::CsFlagBit;
-  const Name cmdPrefix("/localhost/nfd/cs/config");
+  const Name cmdPrefix = Name("/localhost/nfd").append(ndn::nfd::CsConfigCommand::getName());
 
   // setup initial CS config
   m_cs.setLimit(22129);
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(Erase)
   for (size_t i = 0; i < CsManager::ERASE_LIMIT + 1; ++i) {
     m_cs.insert(*makeData(Name("/H").appendSequenceNumber(i)));
   }
-  const Name cmdPrefix("/localhost/nfd/cs/erase");
+  const Name cmdPrefix = Name("/localhost/nfd").append(ndn::nfd::CsEraseCommand::getName());
 
   // requested Name matches no Data
   auto req = makeControlCommandRequest(cmdPrefix,

diff --git a/tests/daemon/mgmt/face-manager-command-fixture.cpp b/tests/daemon/mgmt/face-manager-command-fixture.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2024,  Regents of the University of California,
+ * Copyright (c) 2014-2025,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -109,12 +109,12 @@ FaceManagerCommandFixture::FaceManagerCommandFixture()
   : node1(m_keyChain, 16363)
   , node2(m_keyChain, 26363)
 {
-  advanceClocks(1_ms, 5);
+  advanceClocks(1_ms, 10);
 }
 
 FaceManagerCommandFixture::~FaceManagerCommandFixture()
 {
-  advanceClocks(1_ms, 5);
+  advanceClocks(1_ms, 10);
 }
 
 } // namespace nfd::tests
diff --git a/tests/daemon/mgmt/face-manager-command-fixture.hpp b/tests/daemon/mgmt/face-manager-command-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2023,  Regents of the University of California,
+ * Copyright (c) 2014-2025,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -40,7 +40,6 @@ class FaceManagerCommandNode
 
   ~FaceManagerCommandNode();
 
-public:
   const Face*
   findFaceByUri(const std::string& uri) const;
 
@@ -59,12 +58,17 @@ class FaceManagerCommandNode
 
 class FaceManagerCommandFixture : public InterestSignerFixture
 {
-public:
+protected:
   FaceManagerCommandFixture();
 
   ~FaceManagerCommandFixture() override;
 
 public:
+  static inline const Name CREATE_REQUEST = Name("/localhost/nfd").append(ndn::nfd::FaceCreateCommand::getName());
+  static inline const Name UPDATE_REQUEST = Name("/localhost/nfd").append(ndn::nfd::FaceUpdateCommand::getName());
+  static inline const Name DESTROY_REQUEST = Name("/localhost/nfd").append(ndn::nfd::FaceDestroyCommand::getName());
+
+protected:
   FaceManagerCommandNode node1; // used to test FaceManager
   FaceManagerCommandNode node2; // acts as a remote endpoint
 };

diff --git a/tests/daemon/mgmt/face-manager-create-face.t.cpp b/tests/daemon/mgmt/face-manager-create-face.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2024,  Regents of the University of California,
+ * Copyright (c) 2014-2025,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -332,7 +332,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, TestCases, FaceManagerCommandFixtur
   using FaceType = boost::mp11::mp_first<T>;
   using CreateResult = boost::mp11::mp_second<T>;
 
-  Interest req = makeControlCommandRequest("/localhost/nfd/faces/create", FaceType::getParameters());
+  Interest req = makeControlCommandRequest(this->CREATE_REQUEST, FaceType::getParameters());
 
   bool hasCallbackFired = false;
   this->node1.face.onSendData.connect([this, req, &hasCallbackFired] (const Data& response) {
@@ -417,7 +417,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, TestCases, FaceManagerCommandFixtur
   });
 
   this->node1.face.receive(req);
-  this->advanceClocks(1_ms, 5);
+  this->advanceClocks(1_ms, 10);
 
   BOOST_CHECK(hasCallbackFired);
 }
@@ -428,9 +428,9 @@ BOOST_FIXTURE_TEST_CASE(ExistingFace, FaceManagerCommandFixture)
 
   {
     // create face
-    Interest req = makeControlCommandRequest("/localhost/nfd/faces/create", FaceType::getParameters());
+    Interest req = makeControlCommandRequest(CREATE_REQUEST, FaceType::getParameters());
     this->node1.face.receive(req);
-    this->advanceClocks(1_ms, 5);
+    this->advanceClocks(1_ms, 10);
   }
 
   // find the created face
@@ -439,7 +439,7 @@ BOOST_FIXTURE_TEST_CASE(ExistingFace, FaceManagerCommandFixture)
 
   {
     // re-create face
-    Interest req = makeControlCommandRequest("/localhost/nfd/faces/create", FaceType::getParameters());
+    Interest req = makeControlCommandRequest(CREATE_REQUEST, FaceType::getParameters());
 
     bool hasCallbackFired = false;
     this->node1.face.onSendData.connect(
@@ -465,7 +465,7 @@ BOOST_FIXTURE_TEST_CASE(ExistingFace, FaceManagerCommandFixture)
       });
 
     this->node1.face.receive(req);
-    this->advanceClocks(1_ms, 5);
+    this->advanceClocks(1_ms, 10);
 
     BOOST_CHECK(hasCallbackFired);
   }

diff --git a/tests/daemon/mgmt/face-manager-update-face.t.cpp b/tests/daemon/mgmt/face-manager-update-face.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2024,  Regents of the University of California,
+ * Copyright (c) 2014-2025,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -82,7 +82,7 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
   void
   createFace(const ControlParameters& createParams, bool isForOnDemandFace = false)
   {
-    Interest req = makeControlCommandRequest("/localhost/nfd/faces/create", createParams);
+    Interest req = makeControlCommandRequest(CREATE_REQUEST, createParams);
 
     // if this creation if for on-demand face then create it on node2
     FaceManagerCommandNode& target = isForOnDemandFace ? this->node2 : this->node1;
@@ -112,11 +112,11 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
       });
 
     target.face.receive(req);
-    advanceClocks(1_ms, 5);
+    advanceClocks(1_ms, 10);
 
     if (isForOnDemandFace) {
       std::this_thread::sleep_for(std::chrono::milliseconds(100)); // allow wallclock time for socket IO
-      advanceClocks(1_ms, 5); // let node1 accept Interest and create on-demand face
+      advanceClocks(1_ms, 10); // let node1 accept Interest and create on-demand face
     }
 
     BOOST_REQUIRE(hasCallbackFired);
@@ -127,7 +127,7 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
              bool isSelfUpdating,
              const std::function<void(const ControlResponse& resp)>& checkResp)
   {
-    Interest req = makeControlCommandRequest("/localhost/nfd/faces/update", requestParams);
+    Interest req = makeControlCommandRequest(UPDATE_REQUEST, requestParams);
     if (isSelfUpdating) {
       // Attach IncomingFaceIdTag to interest
       req.setTag(make_shared<lp::IncomingFaceIdTag>(faceId));
@@ -147,7 +147,7 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
       });
 
     this->node1.face.receive(req);
-    advanceClocks(1_ms, 5);
+    advanceClocks(1_ms, 10);
     BOOST_REQUIRE(hasCallbackFired);
   }
 
@@ -161,7 +161,7 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
 
     ControlParameters params;
     params.setFaceId(faceId);
-    Interest req = makeControlCommandRequest("/localhost/nfd/faces/destroy", params);
+    Interest req = makeControlCommandRequest(DESTROY_REQUEST, params);
 
     bool hasCallbackFired = false;
     signal::ScopedConnection connection = this->node1.face.onSendData.connect(
@@ -178,7 +178,7 @@ class FaceManagerUpdateFixture : public FaceManagerCommandFixture
       });
 
     this->node1.face.receive(req);
-    advanceClocks(1_ms, 5);
+    advanceClocks(1_ms, 10);
     BOOST_REQUIRE(hasCallbackFired);
   }
 

diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
@@ -26,7 +26,7 @@
 #include "mgmt/face-manager.hpp"
 #include "face/protocol-factory.hpp"
 
-#include "manager-common-fixture.hpp"
+#include "face-manager-command-fixture.hpp"
 #include "tests/daemon/face/dummy-face.hpp"
 #include "tests/daemon/face/dummy-transport.hpp"
 
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(Existing)
   auto addedFace = addFace(REMOVE_LAST_NOTIFICATION | SET_SCOPE_LOCAL); // clear notification for creation
 
   auto parameters = ControlParameters().setFaceId(addedFace->getId());
-  auto req = makeControlCommandRequest("/localhost/nfd/faces/destroy", parameters);
+  auto req = makeControlCommandRequest(FaceManagerCommandFixture::DESTROY_REQUEST, parameters);
   receiveInterest(req);
 
   BOOST_REQUIRE_EQUAL(m_responses.size(), 2); // one response and one notification
@@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE(Existing)
 BOOST_AUTO_TEST_CASE(NonExisting)
 {
   auto parameters = ControlParameters().setFaceId(65535);
-  auto req = makeControlCommandRequest("/localhost/nfd/faces/destroy", parameters);
+  auto req = makeControlCommandRequest(FaceManagerCommandFixture::DESTROY_REQUEST, parameters);
   receiveInterest(req);
 
   BOOST_REQUIRE_EQUAL(m_responses.size(), 1);

diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -123,6 +123,11 @@ class FibManagerFixture : public ManagerFixtureWithAuthenticator
   }
 
 protected:
+  static inline const Name ADD_NH_REQUEST = Name("/localhost/nfd")
+                                            .append(ndn::nfd::FibAddNextHopCommand::getName());
+  static inline const Name REMOVE_NH_REQUEST = Name("/localhost/nfd")
+                                               .append(ndn::nfd::FibRemoveNextHopCommand::getName());
+
   Fib&       m_fib;
   FibManager m_manager;
 };
@@ -152,8 +157,7 @@ BOOST_AUTO_TEST_SUITE(AddNextHop)
 
 BOOST_AUTO_TEST_CASE(UnknownFaceId)
 {
-  auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop",
-                                       makeParameters("hello", face::FACEID_NULL, 101));
+  auto req = makeControlCommandRequest(ADD_NH_REQUEST, makeParameters("hello", face::FACEID_NULL, 101));
   receiveInterest(req);
   BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
 
@@ -173,8 +177,7 @@ BOOST_AUTO_TEST_CASE(NameTooLong)
     prefix.append("A");
   }
 
-  auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop",
-                                       makeParameters(prefix, addFace()));
+  auto req = makeControlCommandRequest(ADD_NH_REQUEST, makeParameters(prefix, addFace()));
   receiveInterest(req);
 
   ControlResponse expected(414, "FIB entry prefix cannot exceed " +
@@ -194,7 +197,7 @@ BOOST_AUTO_TEST_CASE(ImplicitFaceId)
   Name expectedName;
   ControlResponse expectedResponse;
   auto testAddNextHop = [&] (ControlParameters parameters, const FaceId& faceId) {
-    auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop", parameters);
+    auto req = makeControlCommandRequest(ADD_NH_REQUEST, parameters);
     req.setTag(make_shared<lp::IncomingFaceIdTag>(faceId));
     m_responses.clear();
     expectedName = req.getName();
@@ -219,7 +222,7 @@ BOOST_AUTO_TEST_CASE(InitialAdd)
   BOOST_REQUIRE_NE(addedFaceId, face::INVALID_FACEID);
 
   auto parameters = makeParameters("hello", addedFaceId, 101);
-  auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop", parameters);
+  auto req = makeControlCommandRequest(ADD_NH_REQUEST, parameters);
   receiveInterest(req);
 
   BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
@@ -235,7 +238,7 @@ BOOST_AUTO_TEST_CASE(ImplicitCost)
 
   auto originalParameters = ControlParameters().setName("/hello").setFaceId(addedFaceId);
   auto parameters = makeParameters("/hello", addedFaceId, 0);
-  auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop", originalParameters);
+  auto req = makeControlCommandRequest(ADD_NH_REQUEST, originalParameters);
   receiveInterest(req);
 
   BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
@@ -253,7 +256,7 @@ BOOST_AUTO_TEST_CASE(AddToExisting)
   ControlResponse expectedResponse;
   auto testAddNextHop = [&] (const ControlParameters& parameters) {
     m_responses.clear();
-    auto req = makeControlCommandRequest("/localhost/nfd/fib/add-nexthop", parameters);
+    auto req = makeControlCommandRequest(ADD_NH_REQUEST, parameters);
     expectedName = req.getName();
     expectedResponse = makeResponse(200, "OK", parameters);
     receiveInterest(req);
@@ -284,7 +287,7 @@ BOOST_AUTO_TEST_CASE(Basic)
   ControlResponse expectedResponse;
   auto testRemoveNextHop = [&] (const ControlParameters& parameters) {
     m_responses.clear();
-    auto req = makeControlCommandRequest("/localhost/nfd/fib/remove-nexthop", parameters);
+    auto req = makeControlCommandRequest(REMOVE_NH_REQUEST, parameters);
     expectedName = req.getName();
     expectedResponse = makeResponse(200, "OK", parameters);
     receiveInterest(req);
@@ -324,7 +327,7 @@ BOOST_AUTO_TEST_CASE(PrefixNotFound)
   BOOST_REQUIRE_NE(addedFaceId, face::INVALID_FACEID);
 
   auto parameters = makeParameters("hello", addedFaceId);
-  auto req = makeControlCommandRequest("/localhost/nfd/fib/remove-nexthop", parameters);
+  auto req = makeControlCommandRequest(REMOVE_NH_REQUEST, parameters);
   receiveInterest(req);
   BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
 
@@ -343,7 +346,7 @@ BOOST_AUTO_TEST_CASE(ImplicitFaceId)
   ControlResponse expectedResponse;
   auto testWithImplicitFaceId = [&] (ControlParameters parameters, FaceId face) {
     m_responses.clear();
-    auto req = makeControlCommandRequest("/localhost/nfd/fib/remove-nexthop", parameters);
+    auto req = makeControlCommandRequest(REMOVE_NH_REQUEST, parameters);
     req.setTag(make_shared<lp::IncomingFaceIdTag>(face));
     expectedName = req.getName();
     expectedResponse = makeResponse(200, "OK", parameters.setFaceId(face));
@@ -376,7 +379,7 @@ BOOST_AUTO_TEST_CASE(RecordNotExist)
   ControlResponse expectedResponse;
   auto testRemoveNextHop = [&] (ControlParameters parameters) {
     m_responses.clear();
-    auto req = makeControlCommandRequest("/localhost/nfd/fib/remove-nexthop", parameters);
+    auto req = makeControlCommandRequest(REMOVE_NH_REQUEST, parameters);
     expectedName = req.getName();
     expectedResponse = makeResponse(200, "OK", parameters);
     receiveInterest(req);