all: Fixing compatibility with NFD 0.5 and ndn-cxx 0.5
Change-Id: I3d23acf29f4858049d1040a3e421e1c7151b3aba
diff --git a/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp b/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp
index 4cd6a04..40da7b9 100644
--- a/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-global-routing-helper.t.cpp
@@ -92,8 +92,8 @@
for (const auto& entry : ndn->getForwarder()->getFib()) {
bool isFirst = true;
for (auto& nextHop : entry.getNextHops()) {
- auto face = nextHop.getFace();
- auto linkService = dynamic_cast<NetDeviceLinkService*>(face->getLinkService());
+ auto& face = nextHop.getFace();
+ auto linkService = dynamic_cast<NetDeviceLinkService*>(face.getLinkService());
if (linkService == nullptr)
continue;
BOOST_CHECK_EQUAL(Names::FindName(linkService->GetNetDevice()->GetChannel()->GetDevice(1)->GetNode()), "C1");
@@ -137,8 +137,8 @@
for (const auto& entry : ndn->getForwarder()->getFib()) {
bool isFirst = true;
for (auto& nextHop : entry.getNextHops()) {
- auto face = nextHop.getFace();
- auto linkService = dynamic_cast<NetDeviceLinkService*>(face->getLinkService());
+ auto& face = nextHop.getFace();
+ auto linkService = dynamic_cast<NetDeviceLinkService*>(face.getLinkService());
if (linkService == nullptr)
continue;
BOOST_CHECK_EQUAL(Names::FindName(linkService->GetNetDevice()->GetChannel()->GetDevice(1)->GetNode()), "B2");
diff --git a/tests/unit-tests/helper/ndn-stack-helper.t.cpp b/tests/unit-tests/helper/ndn-stack-helper.t.cpp
index 25df0a2..a4fb8ed 100644
--- a/tests/unit-tests/helper/ndn-stack-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-stack-helper.t.cpp
@@ -59,7 +59,7 @@
// test that the CS policy for node 0 did not change
BOOST_CHECK_EQUAL(protoNode0->getForwarder()->getCs().getPolicy()->getName(), "lru");
// test which CS policy has be selected for node 1
- BOOST_CHECK_EQUAL(protoNode1->getForwarder()->getCs().getPolicy()->getName(), "fifo");
+ BOOST_CHECK_EQUAL(protoNode1->getForwarder()->getCs().getPolicy()->getName(), "priority_fifo");
}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
index 0b92fa7..cf06179 100644
--- a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
@@ -150,7 +150,7 @@
virtual void
afterReceiveInterest(const Face& inFace, const Interest& interest,
- shared_ptr<nfd::fib::Entry> fibEntry, shared_ptr<nfd::pit::Entry> pitEntry)
+ const shared_ptr<nfd::pit::Entry>& pitEntry)
{
// this strategy doesn't forward interests
}