commit 6677762595918ef14afbcb583cbb3ab5ce16807d
author Davide Pesavento <davidepesa@gmail.com> Fri Oct 09 18:46:03 2020 -0400
committer Davide Pesavento <davidepesa@gmail.com> Tue Nov 24 15:18:18 2020 -0500
tree 2a35ccaf231d91e32aef024b63fafa8e35bbd21c
parent 374f4e47b57bc41b4fca4887518c39f5c165cdaa

tests: sync common testing infrastructure with ndn-cxx and NFD

And upgrade waf to version 2.0.21

Change-Id: Id713e0f3035badd97ca7fc03f76e50085b9a266c

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 1fe5b35..f7ff66f 100644
--- a/tests/ping/server/ping-server.t.cpp
+++ b/tests/ping/server/ping-server.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018,  Arizona Board of Regents.
+ * Copyright (c) 2014-2020,  Arizona Board of Regents.
  *
  * This file is part of ndn-tools (Named Data Networking Essential Tools).
  * See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -20,7 +20,8 @@
 #include "tools/ping/server/ping-server.hpp"
 
 #include "tests/test-common.hpp"
-#include "../../identity-management-fixture.hpp"
+#include "tests/io-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
 
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
@@ -34,11 +35,11 @@
 BOOST_AUTO_TEST_SUITE(Ping)
 BOOST_AUTO_TEST_SUITE(TestPingServer)
 
-class CreatePingServerFixture : public IdentityManagementTimeFixture
+class CreatePingServerFixture : public IoFixture, public KeyChainFixture
 {
 protected:
   CreatePingServerFixture()
-    : face(io, m_keyChain, {false, true})
+    : face(m_io, m_keyChain, {false, true})
     , pingOptions(makeOptions())
     , pingServer(face, m_keyChain, pingOptions)
   {
@@ -72,7 +73,6 @@
   }
 
 protected:
-  boost::asio::io_service io;
   util::DummyClientFace face;
   Options pingOptions;
   PingServer pingServer;
@@ -83,12 +83,12 @@
   BOOST_REQUIRE_EQUAL(0, pingServer.getNPings());
   pingServer.start();
 
-  advanceClocks(io, 1_ms, 200);
+  advanceClocks(1_ms, 200);
 
   face.receive(makePingInterest(1000));
   face.receive(makePingInterest(1001));
 
-  io.run();
+  m_io.run();
 
   BOOST_CHECK_EQUAL(2, pingServer.getNPings());
 }