Fixed several ndncert-client bugs and use lower case Challenge ID
refs: #4962
Change-Id: Id10dcc15cb718d6a55f4657884b2c6be3f653867
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index e67397e..398df97 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -31,7 +31,7 @@
BOOST_AUTO_TEST_CASE(ChallengeType)
{
ChallengeEmail challenge;
- BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "Email");
+ BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "email");
}
BOOST_AUTO_TEST_CASE(EmailAddressChecker)
@@ -60,7 +60,7 @@
BOOST_CHECK(request.m_remainingTime != 0);
BOOST_CHECK(request.m_remainingTries != 0);
BOOST_CHECK(request.m_challengeTp != "");
- BOOST_CHECK_EQUAL(request.m_challengeType, "Email");
+ BOOST_CHECK_EQUAL(request.m_challengeType, "email");
std::string line = "";
std::string delimiter = " ";
@@ -136,7 +136,7 @@
JsonSection json;
json.put(ChallengeEmail::JSON_CODE, "4567");
CertificateRequest request(Name("/ndn/site1"), "123", STATUS_CHALLENGE, ChallengeEmail::NEED_CODE,
- "Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert);
+ "email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert);
JsonSection requestJson;
requestJson.put(ChallengeEmail::JSON_CODE, "7890");
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 35466ff..adac6b9 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -31,7 +31,7 @@
BOOST_AUTO_TEST_CASE(ChallengeType)
{
ChallengePin challenge;
- BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "PIN");
+ BOOST_CHECK_EQUAL(challenge.CHALLENGE_TYPE, "pin");
}
BOOST_AUTO_TEST_CASE(OnChallengeRequestWithEmptyInfo)
@@ -46,7 +46,7 @@
BOOST_CHECK_EQUAL(request.m_status, STATUS_CHALLENGE);
BOOST_CHECK_EQUAL(request.m_challengeStatus, ChallengePin::NEED_CODE);
- BOOST_CHECK_EQUAL(request.m_challengeType, "PIN");
+ BOOST_CHECK_EQUAL(request.m_challengeType, "pin");
}
BOOST_AUTO_TEST_CASE(OnChallengeRequestWithCode)
@@ -56,7 +56,7 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::JSON_PIN_CODE, "12345");
- CertificateRequest request(Name("/ndn/site1"), "123", STATUS_CHALLENGE, ChallengePin::NEED_CODE, "PIN",
+ CertificateRequest request(Name("/ndn/site1"), "123", STATUS_CHALLENGE, ChallengePin::NEED_CODE, "pin",
time::toIsoString(time::system_clock::now()), 3600, 3, secret, cert);
JsonSection paramJson;
@@ -77,7 +77,7 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::JSON_PIN_CODE, "12345");
- CertificateRequest request(Name("/ndn/site1"), "123", STATUS_CHALLENGE, ChallengePin::NEED_CODE, "PIN",
+ CertificateRequest request(Name("/ndn/site1"), "123", STATUS_CHALLENGE, ChallengePin::NEED_CODE, "pin",
time::toIsoString(time::system_clock::now()), 3600, 3, secret, cert);
JsonSection paramJson;