tests: Enable isolation of KeyChain during run of unit/integrated tests
Change-Id: Ia136e4bb074c14e8d824f563594cbc0ad7592c3b
Refs: #3655
diff --git a/tests/unit-tests/util/io.t.cpp b/tests/unit-tests/util/io.t.cpp
index d69123e..b8d0347 100644
--- a/tests/unit-tests/util/io.t.cpp
+++ b/tests/unit-tests/util/io.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+ * Copyright (c) 2013-2016 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -28,7 +28,7 @@
namespace ndn {
namespace tests {
-BOOST_FIXTURE_TEST_SUITE(UtilIo, security::IdentityManagementFixture)
+BOOST_FIXTURE_TEST_SUITE(UtilIo, IdentityManagementFixture)
BOOST_AUTO_TEST_CASE(Basic)
{
diff --git a/tests/unit-tests/util/notification-stream.t.cpp b/tests/unit-tests/util/notification-stream.t.cpp
index 0b15e61..8ac084a 100644
--- a/tests/unit-tests/util/notification-stream.t.cpp
+++ b/tests/unit-tests/util/notification-stream.t.cpp
@@ -1,6 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+ * Copyright (c) 2013-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 ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -19,51 +25,24 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-/**
- * Original copyright notice from NFD:
- *
- * Copyright (c) 2014, 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 "util/notification-stream.hpp"
#include "simple-notification.hpp"
#include "util/dummy-client-face.hpp"
#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "../identity-management-time-fixture.hpp"
namespace ndn {
namespace util {
namespace tests {
-BOOST_FIXTURE_TEST_SUITE(UtilNotificationStream, ndn::tests::UnitTestTimeFixture)
+BOOST_FIXTURE_TEST_SUITE(UtilNotificationStream, ndn::tests::IdentityManagementTimeFixture)
BOOST_AUTO_TEST_CASE(Post)
{
- DummyClientFace face(io);
- ndn::KeyChain keyChain;
+ DummyClientFace face(io, m_keyChain);
util::NotificationStream<SimpleNotification> notificationStream(face,
- "/localhost/nfd/NotificationStreamTest", keyChain);
+ "/localhost/nfd/NotificationStreamTest", m_keyChain);
SimpleNotification event1("msg1");
notificationStream.postNotification(event1);
diff --git a/tests/unit-tests/util/notification-subscriber.t.cpp b/tests/unit-tests/util/notification-subscriber.t.cpp
index 8dc1e60..0279569 100644
--- a/tests/unit-tests/util/notification-subscriber.t.cpp
+++ b/tests/unit-tests/util/notification-subscriber.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2015 Regents of the University of California,
+ * Copyright (c) 2013-2016 Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -31,7 +31,7 @@
#include "util/dummy-client-face.hpp"
#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "../identity-management-time-fixture.hpp"
namespace ndn {
namespace util {
@@ -39,14 +39,14 @@
BOOST_AUTO_TEST_SUITE(UtilNotificationSubscriber)
-class EndToEndFixture : public ndn::tests::UnitTestTimeFixture
+class EndToEndFixture : public ndn::tests::IdentityManagementTimeFixture
{
public:
EndToEndFixture()
: streamPrefix("ndn:/NotificationSubscriberTest")
- , publisherFace(io)
- , notificationStream(publisherFace, streamPrefix, publisherKeyChain)
- , subscriberFace(io)
+ , publisherFace(io, m_keyChain)
+ , notificationStream(publisherFace, streamPrefix, m_keyChain)
+ , subscriberFace(io, m_keyChain)
, subscriber(subscriberFace, streamPrefix, time::seconds(1))
{
}
@@ -125,7 +125,6 @@
protected:
Name streamPrefix;
DummyClientFace publisherFace;
- ndn::KeyChain publisherKeyChain;
util::NotificationStream<SimpleNotification> notificationStream;
DummyClientFace subscriberFace;
util::NotificationSubscriber<SimpleNotification> subscriber;
@@ -189,7 +188,7 @@
Name wrongName = streamPrefix;
wrongName.append("%07%07");
Data wrongData(wrongName);
- publisherKeyChain.sign(wrongData);
+ m_keyChain.sign(wrongData);
subscriberFace.receive(wrongData);
subscriberFace.sentInterests.clear();
lastNotification.setMessage("");
diff --git a/tests/unit-tests/util/segment-fetcher.t.cpp b/tests/unit-tests/util/segment-fetcher.t.cpp
index 7362439..ffcc402 100644
--- a/tests/unit-tests/util/segment-fetcher.t.cpp
+++ b/tests/unit-tests/util/segment-fetcher.t.cpp
@@ -29,7 +29,7 @@
#include "util/dummy-client-face.hpp"
#include "security/key-chain.hpp"
#include "lp/nack-header.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "../identity-management-time-fixture.hpp"
#include "../make-interest-data.hpp"
namespace ndn {
@@ -62,11 +62,11 @@
}
};
-class Fixture : public ndn::tests::UnitTestTimeFixture
+class Fixture : public ndn::tests::IdentityManagementTimeFixture
{
public:
Fixture()
- : face(io)
+ : face(io, m_keyChain)
, nErrors(0)
, nDatas(0)
, dataSize(0)
@@ -115,7 +115,6 @@
public:
DummyClientFace face;
- KeyChain keyChain;
uint32_t nErrors;
uint32_t lastError;