commit 43f37a08fc270043d687650ecc927f495265fc3f
author Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 09 00:09:00 2023 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Aug 20 02:23:22 2023 +0000
tree 35597a55e0051d26723b9075478db7f8ee138fe5
parent ecb0b7180e88f87a08f0d659edd451c7a6b54b7b

Change namespace of DummyClientFace, Signal, Segmenter, SegmentFetcher

refs #3940

Change-Id: Ia3c9b4adcca9ff79a14be705ca9da525914f3dff

tests/test-lsdb.cpp

diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index bec64cb..f6e078b 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -110,7 +110,7 @@
   }
 
 public:
-  ndn::util::DummyClientFace face;
+  ndn::DummyClientFace face;
   ConfParameter conf;
   DummyConfFileProcessor confProcessor;
   Lsdb lsdb;
@@ -150,7 +150,7 @@
   auto deadline = ndn::time::steady_clock::now() + ndn::time::seconds(LSA_REFRESH_TIME_MAX);
 
   // Simulate an LSA interest timeout
-  lsdb.onFetchLsaError(ndn::util::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",
+  lsdb.onFetchLsaError(ndn::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",
                        oldInterestName, 0, deadline, interestName, oldSeqNo);
   advanceClocks(10_ms);
 
@@ -184,7 +184,7 @@
   interests.clear();
 
   // Simulate an LSA interest timeout where the sequence number is outdated
-  lsdb.onFetchLsaError(ndn::util::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",
+  lsdb.onFetchLsaError(ndn::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",
                        oldInterestName, 0, deadline, interestName, oldSeqNo);
   advanceClocks(10_ms);
 
@@ -211,7 +211,7 @@
   lsdb.installLsa(nameLsa);
 
   // Create another Lsdb and expressInterest
-  ndn::util::DummyClientFace face2(m_io, m_keyChain, {true, true});
+  ndn::DummyClientFace face2(m_io, m_keyChain, {true, true});
   face.linkTo(face2);
 
   ConfParameter conf2(face2, m_keyChain);
@@ -256,11 +256,11 @@
   ndn::Name interestName("/localhop/ndn/nlsr/LSA/site/%C1.Router/this-router/NAME/");
   interestName.appendNumber(seqNo);
 
-  ndn::util::DummyClientFace face2(m_io, m_keyChain, {true, true});
+  ndn::DummyClientFace face2(m_io, m_keyChain, {true, true});
   face.linkTo(face2);
 
-  auto fetcher = ndn::util::SegmentFetcher::start(face2, ndn::Interest(interestName),
-                                                  ndn::security::getAcceptAllValidator());
+  auto fetcher = ndn::SegmentFetcher::start(face2, ndn::Interest(interestName),
+                                            ndn::security::getAcceptAllValidator());
   fetcher->onComplete.connect([&expectedDataContent] (ndn::ConstBufferPtr bufferPtr) {
                                 ndn::Block block(bufferPtr);
                                 BOOST_CHECK_EQUAL(expectedDataContent, block);