commit 76e0eb287bb4382c1e1e65c7744352fddf04da0e
author Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 08 05:54:10 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 08 05:54:10 2016 +0000
tree 2e0eab53c98964c27778811f3505d8e53cb608b8
parent 43a7932ed219787fb94c81d2a2ae8d14e268f865

face: accommodate empty InterestCallback/DataCallback/NackCallback

refs #3724

Change-Id: Iebfeae48d37d6dedbbdbca2a05730247807675d5

tests/unit-tests/face.t.cpp

diff --git a/tests/unit-tests/face.t.cpp b/tests/unit-tests/face.t.cpp
index 2ffe6d4..b0f78f9 100644
--- a/tests/unit-tests/face.t.cpp
+++ b/tests/unit-tests/face.t.cpp
@@ -94,6 +94,20 @@
   BOOST_CHECK_EQUAL(nTimeouts, 1);
 }
 
+BOOST_AUTO_TEST_CASE(ExpressInterestEmptyDataCallback)
+{
+  face.expressInterest(Interest("/Hello/World"),
+                       nullptr,
+                       bind([] { BOOST_FAIL("Unexpected Nack"); }),
+                       bind([] { BOOST_FAIL("Unexpected timeout"); }));
+  advanceClocks(time::milliseconds(1));
+
+  BOOST_CHECK_NO_THROW(do {
+    face.receive(*makeData("/Hello/World/a"));
+    advanceClocks(time::milliseconds(1));
+  } while (false));
+}
+
 // test case for deprecated expressInterest implementation
 BOOST_AUTO_TEST_CASE(DeprecatedExpressInterestData)
 {
@@ -158,6 +172,19 @@
   BOOST_CHECK_EQUAL(face.sentNacks.size(), 0);
 }
 
+BOOST_AUTO_TEST_CASE(ExpressInterestEmptyTimeoutCallback)
+{
+  face.expressInterest(Interest("/Hello/World", time::milliseconds(50)),
+                       bind([] { BOOST_FAIL("Unexpected Data"); }),
+                       bind([] { BOOST_FAIL("Unexpected Nack"); }),
+                       nullptr);
+  advanceClocks(time::milliseconds(40));
+
+  BOOST_CHECK_NO_THROW(do {
+    advanceClocks(time::milliseconds(6), 2);
+  } while (false));
+}
+
 // test case for deprecated expressInterest implementation
 BOOST_AUTO_TEST_CASE(DeprecatedExpressInterestTimeout)
 {
@@ -204,6 +231,20 @@
   BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
 }
 
+BOOST_AUTO_TEST_CASE(ExpressInterestEmptyNackCallback)
+{
+  face.expressInterest(Interest("/Hello/World"),
+                       bind([] { BOOST_FAIL("Unexpected Data"); }),
+                       nullptr,
+                       bind([] { BOOST_FAIL("Unexpected timeout"); }));
+  advanceClocks(time::milliseconds(1));
+
+  BOOST_CHECK_NO_THROW(do {
+    face.receive(makeNack(face.sentInterests.at(0), lp::NackReason::DUPLICATE));
+    advanceClocks(time::milliseconds(1));
+  } while (false));
+}
+
 BOOST_AUTO_TEST_CASE(RemovePendingInterest)
 {
   const PendingInterestId* interestId =
@@ -316,6 +357,17 @@
   advanceClocks(time::milliseconds(10), 10);
 }
 
+BOOST_AUTO_TEST_CASE(SetInterestFilterEmptyInterestCallback)
+{
+  face.setInterestFilter("/A", nullptr);
+  advanceClocks(time::milliseconds(1));
+
+  BOOST_CHECK_NO_THROW(do {
+    face.receive(*makeInterest("/A/1"));
+    advanceClocks(time::milliseconds(1));
+  } while (false));
+}
+
 BOOST_AUTO_TEST_CASE(SetUnsetInterestFilterWithoutSucessCallback)
 {
   size_t nInterests = 0;