commit 415b17cb89cb271632867b247ad45675af1a88aa
author Junxiao Shi <git@mail1.yoursunny.com> Wed Nov 12 00:43:25 2014 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Sat Nov 15 05:59:02 2014 -0800
tree 5fa543a6c5367349b805dd98c4b455e24d899ae3
parent a60d9363c85b97b8cbbb797f20522835d9b2da3c

management: mark Controller methods deprecated

This commit adds DEPRECATED attribute to the following items:

* Controller::start overloads, except the overload taking CommandOptions
* Controller::Sign typedef
* Controller::getDefaultCommandTimeout
* ControlCommand::getPrefix
* ControlCommand::getRequestName(ControlParameters)
* Controller::Controller(Face&)

refs #2039

Change-Id: Ib6cc81711948fa9874fe350364cd8d8613013e0d

tests/unit-tests/management/test-nfd-controller.cpp

diff --git a/tests/unit-tests/management/test-nfd-controller.cpp b/tests/unit-tests/management/test-nfd-controller.cpp
index b93149f..98101f3 100644
--- a/tests/unit-tests/management/test-nfd-controller.cpp
+++ b/tests/unit-tests/management/test-nfd-controller.cpp
@@ -41,7 +41,7 @@
 protected:
   CommandFixture()
     : face(makeDummyClientFace())
-    , controller(*face)
+    , controller(*face, keyChain)
     , commandSucceedCallback(bind(&CommandFixture::onCommandSucceed, this, _1))
     , commandFailCallback(bind(&CommandFixture::onCommandFail, this, _1, _2))
   {
@@ -62,8 +62,8 @@
 
 protected:
   shared_ptr<DummyClientFace> face;
-  Controller controller;
   KeyChain keyChain;
+  Controller controller;
 
   Controller::CommandSucceedCallback commandSucceedCallback;
   typedef boost::tuple<ControlParameters> CommandSucceedArgs;
@@ -97,7 +97,7 @@
   BOOST_REQUIRE_NO_THROW(request.wireDecode(requestInterest.getName().at(4).blockFromValue()));
   BOOST_CHECK_NO_THROW(command.validateRequest(request));
   BOOST_CHECK_EQUAL(request.getUri(), parameters.getUri());
-  BOOST_CHECK_EQUAL(requestInterest.getInterestLifetime(), Controller::getDefaultCommandTimeout());
+  BOOST_CHECK_EQUAL(requestInterest.getInterestLifetime(), CommandOptions::DEFAULT_TIMEOUT);
 
   ControlParameters responseBody;
   responseBody.setUri("tcp4://192.0.2.1:6363")