commit 384327dc0cc498f679c7c7deafacb2a1338b52f4
author Davide Pesavento <davidepesa@gmail.com> Thu Jan 02 01:40:23 2025 -0500
committer Davide Pesavento <davidepesa@gmail.com> Thu Jan 02 14:05:52 2025 -0500
tree 39e9bb5757fd09cf3af3ad307bf5bbe12d7f4c30
parent b071654447fef378e960b7624b03c85d3dd49ba7

update: use NFD RIB control command definitions from ndn-cxx

And make validateParameters() static

Change-Id: I981bf3c8d5ba7b2ef7ef8292de5ec54bb7cc0c3b

tests/update/test-nfd-rib-command-processor.cpp

diff --git a/tests/update/test-nfd-rib-command-processor.cpp b/tests/update/test-nfd-rib-command-processor.cpp
index 17106dc..371610f 100644
--- a/tests/update/test-nfd-rib-command-processor.cpp
+++ b/tests/update/test-nfd-rib-command-processor.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2024,  The University of Memphis,
+ * Copyright (c) 2014-2025,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -20,7 +20,6 @@
  */
 
 #include "update/nfd-rib-command-processor.hpp"
-#include "adjacency-list.hpp"
 #include "conf-parameter.hpp"
 #include "nlsr.hpp"
 
@@ -98,8 +97,8 @@
 };
 
 using Commands = boost::mp11::mp_list<
-  update::NfdRibRegisterCommand,
-  update::NfdRibUnregisterCommand
+  ndn::nfd::RibRegisterCommand,
+  ndn::nfd::RibUnregisterCommand
 >;
 
 BOOST_FIXTURE_TEST_SUITE(TestNfdRibCommandProcessor, NfdRibCommandProcessorFixture)
@@ -115,16 +114,9 @@
 BOOST_AUTO_TEST_CASE_TEMPLATE(ValidateParametersFailure, NfdRibCommand, Commands)
 {
   ndn::nfd::ControlParameters parameters;
-  parameters.setName("/test/prefixA").setCost(10);
+  parameters.setName("/test/prefixA").setMtu(500);
 
-  bool wasValidated = true;
-  try {
-    processor.validateParameters<NfdRibCommand>(parameters);
-  }
-  catch (...) {
-    wasValidated = false;
-  }
-  BOOST_CHECK(!wasValidated);
+  BOOST_CHECK_THROW(processor.validateParameters<NfdRibCommand>(parameters), std::invalid_argument);
 }
 
 BOOST_AUTO_TEST_CASE(OnReceiveInterestRegisterCommand)