commit 8ce677b47e97fd1aaccc63a18991eb473c6edf2a
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Jul 13 14:44:06 2018 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Jul 13 18:48:26 2018 -0700
tree aeefc82d62ac5235fec46f82b5c5907c55682d42
parent 047386ef50b5e6ec479274de034440e2cf2b72e7

Compile with the ndn-cxx version 0.6.2

Change-Id: If474dafb9638d7308f566b1264aa5704ba88baac

tests/unit-tests/challenge-email.t.cpp

diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index f048f61..f723f6a 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
  *
  * This file is part of ndncert, a certificate management system based on NDN.
  *
@@ -65,7 +65,7 @@
   emailJson.put(ChallengeEmail::JSON_EMAIL, "zhiyi@cs.ucla.edu");
   std::stringstream ss;
   boost::property_tree::write_json(ss, emailJson);
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_SELECT").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -106,7 +106,7 @@
   emailJson.put(ChallengeEmail::JSON_EMAIL, "zhiyi@cs");
   std::stringstream ss;
   boost::property_tree::write_json(ss, emailJson);
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_SELECT").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -140,7 +140,7 @@
   infoJson.put(ChallengeEmail::JSON_CODE, "4567");
   std::stringstream ss;
   boost::property_tree::write_json(ss, infoJson);
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_VALIDATE").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -174,7 +174,7 @@
   infoJson.put(ChallengeEmail::JSON_CODE, "1234");
   std::stringstream ss;
   boost::property_tree::write_json(ss, infoJson);
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_VALIDATE").append("Fake-Request-ID").append("EMAIL").append(jsonContent);

tests/unit-tests/challenge-pin.t.cpp

diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 633dd8f..2b7e377 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
  *
  * This file is part of ndncert, a certificate management system based on NDN.
  *
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ndncert authors and contributors.
  */
 
-#include "identity-management-fixture.hpp"
 #include "challenge-module/challenge-pin.hpp"
+#include "identity-management-fixture.hpp"
 
 namespace ndn {
 namespace ndncert {
@@ -87,7 +87,7 @@
   std::stringstream ss;
   boost::property_tree::write_json(ss, infoJson);
   std::string jsonString = ss.str();
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_VALIDATE").append("Fake-Request-ID").append("PIN").append(jsonContent);
@@ -122,7 +122,7 @@
   std::stringstream ss;
   boost::property_tree::write_json(ss, infoJson);
   std::string jsonString = ss.str();
-  Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 
   Name interestName("/ndn/site1/CA");
   interestName.append("_VALIDATE").append("Fake-Request-ID").append("PIN").append(jsonContent);