tests: IdentityManagementFixture no longer derives from BaseFixture
Also rename it to KeyChainFixture
Refs: #4528
Change-Id: Id86f4affc9c4c9ae159912430cc3e78557bf1ac2
diff --git a/tests/daemon/face/generic-link-service.t.cpp b/tests/daemon/face/generic-link-service.t.cpp
index 13d9476..00b6517 100644
--- a/tests/daemon/face/generic-link-service.t.cpp
+++ b/tests/daemon/face/generic-link-service.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -27,7 +27,7 @@
#include "face/face.hpp"
#include "dummy-transport.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include "tests/test-common.hpp"
#include <ndn-cxx/lp/empty-value.hpp>
@@ -45,7 +45,7 @@
using nfd::Face;
-class GenericLinkServiceFixture : public IdentityManagementTimeFixture
+class GenericLinkServiceFixture : public UnitTestTimeFixture, public KeyChainFixture
{
protected:
GenericLinkServiceFixture()
diff --git a/tests/daemon/face/internal-face.t.cpp b/tests/daemon/face/internal-face.t.cpp
index 4371317..dfb9888 100644
--- a/tests/daemon/face/internal-face.t.cpp
+++ b/tests/daemon/face/internal-face.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#include "face/internal-face.hpp"
#include "transport-test-common.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
namespace nfd {
namespace face {
@@ -36,8 +36,7 @@
BOOST_AUTO_TEST_SUITE(Face)
-class InternalFaceFixture : public UnitTestTimeFixture
- , public IdentityManagementFixture
+class InternalFaceFixture : public UnitTestTimeFixture, public KeyChainFixture
{
public:
InternalFaceFixture()
diff --git a/tests/daemon/mgmt/manager-common-fixture.hpp b/tests/daemon/mgmt/manager-common-fixture.hpp
index 8725680..a12d671 100644
--- a/tests/daemon/mgmt/manager-common-fixture.hpp
+++ b/tests/daemon/mgmt/manager-common-fixture.hpp
@@ -29,7 +29,7 @@
#include "mgmt/manager-base.hpp"
#include "fw/forwarder.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include <ndn-cxx/security/command-interest-signer.hpp>
#include <ndn-cxx/util/dummy-client-face.hpp>
@@ -39,7 +39,7 @@
/** \brief A fixture that provides a CommandInterestSigner.
*/
-class CommandInterestSignerFixture : public IdentityManagementTimeFixture
+class CommandInterestSignerFixture : public UnitTestTimeFixture, public KeyChainFixture
{
protected:
CommandInterestSignerFixture();
diff --git a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
index ea3ca10..6310ced 100644
--- a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
+++ b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
@@ -26,7 +26,7 @@
#include "mgmt/rib-manager.hpp"
#include "rib/fib-updater.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include <ndn-cxx/util/dummy-client-face.hpp>
@@ -35,7 +35,7 @@
using rib::Route;
-class RibManagerSlAnnounceFixture : public IdentityManagementTimeFixture
+class RibManagerSlAnnounceFixture : public UnitTestTimeFixture, public KeyChainFixture
{
public:
using SlAnnounceResult = RibManager::SlAnnounceResult;
diff --git a/tests/daemon/rib/fib-updates-common.hpp b/tests/daemon/rib/fib-updates-common.hpp
index 4668af5..7a123d3 100644
--- a/tests/daemon/rib/fib-updates-common.hpp
+++ b/tests/daemon/rib/fib-updates-common.hpp
@@ -28,7 +28,7 @@
#include "rib/fib-updater.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include "tests/daemon/rib/create-route.hpp"
#include <ndn-cxx/util/dummy-client-face.hpp>
@@ -60,7 +60,7 @@
return false;
}
-class FibUpdatesFixture : public nfd::tests::IdentityManagementFixture
+class FibUpdatesFixture : public nfd::tests::BaseFixture, public nfd::tests::KeyChainFixture
{
public:
FibUpdatesFixture()
diff --git a/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp b/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
index c455065..aaff73e 100644
--- a/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
+++ b/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
@@ -25,7 +25,7 @@
#include "rib/readvertise/host-to-gateway-readvertise-policy.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include <ndn-cxx/security/signing-helpers.hpp>
@@ -35,7 +35,7 @@
using namespace nfd::tests;
-class HostToGatewayReadvertisePolicyFixture : public IdentityManagementFixture
+class HostToGatewayReadvertisePolicyFixture : public BaseFixture, public KeyChainFixture
{
public:
static RibRouteRef
diff --git a/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp b/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
index e3afcbf..6787769 100644
--- a/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
+++ b/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
@@ -25,7 +25,7 @@
#include "rib/readvertise/nfd-rib-readvertise-destination.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include "tests/test-common.hpp"
#include <ndn-cxx/security/signing-info.hpp>
@@ -37,7 +37,7 @@
using namespace nfd::tests;
-class NfdRibReadvertiseDestinationFixture : public IdentityManagementTimeFixture
+class NfdRibReadvertiseDestinationFixture : public UnitTestTimeFixture, public KeyChainFixture
{
public:
NfdRibReadvertiseDestinationFixture()
diff --git a/tests/daemon/rib/readvertise/readvertise.t.cpp b/tests/daemon/rib/readvertise/readvertise.t.cpp
index d2d8bb2..15cc105 100644
--- a/tests/daemon/rib/readvertise/readvertise.t.cpp
+++ b/tests/daemon/rib/readvertise/readvertise.t.cpp
@@ -25,9 +25,10 @@
#include "rib/readvertise/readvertise.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "tests/key-chain-fixture.hpp"
#include <ndn-cxx/util/dummy-client-face.hpp>
+
#include <boost/range/adaptor/transformed.hpp>
#include <boost/range/algorithm/copy.hpp>
@@ -110,7 +111,7 @@
std::vector<HistoryEntry> withdrawHistory;
};
-class ReadvertiseFixture : public IdentityManagementTimeFixture
+class ReadvertiseFixture : public UnitTestTimeFixture, public KeyChainFixture
{
public:
ReadvertiseFixture()