commit 01e91a30902fb87e0f18e7b83d86bcae4004a5f6
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 29 12:10:00 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 29 12:10:16 2020 -0700
tree 77c0bd431905bcbafa8f0dfeadc2c5d63e6d2007
parent 0e176c302b532f906f3c449d3c7e8dd56bab5f7c

add error handling in NEW/REVOKE to CA

Change-Id: Ie43b07b0300a260c290be68b59b345596355a321

tests/unit-tests/ca-module.t.cpp

diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index f3fde9d..ec4c779 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -235,7 +235,10 @@
                                               current_tp + time::hours(2),
                                               Name("/ndn/zhiyi"));
   face.onSendData.connect([&](const Data& response) {
-    BOOST_CHECK(false);
+    auto contentTlv = response.getContent();
+    contentTlv.parse();
+    auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+    BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
   });
   face.receive(*interest1);
   face.receive(*interest2);
@@ -284,7 +287,7 @@
   auto key = identity.getDefaultKey();
   auto cert = key.getDefaultCertificate();
 
-  util::DummyClientFace face(io, m_keyChain, { true, true });
+  util::DummyClientFace face(io, m_keyChain, {true, true});
   CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
   advanceClocks(time::milliseconds(20), 60);
 
@@ -294,21 +297,35 @@
   item.m_anchor = cert;
   client.getClientConf().m_caItems.push_back(item);
 
-  auto interest = client.generateNewInterest(time::system_clock::now(),
-            time::system_clock::now() + time::days(1),
-            Name("/ndn/a/b/c"));
+  auto interest1 = client.generateNewInterest(time::system_clock::now(),
+                                              time::system_clock::now() + time::days(1),
+                                              Name("/ndn/a"));
+  auto interest2 = client.generateNewInterest(time::system_clock::now(),
+                                              time::system_clock::now() + time::days(1),
+                                              Name("/ndn/a/b"));
+  auto interest3 = client.generateNewInterest(time::system_clock::now(),
+                                              time::system_clock::now() + time::days(1),
+                                              Name("/ndn/a/b/c/d"));
 
-  int count = 0;
   face.onSendData.connect([&](const Data& response) {
-    count++;
+    auto contentTlv = response.getContent();
+    contentTlv.parse();
+    if (interest3->getName().isPrefixOf(response.getName())) {
+      auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+      BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
+    }
+    else {
+      // should successfully get responses
+      BOOST_CHECK_EXCEPTION(readNonNegativeInteger(contentTlv.get(tlv_error_code)), std::runtime_error,
+                            [](const auto& e) { return true; });
+    }
   });
-  face.receive(*interest);
-
+  face.receive(*interest1);
+  face.receive(*interest2);
+  face.receive(*interest3);
   advanceClocks(time::milliseconds(20), 60);
-  BOOST_CHECK_EQUAL(count, 1);
 }
 
-
 BOOST_AUTO_TEST_CASE(HandleNewWithInvalidLength1)
 {
   auto identity = addIdentity(Name("/ndn"));
@@ -325,10 +342,13 @@
   item.m_anchor = cert;
   client.getClientConf().m_caItems.push_back(item);
   auto current_tp = time::system_clock::now();
-  auto interest1 = client.generateNewInterest(current_tp, current_tp + time::days(1),Name("/ndn"));
-  auto interest2 = client.generateNewInterest(current_tp, current_tp + time::days(1),Name("/ndn/a/b/c/d"));
+  auto interest1 = client.generateNewInterest(current_tp, current_tp + time::days(1), Name("/ndn"));
+  auto interest2 = client.generateNewInterest(current_tp, current_tp + time::days(1), Name("/ndn/a/b/c/d"));
   face.onSendData.connect([&](const Data& response) {
-      BOOST_CHECK(false);
+    auto contentTlv = response.getContent();
+    contentTlv.parse();
+    auto errorCode = static_cast<ErrorCode>(readNonNegativeInteger(contentTlv.get(tlv_error_code)));
+    BOOST_CHECK(errorCode != ErrorCode::NO_ERROR);
   });
   face.receive(*interest1);
   face.receive(*interest2);