commit e6835fe12b92b635a89fa641c2294647d5941af9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 19 20:05:01 2017 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Sun May 21 17:37:27 2017 -0700
tree 2c2880a057d1a5fc226e0259ba411fdca2ae679e
parent 8e3cf0a0918fa7b7a8842edcd19db2ef89d98f75

Remove previously deprecated headers, methods, and constants

Change-Id: I3e809e25c8f2bc2ae0f027413d9e0161245353c6
Refs: #3988

tests/unit-tests/face.t.cpp

diff --git a/tests/unit-tests/face.t.cpp b/tests/unit-tests/face.t.cpp
index ebbede6..3f73f8a 100644
--- a/tests/unit-tests/face.t.cpp
+++ b/tests/unit-tests/face.t.cpp
@@ -137,43 +137,6 @@
   } while (false));
 }
 
-BOOST_AUTO_TEST_CASE(DeprecatedExpressInterestData)
-{
-  size_t nData = 0;
-  face.expressInterest(Interest("/Hello/World", time::milliseconds(50)),
-                       [&] (const Interest& i, Data& d) {
-                         BOOST_CHECK(i.getName().isPrefixOf(d.getName()));
-                         ++nData;
-                       },
-                       bind([] { BOOST_FAIL("Unexpected timeout"); }));
-
-  advanceClocks(time::milliseconds(40));
-
-  face.receive(*makeData("/Bye/World/a"));
-  face.receive(*makeData("/Hello/World/a"));
-
-  advanceClocks(time::milliseconds(50), 2);
-
-  BOOST_CHECK_EQUAL(nData, 1);
-  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
-  BOOST_CHECK_EQUAL(face.sentData.size(), 0);
-
-  face.expressInterest(Interest("/Hello/World/a", time::milliseconds(50)),
-                       [&] (const Interest& i, Data& d) {
-                         BOOST_CHECK(i.getName().isPrefixOf(d.getName()));
-                         ++nData;
-                       },
-                       bind([] { BOOST_FAIL("Unexpected timeout"); }));
-  advanceClocks(time::milliseconds(40));
-  face.receive(*makeData("/Hello/World/a/1/xxxxx"));
-
-  advanceClocks(time::milliseconds(50), 2);
-
-  BOOST_CHECK_EQUAL(nData, 2);
-  BOOST_CHECK_EQUAL(face.sentInterests.size(), 2);
-  BOOST_CHECK_EQUAL(face.sentData.size(), 0);
-}
-
 BOOST_AUTO_TEST_CASE(ExpressInterestTimeout)
 {
   size_t nTimeouts = 0;
@@ -206,20 +169,6 @@
   } while (false));
 }
 
-BOOST_AUTO_TEST_CASE(DeprecatedExpressInterestTimeout)
-{
-  size_t nTimeouts = 0;
-  face.expressInterest(Interest("/Hello/World", time::milliseconds(50)),
-                       bind([] { BOOST_FAIL("Unexpected data"); }),
-                       bind([&nTimeouts] { ++nTimeouts; }));
-
-  advanceClocks(time::milliseconds(200), 5);
-
-  BOOST_CHECK_EQUAL(nTimeouts, 1);
-  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
-  BOOST_CHECK_EQUAL(face.sentData.size(), 0);
-}
-
 BOOST_AUTO_TEST_CASE(ExpressInterestNack)
 {
   size_t nNacks = 0;
@@ -292,22 +241,6 @@
   } while (false));
 }
 
-BOOST_AUTO_TEST_CASE(DeprecatedExpressInterestNack)
-{
-  size_t nTimeouts = 0;
-  face.expressInterest(Interest("/Hello/World", time::milliseconds(50)),
-                       bind([] { BOOST_FAIL("Unexpected data"); }),
-                       bind([&nTimeouts] { ++nTimeouts; }));
-  advanceClocks(time::milliseconds(1));
-
-  face.receive(makeNack(face.sentInterests.at(0), lp::NackReason::CONGESTION));
-  advanceClocks(time::milliseconds(1));
-
-  BOOST_CHECK_EQUAL(nTimeouts, 1);
-  BOOST_CHECK_EQUAL(face.sentInterests.size(), 1);
-  BOOST_CHECK_EQUAL(face.sentData.size(), 0);
-}
-
 BOOST_AUTO_TEST_CASE(RemovePendingInterest)
 {
   const PendingInterestId* interestId =
@@ -356,7 +289,7 @@
   {
     DummyClientFace face2(io, m_keyChain);
     face2.expressInterest(Interest("/Hello/World", time::milliseconds(50)),
-                          bind([]{}), bind([]{}));
+                          nullptr, nullptr, nullptr);
     advanceClocks(time::milliseconds(50), 2);
   }