commit b47dad7bd3666c714b37e7939f56d935457a5221
author tylerliu <tylersiqi@163.com> Thu Oct 08 21:36:55 2020 -0700
committer tylerliu <tylersiqi@163.com> Thu Oct 08 21:36:55 2020 -0700
tree f2ca24d59aa1e18dcc5aaeeac35adca4a55d3303
parent 095fabc46e6c3f71ebd9cd7d7f529066156c6060

change PROBE format for max-suffix-length for each suggested name

Change-Id: Ie0823963fd3c56e40d825e0e80dfadf164f08ca3

tests/unit-tests/protocol-detail.t.cpp

diff --git a/tests/unit-tests/protocol-detail.t.cpp b/tests/unit-tests/protocol-detail.t.cpp
index 881a040..91436ed 100644
--- a/tests/unit-tests/protocol-detail.t.cpp
+++ b/tests/unit-tests/protocol-detail.t.cpp
@@ -63,9 +63,11 @@
   std::vector<Name> ids;
   ids.push_back(Name("/example"));
   auto contentTlv = PROBE::encodeDataContent(ids, 2, config.m_redirection);
-  std::vector<Name> decodedIds, decodedRedirectionItems;
+  std::vector<Name> decodedRedirectionItems;
+  std::vector<std::pair<Name, int>> decodedIds;
   PROBE::decodeDataContent(contentTlv, decodedIds, decodedRedirectionItems);
-  BOOST_CHECK_EQUAL(decodedIds[0], Name("/example"));
+  BOOST_CHECK_EQUAL(decodedIds[0].first, Name("/example"));
+  BOOST_CHECK_EQUAL(decodedIds[0].second, 2);
   BOOST_CHECK_EQUAL(decodedRedirectionItems[0], config.m_redirection->at(0)->getFullName());
 }
 

tests/unit-tests/requester.t.cpp

diff --git a/tests/unit-tests/requester.t.cpp b/tests/unit-tests/requester.t.cpp
index 44a4b7f..95b892f 100644
--- a/tests/unit-tests/requester.t.cpp
+++ b/tests/unit-tests/requester.t.cpp
@@ -83,13 +83,16 @@
   reply.setContent(PROBE::encodeDataContent(availableNames, 3, ca.m_config.m_redirection));
   m_keyChain.sign(reply, signingByIdentity(identity));
 
-  std::vector<Name> names, redirects;
+  std::vector<std::pair<Name, int>> names;
+  std::vector<Name> redirects;
   Requester::onProbeResponse(reply, ca_profile, names, redirects);
 
   // Test names and redirects are properly stored
   BOOST_CHECK_EQUAL(names.size(), 2);
-  BOOST_CHECK_EQUAL(names[0].toUri(), "/site1");
-  BOOST_CHECK_EQUAL(names[1].toUri(), "/site2");
+  BOOST_CHECK_EQUAL(names[0].first.toUri(), "/site1");
+  BOOST_CHECK_EQUAL(names[0].second, 3);
+  BOOST_CHECK_EQUAL(names[1].first.toUri(), "/site2");
+  BOOST_CHECK_EQUAL(names[1].second, 3);
 
   BOOST_CHECK_EQUAL(redirects.size(), 2);
   BOOST_CHECK_EQUAL(security::extractIdentityFromCertName(redirects[0].getPrefix(-1)), "/ndn/site1");
@@ -113,7 +116,8 @@
   errorPacket.setContent(ErrorTLV::encodeDataContent(ErrorCode::INVALID_PARAMETER, "This is a test."));
   m_keyChain.sign(errorPacket, signingByIdentity(identity));
 
-  std::vector<Name> ids, cas;
+  std::vector<std::pair<Name, int>> ids;
+  std::vector<Name> cas;
   BOOST_CHECK_THROW(Requester::onProbeResponse(errorPacket, item, ids, cas), std::runtime_error);
   BOOST_CHECK_THROW(Requester::onNewRenewRevokeResponse(state, errorPacket), std::runtime_error);
   BOOST_CHECK_THROW(Requester::onChallengeResponse(state, errorPacket), std::runtime_error);