Various fixes for NFD/ndn-cxx 0.7.0
Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c
diff --git a/tests/unit-tests/helper/ndn-fib-helper.t.cpp b/tests/unit-tests/helper/ndn-fib-helper.t.cpp
index 60a5967..7426fda 100644
--- a/tests/unit-tests/helper/ndn-fib-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-fib-helper.t.cpp
@@ -38,7 +38,7 @@
addApps({
{"1", "ns3::ndn::ConsumerCbr",
{{"Prefix", "/prefix"}, {"Frequency", "1"}},
- "0s", "9.99s"},
+ "0s", "10.5s"},
{"2", "ns3::ndn::Producer",
{{"Prefix", "/prefix"}, {"PayloadSize", "1024"}},
"0s", "100s"}
@@ -47,7 +47,7 @@
~AddRouteFixture()
{
- Simulator::Stop(Seconds(20.001));
+ Simulator::Stop(Seconds(20.101));
Simulator::Run();
BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nOutInterests, 10);
diff --git a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
index 3d79ffa..0df5280 100644
--- a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
@@ -55,17 +55,17 @@
Simulator::Schedule(Seconds(10.1), ndn::LinkControlHelper::UpLink, getNode("1"), getNode("2"));
nfd::getScheduler().schedule(time::milliseconds(5200), [&] {
- BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 6);
- BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 6);
+ BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 5);
+ BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 5);
});
nfd::getScheduler().schedule(time::milliseconds(10200), [&] {
- BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 6);
- BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 6);
+ BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 5);
+ BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 5);
});
nfd::getScheduler().schedule(time::milliseconds(15100), [&] {
- BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 11);
- BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 11);
+ BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 10);
+ BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 10);
});
Simulator::Stop(Seconds(15.2));
diff --git a/tests/unit-tests/model/ndn-block-header.t.cpp b/tests/unit-tests/model/ndn-block-header.t.cpp
index 474f7e5..9360998 100644
--- a/tests/unit-tests/model/ndn-block-header.t.cpp
+++ b/tests/unit-tests/model/ndn-block-header.t.cpp
@@ -56,17 +56,17 @@
interest.setNonce(10);
interest.setCanBePrefix(true);
lp::Packet lpPacket(interest.wireEncode());
- nfd::face::Transport::Packet packet(lpPacket.wireEncode());
+ auto packet(lpPacket.wireEncode());
BlockHeader header(packet);
- BOOST_CHECK_EQUAL(header.GetSerializedSize(), 18); // 18
+ BOOST_CHECK_EQUAL(header.GetSerializedSize(), 20); // 20
{
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
packet->Print(output);
- BOOST_CHECK(output.is_equal("ns3::ndn::Packet (Interest: /prefix?ndn.Nonce=10)"));
+ BOOST_CHECK(output.is_equal("ns3::ndn::Packet (Interest: /prefix?CanBePrefix&Nonce=10)"));
}
}
@@ -77,7 +77,7 @@
data.setContent(std::make_shared< ::ndn::Buffer>(1024));
ndn::StackHelper::getKeyChain().sign(data);
lp::Packet lpPacket(data.wireEncode());
- nfd::face::Transport::Packet packet(lpPacket.wireEncode());
+ auto packet(lpPacket.wireEncode());
BlockHeader header(packet);
BOOST_CHECK_EQUAL(header.GetSerializedSize(), 1350);
@@ -102,23 +102,23 @@
lpPacket.add<::ndn::lp::FragmentField>(std::make_pair(interest.wireEncode().begin(), interest.wireEncode().end()));
{
- BlockHeader header(nfd::face::Transport::Packet(lpPacket.wireEncode()));
+ BlockHeader header(lpPacket.wireEncode());
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
packet->Print(output);
- BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(Interest: /prefix?ndn.Nonce=10))"));
+ BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(Interest: /prefix?CanBePrefix&Nonce=10))"));
}
lpPacket.add<::ndn::lp::NackField>(::ndn::lp::NackHeader().setReason(::ndn::lp::NackReason::NO_ROUTE));
{
- BlockHeader header(nfd::face::Transport::Packet(lpPacket.wireEncode()));
+ BlockHeader header(lpPacket.wireEncode());
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
packet->Print(output);
- BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(NACK(NoRoute) for Interest: /prefix?ndn.Nonce=10))"));
+ BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(NACK(NoRoute) for Interest: /prefix?CanBePrefix&Nonce=10))"));
}
lpPacket.remove<::ndn::lp::NackField>();
@@ -126,18 +126,18 @@
lpPacket.add<::ndn::lp::FragCountField>(1);
{
- BlockHeader header(nfd::face::Transport::Packet(lpPacket.wireEncode()));
+ BlockHeader header(lpPacket.wireEncode());
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
packet->Print(output);
- BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(Interest: /prefix?ndn.Nonce=10))"));
+ BOOST_CHECK(output.is_equal("ns3::ndn::Packet (NDNLP(Interest: /prefix?CanBePrefix&Nonce=10))"));
}
lpPacket.set<::ndn::lp::FragCountField>(2);
{
- BlockHeader header(nfd::face::Transport::Packet(lpPacket.wireEncode()));
+ BlockHeader header(lpPacket.wireEncode());
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
@@ -151,7 +151,7 @@
lpPacket.remove<::ndn::lp::FragIndexField>();
{
- BlockHeader header(nfd::face::Transport::Packet(lpPacket.wireEncode()));
+ BlockHeader header(lpPacket.wireEncode());
Ptr<Packet> packet = Create<Packet>();
packet->AddHeader(header);
boost::test_tools::output_test_stream output;
diff --git a/tests/unit-tests/ndn-cxx/face.t.cpp b/tests/unit-tests/ndn-cxx/face.t.cpp
index 32a1c1c..98d880b 100644
--- a/tests/unit-tests/ndn-cxx/face.t.cpp
+++ b/tests/unit-tests/ndn-cxx/face.t.cpp
@@ -230,7 +230,7 @@
private:
::ndn::Scheduler m_scheduler;
- ::ndn::util::scheduler::ScopedEventId m_event;
+ ::ndn::scheduler::ScopedEventId m_event;
};
BOOST_AUTO_TEST_CASE(ExpressMultipleInterests)
diff --git a/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp b/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
index 3e8804c..fe9b380 100644
--- a/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
+++ b/tests/unit-tests/utils/tracers/ndn-app-delay-tracer.t.cpp
@@ -54,7 +54,7 @@
addApps({
{"1", "ns3::ndn::ConsumerCbr",
{{"Prefix", "/prefix"}, {"Frequency", "1"}},
- "0s", "0.9s"}, // send just one packet
+ "1s", "1.9s"}, // send just one packet
// Second consumer will capture effect of the bug #2764
{"2", "ns3::ndn::ConsumerCbr",
{{"Prefix", "/prefix"}, {"Frequency", "1"}},
@@ -89,12 +89,12 @@
BOOST_CHECK_EQUAL(buffer.str(),
R"STR(Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount
-0.0417744 1 0 0 LastDelay 0.0417744 41774.4 1 2
-0.0417744 1 0 0 FullDelay 0.0417744 41774.4 1 2
+1.04177 1 0 0 LastDelay 0.0417664 41766.4 1 2
+1.04177 1 0 0 FullDelay 0.0417664 41766.4 1 2
2 2 0 0 LastDelay 0 0 1 1
2 2 0 0 FullDelay 0 0 1 1
-3.02089 2 0 1 LastDelay 0.0208872 20887.2 1 1
-3.02089 2 0 1 FullDelay 0.0208872 20887.2 1 1
+3.02088 2 0 1 LastDelay 0.0208832 20883.2 1 1
+3.02088 2 0 1 FullDelay 0.0208832 20883.2 1 1
)STR");
}
@@ -116,8 +116,8 @@
BOOST_CHECK_EQUAL(buffer.str(),
R"STR(Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount
-0.0417744 1 0 0 LastDelay 0.0417744 41774.4 1 2
-0.0417744 1 0 0 FullDelay 0.0417744 41774.4 1 2
+1.04177 1 0 0 LastDelay 0.0417664 41766.4 1 2
+1.04177 1 0 0 FullDelay 0.0417664 41766.4 1 2
)STR");
}
@@ -138,8 +138,8 @@
R"STR(Time Node AppId SeqNo Type DelayS DelayUS RetxCount HopCount
2 2 0 0 LastDelay 0 0 1 1
2 2 0 0 FullDelay 0 0 1 1
-3.02089 2 0 1 LastDelay 0.0208872 20887.2 1 1
-3.02089 2 0 1 FullDelay 0.0208872 20887.2 1 1
+3.02088 2 0 1 LastDelay 0.0208832 20883.2 1 1
+3.02088 2 0 1 FullDelay 0.0208832 20883.2 1 1
)STR");
}
@@ -156,8 +156,8 @@
BOOST_CHECK(output->is_equal(
R"STR(2 2 0 0 LastDelay 0 0 1 1
2 2 0 0 FullDelay 0 0 1 1
-3.02089 2 0 1 LastDelay 0.0208872 20887.2 1 1
-3.02089 2 0 1 FullDelay 0.0208872 20887.2 1 1
+3.02088 2 0 1 LastDelay 0.0208832 20883.2 1 1
+3.02088 2 0 1 FullDelay 0.0208832 20883.2 1 1
)STR"));
}