tools: merge nfd-status into nfdc
nfd-status functionality is accessible through `nfdc legacy-nfd-status` subcommand,
and nfd-status is replaced with a shell script calling this subcommand.
refs #3749
Change-Id: Iab03f3bc9ddb4333a0b6ca5fb9c67f54e9960ab4
diff --git a/tests/tools/nfdc/forwarder-general-module.t.cpp b/tests/tools/nfdc/forwarder-general-module.t.cpp
new file mode 100644
index 0000000..d210dc7
--- /dev/null
+++ b/tests/tools/nfdc/forwarder-general-module.t.cpp
@@ -0,0 +1,156 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014-2016, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "nfdc/forwarder-general-module.hpp"
+#include <ndn-cxx/security/signing-helpers.hpp>
+
+#include "module-fixture.hpp"
+
+namespace nfd {
+namespace tools {
+namespace nfdc {
+namespace tests {
+
+BOOST_AUTO_TEST_SUITE(Nfdc)
+BOOST_FIXTURE_TEST_SUITE(TestForwarderGeneralModule, ModuleFixture<ForwarderGeneralModule>)
+
+class MakeNfdIdCollector
+{
+public:
+ unique_ptr<NfdIdCollector>
+ operator()(Face&, KeyChain&) const
+ {
+ return make_unique<NfdIdCollector>(make_unique<ValidatorNull>());
+ };
+};
+
+class ForwarderGeneralStatusFixture : public ModuleFixture<ForwarderGeneralModule,
+ MakeNfdIdCollector>
+{
+protected:
+ ForwarderGeneralStatusFixture()
+ {
+ module.setNfdIdCollector(*validator);
+
+ this->systemClock->setNow(time::seconds(1468784936));
+ BOOST_REQUIRE(this->addIdentity("/nfd-status/test-nfdid"));
+ }
+
+private:
+ virtual void
+ signDatasetReply(Data& data) override
+ {
+ m_keyChain.sign(data, ndn::security::signingByIdentity("/nfd-status/test-nfdid"));
+ }
+};
+
+const std::string STATUS_XML = stripXmlSpaces(R"XML(
+ <generalStatus>
+ <nfdId>/nfd-status/test-nfdid/KEY/ksk-1468784936000/ID-CERT</nfdId>
+ <version>0.4.1-1-g704430c</version>
+ <startTime>2016-06-24T15:13:46.856000</startTime>
+ <currentTime>2016-07-17T17:55:54.109000</currentTime>
+ <uptime>PT1996927S</uptime>
+ <nNameTreeEntries>668</nNameTreeEntries>
+ <nFibEntries>70</nFibEntries>
+ <nPitEntries>7</nPitEntries>
+ <nMeasurementsEntries>1</nMeasurementsEntries>
+ <nCsEntries>65536</nCsEntries>
+ <packetCounters>
+ <incomingPackets>
+ <nInterests>20699052</nInterests>
+ <nDatas>5598070</nDatas>
+ <nNacks>7230</nNacks>
+ </incomingPackets>
+ <outgoingPackets>
+ <nInterests>36501092</nInterests>
+ <nDatas>5671942</nDatas>
+ <nNacks>26762</nNacks>
+ </outgoingPackets>
+ </packetCounters>
+ </generalStatus>
+)XML");
+
+const std::string STATUS_TEXT = std::string(R"TEXT(
+General NFD status:
+ nfdId=/nfd-status/test-nfdid/KEY/ksk-1468784936000/ID-CERT
+ version=0.4.1-1-g704430c
+ startTime=20160624T151346.856000
+ currentTime=20160717T175554.109000
+ uptime=1996927 seconds
+ nNameTreeEntries=668
+ nFibEntries=70
+ nPitEntries=7
+ nMeasurementsEntries=1
+ nCsEntries=65536
+ nInInterests=20699052
+ nOutInterests=36501092
+ nInDatas=5598070
+ nOutDatas=5671942
+ nInNacks=7230
+ nOutNacks=26762
+)TEXT").substr(1);
+
+BOOST_FIXTURE_TEST_CASE(Status, ForwarderGeneralStatusFixture)
+{
+ this->fetchStatus();
+ ForwarderStatus payload;
+ payload.setNfdVersion("0.4.1-1-g704430c")
+ .setStartTimestamp(time::fromUnixTimestamp(time::milliseconds(1466781226856)))
+ .setCurrentTimestamp(time::fromUnixTimestamp(time::milliseconds(1468778154109)))
+ .setNNameTreeEntries(668)
+ .setNFibEntries(70)
+ .setNPitEntries(7)
+ .setNMeasurementsEntries(1)
+ .setNCsEntries(65536)
+ .setNInInterests(20699052)
+ .setNInDatas(5598070)
+ .setNInNacks(7230)
+ .setNOutInterests(36501092)
+ .setNOutDatas(5671942)
+ .setNOutNacks(26762);
+ this->sendDataset("/localhost/nfd/status/general", payload);
+ this->prepareStatusOutput();
+
+ BOOST_CHECK(statusXml.is_equal(STATUS_XML));
+ BOOST_CHECK(statusText.is_equal(STATUS_TEXT));
+}
+
+BOOST_AUTO_TEST_CASE(StatusNoNfdId)
+{
+ this->fetchStatus();
+ ForwarderStatus payload;
+ payload.setNfdVersion("0.4.1-1-g704430c");
+ this->sendDataset("/localhost/nfd/status/general", payload);
+ BOOST_CHECK_NO_THROW(this->prepareStatusOutput());
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestForwarderGeneralModule
+BOOST_AUTO_TEST_SUITE_END() // Nfdc
+
+} // namespace tests
+} // namespace nfdc
+} // namespace tools
+} // namespace nfd