commit 352fc8218526b01ebae3c78d1f8037993c06c6b5
author Junxiao Shi <git@mail1.yoursunny.com> Tue Aug 09 03:53:05 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Aug 09 03:53:05 2016 +0000
tree ae155e9daee796859e0e73ee273c863a929a780f
parent 9ede5bd312386b55002b92fdc6131d5eb24f8689

fw: AccessStrategy test suite avoid deprecated ndn::Face::expressInterest overload

refs #3703

Change-Id: Ib8f79d56551315c4ebc54f1574a4afbe95b99d9f

tests/daemon/fw/access-strategy.t.cpp

diff --git a/tests/daemon/fw/access-strategy.t.cpp b/tests/daemon/fw/access-strategy.t.cpp
index 78ed88f..b2dfe50 100644
--- a/tests/daemon/fw/access-strategy.t.cpp
+++ b/tests/daemon/fw/access-strategy.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -318,7 +318,8 @@
   shared_ptr<Interest> interest1 = makeInterest("ndn:/laptops/A/1");
   bool hasData1 = false;
   consumer->getClientFace().expressInterest(*interest1,
-                                            bind([&hasData1] { hasData1 = true; }));
+                                            bind([&hasData1] { hasData1 = true; }),
+                                            nullptr, nullptr);
   this->advanceClocks(time::milliseconds(5), time::seconds(1));
   BOOST_CHECK_EQUAL(hasData1, true);
 
@@ -327,6 +328,7 @@
   bool hasData2a = false, hasTimeout2a = false;
   consumer->getClientFace().expressInterest(*interest2a,
                                             bind([&hasData2a] { hasData2a = true; }),
+                                            nullptr,
                                             bind([&hasTimeout2a] { hasTimeout2a = true; }));
   producerA->fail();
   this->advanceClocks(time::milliseconds(5), time::milliseconds(60));
@@ -337,7 +339,8 @@
   shared_ptr<Interest> interest2b = makeInterest("ndn:/laptops/A/2");
   bool hasData2b = false;
   consumer->getClientFace().expressInterest(*interest2b,
-                                            bind([&hasData2b] { hasData2b = true; }));
+                                            bind([&hasData2b] { hasData2b = true; }),
+                                            nullptr, nullptr);
   producerA->recover();
   this->advanceClocks(time::milliseconds(5), time::seconds(1));
   BOOST_CHECK_EQUAL(hasData2b, false);
@@ -346,7 +349,8 @@
   shared_ptr<Interest> interest2c = makeInterest("ndn:/laptops/A/2");
   bool hasData2c = false;
   consumer->getClientFace().expressInterest(*interest2c,
-                                            bind([&hasData2c] { hasData2c = true; }));
+                                            bind([&hasData2c] { hasData2c = true; }),
+                                            nullptr, nullptr);
   this->advanceClocks(time::milliseconds(5), time::seconds(1));
   BOOST_CHECK_EQUAL(hasData2c, true);
 }