tests: don't use makeDummyClientFace
refs #3383
Change-Id: Ia19d16b1f92c5f386c1bbdf3cb4c81aad24f36a0
diff --git a/tests/ping/client/statistics-collector.t.cpp b/tests/ping/client/statistics-collector.t.cpp
index a1cc177..6093785 100644
--- a/tests/ping/client/statistics-collector.t.cpp
+++ b/tests/ping/client/statistics-collector.t.cpp
@@ -33,9 +33,8 @@
{
protected:
StatisticsCollectorFixture()
- : face(util::makeDummyClientFace())
- , pingOptions(makeOptions())
- , pingProgram(*face, pingOptions)
+ : pingOptions(makeOptions())
+ , pingProgram(face, pingOptions)
, sc(pingProgram, pingOptions)
{
}
@@ -57,7 +56,7 @@
}
protected:
- shared_ptr<util::DummyClientFace> face;
+ util::DummyClientFace face;
Options pingOptions;
Ping pingProgram;
StatisticsCollector sc;
diff --git a/tests/ping/integrated.t.cpp b/tests/ping/integrated.t.cpp
index aec1896..fb6f1cc 100644
--- a/tests/ping/integrated.t.cpp
+++ b/tests/ping/integrated.t.cpp
@@ -34,35 +34,35 @@
{
public:
PingIntegratedFixture()
- : serverFace(util::makeDummyClientFace(io, {false, true}))
- , clientFace(util::makeDummyClientFace(io, {false, true}))
+ : serverFace(io, m_keyChain, {false, true})
+ , clientFace(io, m_keyChain, {false, true})
, wantLoss(false)
{
- serverFace->onSendInterest.connect([this] (const Interest& interest) {
- io.post([=] { if (!wantLoss) { clientFace->receive(interest); } });
+ serverFace.onSendInterest.connect([this] (const Interest& interest) {
+ io.post([=] { if (!wantLoss) { clientFace.receive(interest); } });
});
- clientFace->onSendInterest.connect([this] (const Interest& interest) {
- io.post([=] { if (!wantLoss) { serverFace->receive(interest); } });
+ clientFace.onSendInterest.connect([this] (const Interest& interest) {
+ io.post([=] { if (!wantLoss) { serverFace.receive(interest); } });
});
- serverFace->onSendData.connect([this] (const Data& data) {
- io.post([=] { if (!wantLoss) { clientFace->receive(data); } });
+ serverFace.onSendData.connect([this] (const Data& data) {
+ io.post([=] { if (!wantLoss) { clientFace.receive(data); } });
});
- clientFace->onSendData.connect([this] (const Data& data) {
- io.post([=] { if (!wantLoss) { serverFace->receive(data); } });
+ clientFace.onSendData.connect([this] (const Data& data) {
+ io.post([=] { if (!wantLoss) { serverFace.receive(data); } });
});
}
void onFinish()
{
- serverFace->shutdown();
- clientFace->shutdown();
+ serverFace.shutdown();
+ clientFace.shutdown();
io.stop();
}
public:
boost::asio::io_service io;
- shared_ptr<util::DummyClientFace> serverFace;
- shared_ptr<util::DummyClientFace> clientFace;
+ util::DummyClientFace serverFace;
+ util::DummyClientFace clientFace;
std::unique_ptr<server::PingServer> server;
std::unique_ptr<client::Ping> client;
bool wantLoss;
@@ -78,7 +78,7 @@
serverOpts.nMaxPings = 4;
serverOpts.shouldPrintTimestamp = false;
serverOpts.payloadSize = 0;
- server.reset(new server::PingServer(*serverFace, m_keyChain, serverOpts));
+ server.reset(new server::PingServer(serverFace, m_keyChain, serverOpts));
BOOST_REQUIRE_EQUAL(0, server->getNPings());
server->start();
@@ -91,7 +91,7 @@
clientOpts.interval = time::milliseconds(100);
clientOpts.timeout = time::milliseconds(2000);
clientOpts.startSeq = 1000;
- client.reset(new client::Ping(*clientFace, clientOpts));
+ client.reset(new client::Ping(clientFace, clientOpts));
client->afterFinish.connect(bind(&PingIntegratedFixture::onFinish, this));
client->start();
@@ -111,7 +111,7 @@
serverOpts.nMaxPings = 4;
serverOpts.shouldPrintTimestamp = false;
serverOpts.payloadSize = 0;
- server.reset(new server::PingServer(*serverFace, m_keyChain, serverOpts));
+ server.reset(new server::PingServer(serverFace, m_keyChain, serverOpts));
BOOST_REQUIRE_EQUAL(0, server->getNPings());
server->start();
@@ -124,7 +124,7 @@
clientOpts.interval = time::milliseconds(100);
clientOpts.timeout = time::milliseconds(500);
clientOpts.startSeq = 1000;
- client.reset(new client::Ping(*clientFace, clientOpts));
+ client.reset(new client::Ping(clientFace, clientOpts));
client->afterFinish.connect(bind(&PingIntegratedFixture::onFinish, this));
client->start();
diff --git a/tests/ping/server/ping-server.t.cpp b/tests/ping/server/ping-server.t.cpp
index 81fb883..7d2a8da 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-2015, Arizona Board of Regents.
+ * Copyright (c) 2014-2016, 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.
@@ -36,9 +36,9 @@
{
protected:
CreatePingServerFixture()
- : face(util::makeDummyClientFace(io, {false, true}))
+ : face(io, m_keyChain, {false, true})
, pingOptions(makeOptions())
- , pingServer(*face, m_keyChain, pingOptions)
+ , pingServer(face, m_keyChain, pingOptions)
{
}
@@ -69,7 +69,7 @@
protected:
boost::asio::io_service io;
- shared_ptr<util::DummyClientFace> face;
+ util::DummyClientFace face;
Options pingOptions;
PingServer pingServer;
};
@@ -81,8 +81,8 @@
this->advanceClocks(io, time::milliseconds(1), 200);
- face->receive(makePingInterest(1000));
- face->receive(makePingInterest(1001));
+ face.receive(makePingInterest(1000));
+ face.receive(makePingInterest(1001));
io.run();