fw: remove onInterestUnsatisfied pipeline stage
Change-Id: Ic008bb26b87db176bac8d51230e53f923b19e5d2
refs: 4290
diff --git a/tests/daemon/fw/dummy-strategy.cpp b/tests/daemon/fw/dummy-strategy.cpp
index f806d08..28ca606 100644
--- a/tests/daemon/fw/dummy-strategy.cpp
+++ b/tests/daemon/fw/dummy-strategy.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -46,7 +46,6 @@
: Strategy(forwarder)
, afterReceiveInterest_count(0)
, beforeSatisfyInterest_count(0)
- , beforeExpirePendingInterest_count(0)
, afterReceiveNack_count(0)
{
this->setInstanceName(name);
@@ -74,12 +73,6 @@
}
void
-DummyStrategy::beforeExpirePendingInterest(const shared_ptr<pit::Entry>& pitEntry)
-{
- ++beforeExpirePendingInterest_count;
-}
-
-void
DummyStrategy::afterReceiveNack(const Face& inFace, const lp::Nack& nack,
const shared_ptr<pit::Entry>& pitEntry)
{
diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index fb82add..1f168c5 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -69,9 +69,6 @@
const Face& inFace, const Data& data) override;
void
- beforeExpirePendingInterest(const shared_ptr<pit::Entry>& pitEntry) override;
-
- void
afterReceiveNack(const Face& inFace, const lp::Nack& nack,
const shared_ptr<pit::Entry>& pitEntry) override;
@@ -91,7 +88,6 @@
public:
int afterReceiveInterest_count;
int beforeSatisfyInterest_count;
- int beforeExpirePendingInterest_count;
int afterReceiveNack_count;
shared_ptr<Face> interestOutFace;
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index 55f51f7..a5118d8 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California,
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -298,12 +298,6 @@
shared_ptr<Interest> interest4 = makeInterest("ndn:/B/4");
interest4->setInterestLifetime(time::milliseconds(5000));
forwarder.startProcessInterest(*face1, *interest4);
-
- strategyA.beforeExpirePendingInterest_count = 0;
- strategyB.beforeExpirePendingInterest_count = 0;
- this->advanceClocks(time::milliseconds(10), time::milliseconds(100));
- BOOST_CHECK_EQUAL(strategyA.beforeExpirePendingInterest_count, 1);
- BOOST_CHECK_EQUAL(strategyB.beforeExpirePendingInterest_count, 0);
}
BOOST_AUTO_TEST_CASE(IncomingData)