commit 0970340dd68742e5433f237c0a48de35986cd597
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Feb 08 20:18:17 2017 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Feb 08 20:18:17 2017 -0800
tree 4e65c0bb121188c8f1dce73b284ae2e80b08befc
parent 2a3aefb16ac4e42a20ce102fb413fc5ec6742328

ndn-cxx+tests: Fix hop count propagating to ndn-cxx Face

Change-Id: I01fa76eabc327a5638627b27bc51e6330d5ad543

ndn-cxx

diff --git a/ndn-cxx b/ndn-cxx
index e532044..4692ba8 160000
--- a/ndn-cxx
+++ b/ndn-cxx
@@ -1 +1 @@
-Subproject commit e53204419c51356dab70e0e5450ff5dcf587827a
+Subproject commit 4692ba80cf1dcf07acbbaba8a134ea22481dd457

tests/unit-tests/ndn-cxx/face.t.cpp

diff --git a/tests/unit-tests/ndn-cxx/face.t.cpp b/tests/unit-tests/ndn-cxx/face.t.cpp
index 31ebfbc..459b33a 100644
--- a/tests/unit-tests/ndn-cxx/face.t.cpp
+++ b/tests/unit-tests/ndn-cxx/face.t.cpp
@@ -20,6 +20,7 @@
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/util/scheduler.hpp>
 #include <ndn-cxx/util/scheduler-scoped-event-id.hpp>
+#include <ndn-cxx/lp/tags.hpp>
 
 #include "ns3/ndnSIM/helper/ndn-app-helper.hpp"
 #include "ns3/error-model.h"
@@ -108,23 +109,21 @@
 class SingleInterest : public BaseTesterApp
 {
 public:
-  SingleInterest(const Name& name, const NameCallback& onData, const VoidCallback& onTimeout)
+  SingleInterest(const Name& name, const std::function<void(const Data&)>& onData, const VoidCallback& onTimeout)
   {
     m_face.expressInterest(name, std::bind([onData] (const Data& data) {
-          onData(data.getName());
+          onData(data);
         }, _2),
       std::bind(onTimeout));
   }
 };
 
-
-
 BOOST_AUTO_TEST_CASE(ExpressInterestLocalhost)
 {
   // Retrieve data from remote
   FactoryCallbackApp::Install(getNode("A"), [this] () -> shared_ptr<void> {
-      return make_shared<SingleInterest>("/localhost", [this] (const Name& data) {
-          BOOST_CHECK(Name("/localhost").isPrefixOf(data));
+      return make_shared<SingleInterest>("/localhost", [this] (const Data& data) {
+          BOOST_CHECK(Name("/localhost").isPrefixOf(data.getName()));
           this->hasFired = true;
           BOOST_CHECK_LE(Simulator::Now().ToDouble(Time::S), 1.01);
         },
@@ -146,8 +145,10 @@
 
   // Retrieve data from remote
   FactoryCallbackApp::Install(getNode("A"), [this] () -> shared_ptr<void> {
-      return make_shared<SingleInterest>("/test/prefix", [this] (const Name& data) {
-          BOOST_CHECK_EQUAL(data, "/test/prefix");
+      return make_shared<SingleInterest>("/test/prefix", [this] (const Data& data) {
+          BOOST_CHECK_EQUAL(data.getName(), "/test/prefix");
+          BOOST_REQUIRE(data.getTag<lp::HopCountTag>() != nullptr);
+          BOOST_CHECK_EQUAL(*data.getTag<lp::HopCountTag>(), 2);
           this->hasFired = true;
           BOOST_CHECK_LE(Simulator::Now().ToDouble(Time::S), 2.0);
         },
@@ -166,7 +167,7 @@
 BOOST_AUTO_TEST_CASE(ExpressInterestTimeout)
 {
   FactoryCallbackApp::Install(getNode("A"), [this] () -> shared_ptr<void> {
-      return make_shared<SingleInterest>("/test/prefix", [] (const Name&) {
+      return make_shared<SingleInterest>("/test/prefix", [] (const Data&) {
           BOOST_ERROR("Unexpected data");
         },
         [this] {
@@ -195,8 +196,8 @@
 
   // Retrieve data from remote
   FactoryCallbackApp::Install(getNode("A"), [this] () -> shared_ptr<void> {
-      return make_shared<SingleInterest>("/test/prefix", [this] (const Name& data) {
-          BOOST_CHECK_EQUAL(data, "/test/prefix");
+      return make_shared<SingleInterest>("/test/prefix", [this] (const Data& data) {
+          BOOST_CHECK_EQUAL(data.getName(), "/test/prefix");
           this->hasFired = true;
           BOOST_CHECK_LE(Simulator::Now().ToDouble(Time::S), 2.0);
         },