fw: pull FaceTable construction out of Forwarder class
Refs: #4922, #4973
Change-Id: Ibbd4a8840cb0d01ebbd4cabf9c34fa78a1d23db1
diff --git a/tests/daemon/fw/unsolicited-data-policy.t.cpp b/tests/daemon/fw/unsolicited-data-policy.t.cpp
index 11eafe1..21894ca 100644
--- a/tests/daemon/fw/unsolicited-data-policy.t.cpp
+++ b/tests/daemon/fw/unsolicited-data-policy.t.cpp
@@ -42,11 +42,6 @@
class UnsolicitedDataPolicyFixture : public GlobalIoTimeFixture
{
protected:
- UnsolicitedDataPolicyFixture()
- : cs(forwarder.getCs())
- {
- }
-
/** \tparam Policy policy type, or void to keep default policy
*/
template<typename Policy>
@@ -72,8 +67,9 @@
}
protected:
- Forwarder forwarder;
- Cs& cs;
+ FaceTable faceTable;
+ Forwarder forwarder{faceTable};
+ Cs& cs{forwarder.getCs()};
};
template<>
@@ -117,7 +113,7 @@
auto face1 = make_shared<DummyFace>("dummy://", "dummy://",
ndn::nfd::FACE_SCOPE_LOCAL);
- forwarder.addFace(face1);
+ faceTable.add(face1);
shared_ptr<Data> data1 = makeData("/unsolicited-from-local");
forwarder.onIncomingData(FaceEndpoint(*face1, 0), *data1);
@@ -125,7 +121,7 @@
auto face2 = make_shared<DummyFace>("dummy://", "dummy://",
ndn::nfd::FACE_SCOPE_NON_LOCAL);
- forwarder.addFace(face2);
+ faceTable.add(face2);
shared_ptr<Data> data2 = makeData("/unsolicited-from-non-local");
forwarder.onIncomingData(FaceEndpoint(*face2, 0), *data2);