commit 1e7a7b20c93014e86639e3d07f357c95b48b34ac
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 26 15:35:26 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 31 09:29:06 2015 -0700
tree d950101205515b568dc9b173525e5db24e28140b
parent 7f43c53c2a85d8d5a446f22571bf8b9a232099bd

ping: Code refactoring

Change-Id: I8b4e2c9dd3ba3adfae8d296a5635b048b35cf593
Refs: #3137

tests/ping/integrated.t.cpp

diff --git a/tests/ping/integrated.t.cpp b/tests/ping/integrated.t.cpp
index f8cb30d..b8e2164 100644
--- a/tests/ping/integrated.t.cpp
+++ b/tests/ping/integrated.t.cpp
@@ -22,6 +22,7 @@
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
 #include "tests/test-common.hpp"
+#include "../identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace ping {
@@ -29,7 +30,7 @@
 
 using namespace ndn::tests;
 
-class PingIntegratedFixture : public UnitTestTimeFixture
+class PingIntegratedFixture : public IdentityManagementTimeFixture
 {
 public:
   PingIntegratedFixture()
@@ -93,7 +94,7 @@
   serverOpts.nMaxPings = 4;
   serverOpts.shouldPrintTimestamp = false;
   serverOpts.payloadSize = 0;
-  server.reset(new server::PingServer(*serverFace, serverOpts));
+  server.reset(new server::PingServer(*serverFace, m_keyChain, serverOpts));
   BOOST_REQUIRE_EQUAL(0, server->getNPings());
   server->start();
 
@@ -128,7 +129,7 @@
   serverOpts.nMaxPings = 4;
   serverOpts.shouldPrintTimestamp = false;
   serverOpts.payloadSize = 0;
-  server.reset(new server::PingServer(*serverFace, serverOpts));
+  server.reset(new server::PingServer(*serverFace, m_keyChain, serverOpts));
   BOOST_REQUIRE_EQUAL(0, server->getNPings());
   server->start();
 

tests/ping/server/ping-server.t.cpp

diff --git a/tests/ping/server/ping-server.t.cpp b/tests/ping/server/ping-server.t.cpp
index 874f1b2..81fb883 100644
--- a/tests/ping/server/ping-server.t.cpp
+++ b/tests/ping/server/ping-server.t.cpp
@@ -21,6 +21,7 @@
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
 #include "tests/test-common.hpp"
+#include "../../identity-management-time-fixture.hpp"
 
 namespace ndn {
 namespace ping {
@@ -31,13 +32,13 @@
 
 BOOST_AUTO_TEST_SUITE(PingServerPingServer)
 
-class CreatePingServerFixture : public UnitTestTimeFixture
+class CreatePingServerFixture : public IdentityManagementTimeFixture
 {
 protected:
   CreatePingServerFixture()
     : face(util::makeDummyClientFace(io, {false, true}))
     , pingOptions(makeOptions())
-    , pingServer(*face, pingOptions)
+    , pingServer(*face, m_keyChain, pingOptions)
   {
   }