commit 5b8a2b21288e9401975ac87f95cde2bfecf3b518
author Junxiao Shi <git@mail1.yoursunny.com> Thu Oct 22 17:20:44 2015 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Oct 26 10:56:42 2015 -0700
tree a0558e3b000ac8dca12f0e26071267063ea73959
parent abb307c9c579e63858dbad2b715872bbc6202a4a

face: change Transport static properties initialization

Transport constructor now initializes static properties to invalid values.
Subclass constructor must explicitly set every static property.

refs #3259

Change-Id: I7ac3819694e0772c33a8a5d573e260f0eb944bff

tests/daemon/face/internal-face.t.cpp

diff --git a/tests/daemon/face/internal-face.t.cpp b/tests/daemon/face/internal-face.t.cpp
index eab0b67..05e133f 100644
--- a/tests/daemon/face/internal-face.t.cpp
+++ b/tests/daemon/face/internal-face.t.cpp
@@ -25,6 +25,8 @@
 
 #include "face/internal-face.hpp"
 #include "face/lp-face-wrapper.hpp"
+#include "transport-properties.hpp"
+
 #include "tests/test-common.hpp"
 #include "tests/identity-management-fixture.hpp"
 
@@ -42,19 +44,21 @@
 public:
   InternalFaceFixture()
   {
-    std::tie(forwarderFace, clientFace) = makeInternalFace(m_keyChain);;
+    std::tie(forwarderFaceW, clientFace) = makeInternalFace(m_keyChain);;
+    forwarderFace = static_pointer_cast<LpFaceWrapper>(forwarderFaceW)->getLpFace();
+    // TODO#3172 eliminate wrapper
 
-    // TODO#3172 connect to afterReceive* signals
-    forwarderFace->onReceiveInterest.connect(
+    forwarderFace->afterReceiveInterest.connect(
       [this] (const Interest& interest) { receivedInterests.push_back(interest); } );
-    forwarderFace->onReceiveData.connect(
+    forwarderFace->afterReceiveData.connect(
       [this] (const Data& data) { receivedData.push_back(data); } );
-    forwarderFace->onReceiveNack.connect(
+    forwarderFace->afterReceiveNack.connect(
       [this] (const lp::Nack& nack) { receivedNacks.push_back(nack); } );
   }
 
 protected:
-  shared_ptr<nfd::Face> forwarderFace;
+  shared_ptr<nfd::Face> forwarderFaceW;
+  LpFace* forwarderFace;
   shared_ptr<ndn::Face> clientFace;
 
   std::vector<Interest> receivedInterests;
@@ -64,9 +68,22 @@
 
 BOOST_FIXTURE_TEST_SUITE(TestInternalFace, InternalFaceFixture)
 
+BOOST_AUTO_TEST_CASE(TransportStaticProperties)
+{
+  Transport* transport = forwarderFace->getTransport();
+  checkStaticPropertiesInitialized(*transport);
+
+  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri("internal://"));
+  BOOST_CHECK_EQUAL(transport->getRemoteUri(), FaceUri("internal://"));
+  BOOST_CHECK_EQUAL(transport->getScope(), ndn::nfd::FACE_SCOPE_LOCAL);
+  BOOST_CHECK_EQUAL(transport->getPersistency(), ndn::nfd::FACE_PERSISTENCY_PERMANENT);
+  BOOST_CHECK_EQUAL(transport->getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);
+  BOOST_CHECK_EQUAL(transport->getMtu(), MTU_UNLIMITED);
+}
+
 // note: "send" and "receive" in test case names refer to the direction seen on forwarderFace.
 // i.e. "send" means transmission from forwarder to client,
-//      "receive" means transmission client to forwarder.
+//      "receive" means transmission from client to forwarder.
 
 BOOST_AUTO_TEST_CASE(ReceiveInterestTimeout)
 {
@@ -182,8 +199,8 @@
 {
   forwarderFace->close();
   this->advanceClocks(time::milliseconds(1), 10);
-  BOOST_CHECK_EQUAL(static_pointer_cast<face::LpFaceWrapper>(forwarderFace)->getLpFace()->getState(), FaceState::CLOSED);
-  forwarderFace.reset();
+  BOOST_CHECK_EQUAL(forwarderFace->getState(), FaceState::CLOSED);
+  forwarderFaceW.reset();
 
   shared_ptr<Interest> interest = makeInterest("/zpHsVesu0B");
   interest->setInterestLifetime(time::milliseconds(100));