commit 7249fb4d5225cbe99a3901f9485a8ad99a7abceb
author Eric Newberry <enewberry@cs.ucla.edu> Sun Apr 04 21:09:32 2021 -0700
committer Davide Pesavento <davidepesa@gmail.com> Mon Apr 05 18:16:44 2021 -0400
tree 65f38b27f20dd47479ac1c50e3d79b035562d671
parent 86644d36ff59764fe64d26fdebba71634d6d0332

docs+tests: finalize migration to typed naming conventions

refs #5044

Change-Id: Ia6f52ae0a31db33ca0f9fa6c4553b8fbbc7809bc

tests/tools/nfdc/strategy-choice-module.t.cpp

diff --git a/tests/tools/nfdc/strategy-choice-module.t.cpp b/tests/tools/nfdc/strategy-choice-module.t.cpp
index 634682b..22f7d92 100644
--- a/tests/tools/nfdc/strategy-choice-module.t.cpp
+++ b/tests/tools/nfdc/strategy-choice-module.t.cpp
@@ -69,8 +69,8 @@
 
   this->execute("strategy list");
   BOOST_CHECK_EQUAL(exitCode, 0);
-  BOOST_CHECK(out.is_equal("prefix=/ strategy=/strategyP/%FD%01\n"
-                           "prefix=/52VRvpL9/Yqfut4TNHv strategy=/strategyQ/%FD%02\n"));
+  BOOST_CHECK(out.is_equal("prefix=/ strategy=/strategyP/v=1\n"
+                           "prefix=/52VRvpL9/Yqfut4TNHv strategy=/strategyQ/v=2\n"));
   BOOST_CHECK(err.is_empty());
 }
 
@@ -97,7 +97,7 @@
   this->execute("strategy show /I1Ixgg0X");
   BOOST_CHECK_EQUAL(exitCode, 0);
   BOOST_CHECK(out.is_equal("  prefix=/\n"
-                           "strategy=/strategyP/%FD%01\n"));
+                           "strategy=/strategyP/v=1\n"));
   BOOST_CHECK(err.is_empty());
 }
 
@@ -110,7 +110,7 @@
   this->execute("strategy show /52VRvpL9/Yqfut4TNHv/Y5gY7gom");
   BOOST_CHECK_EQUAL(exitCode, 0);
   BOOST_CHECK(out.is_equal("  prefix=/52VRvpL9/Yqfut4TNHv\n"
-                           "strategy=/strategyQ/%FD%02\n"));
+                           "strategy=/strategyQ/v=2\n"));
   BOOST_CHECK(err.is_empty());
 }
 
@@ -145,7 +145,7 @@
 
   this->execute("strategy set /VBXSJg3m/XYs81ARNhx /strategyP");
   BOOST_CHECK_EQUAL(exitCode, 0);
-  BOOST_CHECK(out.is_equal("strategy-set prefix=/VBXSJg3m/XYs81ARNhx strategy=/strategyP/%FD%05\n"));
+  BOOST_CHECK(out.is_equal("strategy-set prefix=/VBXSJg3m/XYs81ARNhx strategy=/strategyP/v=5\n"));
   BOOST_CHECK(err.is_empty());
 }
 
@@ -225,13 +225,13 @@
     <strategyChoice>
       <namespace>/</namespace>
       <strategy>
-        <name>/localhost/nfd/strategy/best-route/%FD%04</name>
+        <name>/localhost/nfd/strategy/best-route/v=4</name>
       </strategy>
     </strategyChoice>
     <strategyChoice>
       <namespace>/localhost</namespace>
       <strategy>
-        <name>/localhost/nfd/strategy/multicast/%FD%04</name>
+        <name>/localhost/nfd/strategy/multicast/v=4</name>
       </strategy>
     </strategyChoice>
   </strategyChoices>
@@ -239,8 +239,8 @@
 
 const std::string STATUS_TEXT = std::string(R"TEXT(
 Strategy choices:
-  prefix=/ strategy=/localhost/nfd/strategy/best-route/%FD%04
-  prefix=/localhost strategy=/localhost/nfd/strategy/multicast/%FD%04
+  prefix=/ strategy=/localhost/nfd/strategy/best-route/v=4
+  prefix=/localhost strategy=/localhost/nfd/strategy/multicast/v=4
 )TEXT").substr(1);
 
 BOOST_FIXTURE_TEST_CASE(Status, StatusFixture<StrategyChoiceModule>)