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-full-producer.cpp

diff --git a/tests/test-full-producer.cpp b/tests/test-full-producer.cpp
index 33b5014..2693421 100644
--- a/tests/test-full-producer.cpp
+++ b/tests/test-full-producer.cpp
@@ -20,7 +20,7 @@
 #include "PSync/full-producer.hpp"
 
 #include "tests/boost-test.hpp"
-#include "tests/unit-test-time-fixture.hpp"
+#include "tests/io-fixture.hpp"
 
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
@@ -35,7 +35,7 @@
 BOOST_AUTO_TEST_CASE(Constructor)
 {
   util::DummyClientFace face({true, true});
-  BOOST_REQUIRE_NO_THROW(FullProducer(40, face, Name("/psync"), Name("/testUser"), nullptr));
+  BOOST_CHECK_NO_THROW(FullProducer(40, face, Name("/psync"), Name("/testUser"), nullptr));
 }
 
 BOOST_AUTO_TEST_CASE(OnInterest)
@@ -51,17 +51,17 @@
   BOOST_REQUIRE_NO_THROW(node.onSyncInterest(syncPrefix, Interest(syncInterestName)));
 }
 
-BOOST_FIXTURE_TEST_CASE(ConstantTimeoutForFirstSegment, tests::UnitTestTimeFixture)
+BOOST_FIXTURE_TEST_CASE(ConstantTimeoutForFirstSegment, tests::IoFixture)
 {
   Name syncPrefix("/psync"), userNode("/testUser");
-  util::DummyClientFace face(io, {true, true});
+  util::DummyClientFace face(m_io, {true, true});
 
-  FullProducer node(40, face, syncPrefix, userNode, nullptr, ndn::time::milliseconds(8000));
-  advanceClocks(ndn::time::milliseconds(10));
+  FullProducer node(40, face, syncPrefix, userNode, nullptr, 8_s);
+  advanceClocks(10_ms);
   face.sentInterests.clear();
 
   // full sync sends the next one in interest lifetime / 2 +- jitter
-  advanceClocks(ndn::time::milliseconds(6000));
+  advanceClocks(6_s);
   BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
 }
 
@@ -72,17 +72,16 @@
 
   FullProducer node(40, face, syncPrefix, userNode, nullptr);
 
-  ndn::Name syncInterestName(syncPrefix);
+  Name syncInterestName(syncPrefix);
   node.m_iblt.appendToName(syncInterestName);
-  ndn::Interest syncInterest(syncInterestName);
+  Interest syncInterest(syncInterestName);
 
-  auto badCompress = std::make_shared<const ndn::Buffer>(5);
-
-  BOOST_REQUIRE_NO_THROW(node.onSyncData(syncInterest, badCompress));
+  auto badCompress = std::make_shared<const Buffer>(5);
+  BOOST_CHECK_NO_THROW(node.onSyncData(syncInterest, badCompress));
 
   const uint8_t test[] = {'t', 'e', 's', 't'};
   auto goodCompressBadBlock = compress(node.m_contentCompression, &test[0], sizeof(test));
-  BOOST_REQUIRE_NO_THROW(node.onSyncData(syncInterest, goodCompressBadBlock));
+  BOOST_CHECK_NO_THROW(node.onSyncData(syncInterest, goodCompressBadBlock));
 }
 
 BOOST_AUTO_TEST_SUITE_END()