commit 1d2d337e1b3be46cc370eb8e5dca02b33c7510d5
author Davide Pesavento <davidepesa@gmail.com> Tue Jan 14 12:04:12 2025 -0500
committer Davide Pesavento <davidepesa@gmail.com> Tue Jan 14 12:04:12 2025 -0500
tree 1c86856173442d5fa6d1b67aa92b67626ba73d6a
parent a745025bb41b0f50483358b4fc0a8c3035d1941c

tests: avoid hardcoding control command names

Change-Id: I98314d74d8f992e828af3d9b6c3e953ff4599bf9

tests/daemon/mgmt/strategy-choice-manager.t.cpp

diff --git a/tests/daemon/mgmt/strategy-choice-manager.t.cpp b/tests/daemon/mgmt/strategy-choice-manager.t.cpp
index 3553cfd..6cd2e70 100644
--- a/tests/daemon/mgmt/strategy-choice-manager.t.cpp
+++ b/tests/daemon/mgmt/strategy-choice-manager.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,
@@ -66,6 +66,11 @@
   }
 
 protected:
+  static inline const Name SET_SC_REQUEST = Name("/localhost/nfd")
+                                            .append(ndn::nfd::StrategyChoiceSetCommand::getName());
+  static inline const Name UNSET_SC_REQUEST = Name("/localhost/nfd")
+                                              .append(ndn::nfd::StrategyChoiceUnsetCommand::getName());
+
   StrategyChoice& sc;
   StrategyChoiceManager manager;
 
@@ -80,7 +85,7 @@
   ControlParameters reqParams;
   reqParams.setName("/A")
            .setStrategy(strategyNameP.getPrefix(-1)); // use unversioned strategy name in request
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/set", reqParams);
+  auto req = makeControlCommandRequest(SET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlParameters expectedParams;
@@ -104,7 +109,7 @@
   ControlParameters reqParams;
   reqParams.setName("/A")
            .setStrategy("/strategy-choice-manager-unknown");
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/set", reqParams);
+  auto req = makeControlCommandRequest(SET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlResponse expectedResp;
@@ -125,7 +130,7 @@
   ControlParameters reqParams;
   reqParams.setName(prefix)
            .setStrategy(strategyNameP);
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/set", reqParams);
+  auto req = makeControlCommandRequest(SET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlResponse expectedResp;
@@ -145,7 +150,7 @@
 
   ControlParameters reqParams;
   reqParams.setName("/A");
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/unset", reqParams);
+  auto req = makeControlCommandRequest(UNSET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlParameters expectedParams(reqParams);
@@ -163,7 +168,7 @@
 {
   ControlParameters reqParams;
   reqParams.setName("/A");
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/unset", reqParams);
+  auto req = makeControlCommandRequest(UNSET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlParameters expectedParams(reqParams);
@@ -181,7 +186,7 @@
 {
   ControlParameters reqParams;
   reqParams.setName("/");
-  auto req = makeControlCommandRequest("/localhost/nfd/strategy-choice/unset", reqParams);
+  auto req = makeControlCommandRequest(UNSET_SC_REQUEST, reqParams);
   receiveInterest(req);
 
   ControlResponse expectedResp;