commit c6acc7a79525be41dc26910b24179cceb4acc639
author Junxiao Shi <git@mail1.yoursunny.com> Tue Jun 23 10:03:56 2015 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Jun 23 10:03:56 2015 -0700
tree 67ef7cdc9fa1a2789cb93798c3ac9b5ff55eb0c3
parent d82b07cb6088b888b42004b64ea3169f1bec3022

management: simplify CommandOptions with SigningInfo

Signing parameter in ndn::nfd::CommandOptions is now using
ndn::security::SigningInfo. Old signing parameter APIs are deprecated.

refs #2893

Change-Id: I81831fecd382efa369792218ac5457690d4c4046

tests/unit-tests/management/nfd-command-options.t.cpp

diff --git a/tests/unit-tests/management/nfd-command-options.t.cpp b/tests/unit-tests/management/nfd-command-options.t.cpp
index 8a2a4b1..d67d865 100644
--- a/tests/unit-tests/management/nfd-command-options.t.cpp
+++ b/tests/unit-tests/management/nfd-command-options.t.cpp
@@ -20,6 +20,11 @@
  */
 
 #include "management/nfd-command-options.hpp"
+#include "security/signing-helpers.hpp"
+
+#ifdef NDN_MANAGEMENT_NFD_COMMAND_OPTIONS_KEEP_DEPRECATED_SIGNING_PARAMS
+#include "security/identity-certificate.hpp"
+#endif // NDN_MANAGEMENT_NFD_COMMAND_OPTIONS_KEEP_DEPRECATED_SIGNING_PARAMS
 
 #include "boost-test.hpp"
 
@@ -57,6 +62,17 @@
   BOOST_CHECK_EQUAL(co.getPrefix(), Name("ndn:/localhop/net/example/nfd"));
 }
 
+BOOST_AUTO_TEST_CASE(SigningInfo)
+{
+  CommandOptions co;
+  BOOST_CHECK_EQUAL(co.getSigningInfo().getSignerType(), security::SigningInfo::SIGNER_TYPE_NULL);
+
+  co.setSigningInfo(signingByIdentity("ndn:/tmp/identity"));
+  BOOST_CHECK_EQUAL(co.getSigningInfo().getSignerType(), security::SigningInfo::SIGNER_TYPE_ID);
+  BOOST_CHECK_EQUAL(co.getSigningInfo().getSignerName(), "ndn:/tmp/identity");
+}
+
+#ifdef NDN_MANAGEMENT_NFD_COMMAND_OPTIONS_KEEP_DEPRECATED_SIGNING_PARAMS
 BOOST_AUTO_TEST_CASE(SigningParams)
 {
   CommandOptions co;
@@ -96,6 +112,7 @@
   BOOST_CHECK_EQUAL(co.getSigningParamsKind(),
                     CommandOptions::SIGNING_PARAMS_DEFAULT); // unchanged after throw
 }
+#endif // NDN_MANAGEMENT_NFD_COMMAND_OPTIONS_KEEP_DEPRECATED_SIGNING_PARAMS
 
 BOOST_AUTO_TEST_SUITE_END()