face: face refactoring completion
* delete old Face
* rename LpFace as Face
* eliminate LpFaceWrapper and use new Face
refs #3172
Change-Id: I08c3a5dfb4cc1b9834b30cccd9ab634535d0608c
diff --git a/tests/daemon/face/generic-link-service.t.cpp b/tests/daemon/face/generic-link-service.t.cpp
index 70e078d..888c222 100644
--- a/tests/daemon/face/generic-link-service.t.cpp
+++ b/tests/daemon/face/generic-link-service.t.cpp
@@ -24,7 +24,7 @@
*/
#include "face/generic-link-service.hpp"
-#include "face/lp-face.hpp"
+#include "face/face.hpp"
#include "dummy-transport.hpp"
#include "tests/test-common.hpp"
@@ -37,6 +37,8 @@
BOOST_AUTO_TEST_SUITE(Face)
+using nfd::Face;
+
class GenericLinkServiceFixture : public BaseFixture
{
protected:
@@ -52,8 +54,8 @@
void
initialize(const GenericLinkService::Options& options)
{
- face.reset(new LpFace(make_unique<GenericLinkService>(options),
- make_unique<DummyTransport>()));
+ face.reset(new Face(make_unique<GenericLinkService>(options),
+ make_unique<DummyTransport>()));
service = static_cast<GenericLinkService*>(face->getLinkService());
transport = static_cast<DummyTransport*>(face->getTransport());
@@ -66,7 +68,7 @@
}
protected:
- unique_ptr<LpFace> face;
+ unique_ptr<Face> face;
GenericLinkService* service;
DummyTransport* transport;
std::vector<Interest> receivedInterests;