commit f91d1dfe151a57ceb5fd080993404970c39c4877
author Davide Pesavento <davidepesa@gmail.com> Wed Nov 25 14:50:41 2020 -0500
committer Davide Pesavento <davidepesa@gmail.com> Wed Nov 25 14:50:41 2020 -0500
tree fc1ac2f3571ca40e1f047fa4d8c4e1e30e2f6f31
parent 8ab7572247a74b1a0e9315a736db313a09f4d041

tests: sync common testing infrastructure with ndn-cxx

Also upgrade waf to version 2.0.21

Change-Id: Ibfd3386772d48df287b6be73e6d778d3661abe86

tests/test-producer-base.cpp

diff --git a/tests/test-producer-base.cpp b/tests/test-producer-base.cpp
index e3a813c..4320e83 100644
--- a/tests/test-producer-base.cpp
+++ b/tests/test-producer-base.cpp
@@ -56,7 +56,7 @@
   BOOST_CHECK_EQUAL(prefix.getPrefix(-1), userNode);
 
   producerBase.removeUserNode(userNode);
-  BOOST_CHECK(producerBase.getSeqNo(userNode.toUri()) == ndn::nullopt);
+  BOOST_CHECK(producerBase.getSeqNo(userNode.toUri()) == nullopt);
   BOOST_CHECK(producerBase.m_biMap.right.find(prefixWithSeq) == producerBase.m_biMap.right.end());
   BOOST_CHECK(producerBase.m_biMap.left.find(hash) == producerBase.m_biMap.left.end());
 
@@ -72,12 +72,12 @@
   ProducerBase producerBase(40, face, Name("/psync"), Name("/testUser"));
 
   BOOST_CHECK_EQUAL(face.sentData.size(), 0);
-  producerBase.m_syncReplyFreshness = time::milliseconds(1000);
+  producerBase.m_syncReplyFreshness = 1_s;
   producerBase.sendApplicationNack(Name("test"));
-  face.processEvents(time::milliseconds(10));
+  face.processEvents(10_ms);
 
   BOOST_REQUIRE_EQUAL(face.sentData.size(), 1);
-  BOOST_CHECK_EQUAL(face.sentData.front().getContentType(), ndn::tlv::ContentType_Nack);
+  BOOST_CHECK_EQUAL(face.sentData.front().getContentType(), tlv::ContentType_Nack);
 }
 
 BOOST_AUTO_TEST_SUITE_END()