commit b347b7f189a4667594efa24f42a735d7a144f2ee
author Junxiao Shi <git@mail1.yoursunny.com> Sun Jul 23 14:01:58 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Jul 23 14:01:58 2017 +0000
tree 6ea034ee55b3551207e4e61022f046b564b21167
parent 6837d4f732dbd37802177dfa52166967a66c0cf5

tools: switch to v2::Validator in nfdc

"nfdid" field in 'nfdc status show' command is temporarily unavailable
because NfdIdCollector relies on v1 Validator. It will be re-implemented
in a future commit.

refs #4089

Change-Id: I21feae43055a17438d8bd3c0439ae4e0a2d5d14c

tests/tools/nfdc/forwarder-general-module.t.cpp

diff --git a/tests/tools/nfdc/forwarder-general-module.t.cpp b/tests/tools/nfdc/forwarder-general-module.t.cpp
index d7ac0a3..f97d36d 100644
--- a/tests/tools/nfdc/forwarder-general-module.t.cpp
+++ b/tests/tools/nfdc/forwarder-general-module.t.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
@@ -36,23 +36,22 @@
 BOOST_AUTO_TEST_SUITE(Nfdc)
 BOOST_FIXTURE_TEST_SUITE(TestForwarderGeneralModule, StatusFixture<ForwarderGeneralModule>)
 
-class MakeNfdIdCollector
-{
-public:
-  unique_ptr<NfdIdCollector>
-  operator()(Face&, KeyChain&) const
-  {
-    return make_unique<NfdIdCollector>(make_unique<ValidatorNull>());
-  };
-};
+// class MakeNfdIdCollector
+// {
+// public:
+//   unique_ptr<NfdIdCollector>
+//   operator()(Face&, KeyChain&) const
+//   {
+//     return make_unique<NfdIdCollector>(make_unique<ValidatorNull>());
+//   };
+// };
 
-class ForwarderGeneralStatusFixture : public StatusFixture<ForwarderGeneralModule,
-                                                           MakeNfdIdCollector>
+class ForwarderGeneralStatusFixture : public StatusFixture<ForwarderGeneralModule>
 {
 protected:
   ForwarderGeneralStatusFixture()
   {
-    module.setNfdIdCollector(*validator);
+    // module.setNfdIdCollector(*validator);
 
     BOOST_REQUIRE(this->addIdentity("/nfd-status/test-nfdid",
                                     ndn::EcKeyParams(name::Component("KEYID"))));
@@ -68,7 +67,7 @@
 
 const std::string STATUS_XML = stripXmlSpaces(R"XML(
   <generalStatus>
-    <nfdId>/nfd-status/test-nfdid/KEY/KEYID</nfdId>
+    <nfdId>/nfdId-unavailable</nfdId>
     <version>0.4.1-1-g704430c</version>
     <startTime>2016-06-24T15:13:46.856000</startTime>
     <currentTime>2016-07-17T17:55:54.109000</currentTime>
@@ -95,7 +94,7 @@
 
 const std::string STATUS_TEXT = std::string(R"TEXT(
 General NFD status:
-                 nfdId=/nfd-status/test-nfdid/KEY/KEYID
+                 nfdId=/nfdId-unavailable
                version=0.4.1-1-g704430c
              startTime=20160624T151346.856000
            currentTime=20160717T175554.109000

tests/tools/nfdc/status-fixture.hpp

diff --git a/tests/tools/nfdc/status-fixture.hpp b/tests/tools/nfdc/status-fixture.hpp
index 2d33d37..b955f7a 100644
--- a/tests/tools/nfdc/status-fixture.hpp
+++ b/tests/tools/nfdc/status-fixture.hpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
@@ -37,8 +37,8 @@
 
 using ndn::Face;
 using ndn::KeyChain;
-using ndn::Validator;
-using ndn::ValidatorNull;
+using ndn::security::v2::Validator;
+using ndn::security::v2::ValidatorNull;
 using boost::test_tools::output_test_stream;
 
 class MakeValidatorNull