commit 20b229773946ef3850bbe2b25170f6998e77fdff
author Junxiao Shi <git@mail1.yoursunny.com> Wed May 24 21:04:16 2017 +0000
committer Alex Afanasyev <aa@cs.ucla.edu> Thu May 25 22:37:43 2017 -0700
tree ec2b5e32db340eae794bd1a7bd2b714fb529b95f
parent bfd66ade985728890dee0e3dc90bab1c2d7d7cea

ping+tests: switch to ndn-cxx KeyChain v2

refs #4089

Change-Id: I21b3b09acdea9c1de61a14e2652b4fa763f2a7a0

tests/dump/ndndump.t.cpp

diff --git a/tests/dump/ndndump.t.cpp b/tests/dump/ndndump.t.cpp
index d4b8396..b360bd9 100644
--- a/tests/dump/ndndump.t.cpp
+++ b/tests/dump/ndndump.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  University of Memphis.
+ * Copyright (c) 2014-2017,  University of Memphis.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -19,14 +19,14 @@
 
 #include "tools/dump/ndndump.hpp"
 
-#include "tests/test-common.hpp"
-
-#include <boost/test/output_test_stream.hpp>
-
 #include <ndn-cxx/lp/packet.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/util/ethernet.hpp>
 
+#include "tests/test-common.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include <boost/test/output_test_stream.hpp>
+
 namespace ndn {
 namespace dump {
 namespace tests {
@@ -52,7 +52,7 @@
   std::streambuf* originalBuffer;
 };
 
-class NdnDumpFixture
+class NdnDumpFixture : public IdentityManagementFixture
 {
 protected:
   NdnDumpFixture()
@@ -60,23 +60,23 @@
     dump.m_dataLinkType = DLT_EN10MB;
   }
 
-  template <typename Packet>
+  template<typename Packet>
   void
   receive(const Packet& packet)
   {
-    ndn::EncodingBuffer buffer(packet.wireEncode());
+    EncodingBuffer buffer(packet.wireEncode());
     receive(buffer);
   }
 
   void
-  receive(ndn::EncodingBuffer& buffer)
+  receive(EncodingBuffer& buffer)
   {
-    ndn::util::ethernet::Address host;
+    util::ethernet::Address host;
 
     // Ethernet header
-    uint16_t frameType = htons(ndn::util::ethernet::ETHERTYPE_NDN);
+    uint16_t frameType = htons(util::ethernet::ETHERTYPE_NDN);
     buffer.prependByteArray(reinterpret_cast<const uint8_t*>(&frameType),
-                            ndn::util::ethernet::TYPE_LEN);
+                            util::ethernet::TYPE_LEN);
     buffer.prependByteArray(host.data(), host.size());
     buffer.prependByteArray(host.data(), host.size());
 
@@ -98,7 +98,7 @@
 
 BOOST_AUTO_TEST_CASE(CaptureInterest)
 {
-  ndn::Interest interest("/test");
+  Interest interest("/test");
   interest.setNonce(0);
 
   this->receive(interest);
@@ -111,10 +111,8 @@
 
 BOOST_AUTO_TEST_CASE(CaptureData)
 {
-  ndn::security::KeyChain keyChain;
-
-  ndn::Data data("/test");
-  keyChain.sign(data);
+  Data data("/test");
+  m_keyChain.sign(data);
 
   this->receive(data);
 
@@ -125,11 +123,11 @@
 
 BOOST_AUTO_TEST_CASE(CaptureNack)
 {
-  ndn::Interest interest("/test");
+  Interest interest("/test");
   interest.setNonce(0);
 
-  ndn::lp::Nack nack(interest);
-  nack.setReason(ndn::lp::NackReason::DUPLICATE);
+  lp::Nack nack(interest);
+  nack.setReason(lp::NackReason::DUPLICATE);
 
   lp::Packet lpPacket(interest.wireEncode());
   lpPacket.add<lp::NackField>(nack.getHeader());
@@ -149,7 +147,7 @@
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
   };
 
-  ndn::Buffer buffer(data, 4);
+  Buffer buffer(data, 4);
 
   lp::Packet lpPacket;
   lpPacket.add<lp::FragmentField>(std::make_pair(buffer.begin(), buffer.end()));
@@ -201,7 +199,7 @@
 
 BOOST_AUTO_TEST_CASE(CaptureUnknownNetworkPacket)
 {
-  EncodingBuffer buffer(ndn::encoding::makeEmptyBlock(tlv::Name));
+  EncodingBuffer buffer(encoding::makeEmptyBlock(tlv::Name));
 
   this->receive(buffer);