commit 829aff664105c42408872a9b88536c60acf9660c
author Davide Pesavento <davidepesa@gmail.com> Sun May 15 20:30:34 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sun May 15 20:30:34 2022 -0400
tree 2edccb9cbc428045983d6838d679aa87d1832b95
parent 48903c2f37a737c97dc51481d9a1a72e766990f7

tests: sync common testing infrastructure with ndn-cxx

Change-Id: I1bd56d472f5627207f17c950eb4c5550d1b3724c

tests/unit-tests/requester.t.cpp

diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index 858a127..d1a47a4 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -24,17 +24,20 @@
 #include "detail/error-encoder.hpp"
 #include "detail/probe-encoder.hpp"
 
-#include "test-common.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/io-key-chain-fixture.hpp"
+
+#include <ndn-cxx/util/dummy-client-face.hpp>
 
 namespace ndncert::tests {
 
 using namespace requester;
 
-BOOST_FIXTURE_TEST_SUITE(TestRequester, IdentityManagementTimeFixture)
+BOOST_FIXTURE_TEST_SUITE(TestRequester, IoKeyChainFixture)
 
 BOOST_AUTO_TEST_CASE(GenProbeInterest)
 {
-  auto identity = addIdentity(Name("/site"));
+  auto identity = m_keyChain.createIdentity(Name("/site"));
   auto key = identity.getDefaultKey();
   auto cert = key.getDefaultCertificate();
 
@@ -57,8 +60,9 @@
   BOOST_CHECK_EQUAL(readString(firstInterest->getApplicationParameters().get(tlv::ParameterValue)), "zhiyi@cs.ucla.edu");
 }
 
-BOOST_AUTO_TEST_CASE(OnProbeResponse){
-  auto identity = addIdentity(Name("/site"));
+BOOST_AUTO_TEST_CASE(OnProbeResponse)
+{
+  auto identity = m_keyChain.createIdentity(Name("/site"));
   auto key = identity.getDefaultKey();
   auto cert = key.getDefaultCertificate();
 
@@ -73,7 +77,7 @@
   availableNames.emplace_back("/site1");
   availableNames.emplace_back("/site2");
 
-  ndn::util::DummyClientFace face(io, m_keyChain, {true, true});
+  ndn::util::DummyClientFace face(m_io, m_keyChain, {true, true});
   ca::CaModule ca(face, m_keyChain, "tests/unit-tests/config-files/config-ca-5", "ca-storage-memory");
 
   Data reply;
@@ -104,7 +108,7 @@
 
 BOOST_AUTO_TEST_CASE(ErrorHandling)
 {
-  auto identity = addIdentity(Name("/site"));
+  auto identity = m_keyChain.createIdentity(Name("/site"));
   auto key = identity.getDefaultKey();
   auto cert = key.getDefaultCertificate();