commit 4738f15594d7a1c62f692f7fb2a372aabed9308e
author Eric Newberry <enewberry@cs.arizona.edu> Mon Dec 18 13:10:32 2017 -0700
committer Davide Pesavento <davide.pesavento@lip6.fr> Thu Dec 21 21:10:50 2017 -0500
tree 9879f782d84ff8f4b3f2d5827261a27a61f90648
parent 00d39fda3c24e48fc0fee5f0749bcf596f3876dc

tests: make CongestionMarkStrategy parameters human-readable

Change-Id: I45448640b9125015a0ae2711f14fc3c1472603c3

tests/other/fw/congestion-mark-strategy.cpp

diff --git a/tests/other/fw/congestion-mark-strategy.cpp b/tests/other/fw/congestion-mark-strategy.cpp
index 25e00cb..717853f 100644
--- a/tests/other/fw/congestion-mark-strategy.cpp
+++ b/tests/other/fw/congestion-mark-strategy.cpp
@@ -25,12 +25,9 @@
 
 #include "congestion-mark-strategy.hpp"
 
-#include <ndn-cxx/lp/tags.hpp>
-
 namespace nfd {
 namespace fw {
 
-NFD_LOG_INIT("CongestionMarkStrategy");
 NFD_REGISTER_STRATEGY(CongestionMarkStrategy);
 
 CongestionMarkStrategy::CongestionMarkStrategy(Forwarder& forwarder, const Name& name)
@@ -43,18 +40,23 @@
   ParsedInstanceName parsed = parseInstanceName(name);
   switch (parsed.parameters.size()) {
   case 2:
-    if (!parsed.parameters.at(1).isNumber()) {
-      BOOST_THROW_EXCEPTION(
-        std::invalid_argument("Second parameter to CongestionMarkStrategy must be a non-negative integer"));
+    if (parsed.parameters.at(1).toUri() != "true" && parsed.parameters.at(1).toUri() != "false") {
+      BOOST_THROW_EXCEPTION(std::invalid_argument(
+        "Second parameter to CongestionMarkStrategy must be either 'true' or 'false'"));
     }
-    m_shouldPreserveMark = parsed.parameters.at(1).toNumber() != 0;
+    m_shouldPreserveMark = parsed.parameters.at(1).toUri() == "true";
     NDN_CXX_FALLTHROUGH;
   case 1:
-    if (!parsed.parameters.at(0).isNumber()) {
-      BOOST_THROW_EXCEPTION(
-        std::invalid_argument("First parameter to CongestionMarkStrategy must be a non-negative integer"));
+    try {
+      auto s = parsed.parameters.at(0).toUri();
+      if (!s.empty() && s[0] == '-')
+        BOOST_THROW_EXCEPTION(boost::bad_lexical_cast());
+      m_congestionMark = boost::lexical_cast<uint64_t>(s);
     }
-    m_congestionMark = parsed.parameters.at(0).toNumber();
+    catch (const boost::bad_lexical_cast&) {
+      BOOST_THROW_EXCEPTION(std::invalid_argument(
+        "First parameter to CongestionMarkStrategy must be a non-negative integer"));
+    }
     NDN_CXX_FALLTHROUGH;
   case 0:
     break;