commit 1f9551b93619d45f309d8a7708b5eaad83af6628
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Oct 30 10:30:43 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Oct 30 10:30:51 2020 -0700
tree 09eec1211221c94c0a776c8efc67cdb3fc207bc3
parent 2670ba9d4e9e518e1d3a0a66eeaef294e1e9fccb

still one error left

Change-Id: Id89dd6c85e02032b788d6cf97fc8b3ae9964b757

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

diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index 5f8e49e..ee1a2c5 100644
--- a/tests/unit-tests/ca-sqlite.t.cpp
+++ b/tests/unit-tests/ca-sqlite.t.cpp
@@ -39,7 +39,8 @@
 
   // add operation
   RequestId requestId = {1,2,3,4,5,6,7,8};
-  RequestState request1(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert1, makeStringBlock(ndn::tlv::ContentType_Key, "PretendItIsAKey"));
+  std::array<uint8_t, 16> aesKey1;
+  RequestState request1(Name("/ndn/site1"), requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert1, std::move(aesKey1));
   storage.addRequest(request1);
 
   // get operation
@@ -47,14 +48,16 @@
   BOOST_CHECK_EQUAL(request1.m_cert, result.m_cert);
   BOOST_CHECK(request1.m_status == result.m_status);
   BOOST_CHECK_EQUAL(request1.m_caPrefix, result.m_caPrefix);
-  BOOST_CHECK_EQUAL(request1.m_encryptionKey, result.m_encryptionKey);
+  BOOST_CHECK_EQUAL_COLLECTIONS(request1.m_encryptionKey.begin(), request1.m_encryptionKey.end(),
+                                result.m_encryptionKey.begin(), result.m_encryptionKey.end());
 
   // update operation
   JsonSection json;
   json.put("test", "4567");
+  std::array<uint8_t, 16> aesKey2;
   RequestState request2(Name("/ndn/site1"), requestId, RequestType::NEW, Status::CHALLENGE, cert1,
                    "email", "test", time::system_clock::now(), 3, time::seconds(3600),
-                  std::move(json), makeEmptyBlock(ndn::tlv::ContentType_Key), 0);
+                  std::move(json), std::move(aesKey2), 0);
   storage.updateRequest(request2);
   result = storage.getRequest(requestId);
   BOOST_CHECK_EQUAL(request2.m_cert, result.m_cert);
@@ -65,7 +68,9 @@
   auto key2 = identity2.getDefaultKey();
   auto cert2 = key2.getDefaultCertificate();
   RequestId requestId2 = {8,7,6,5,4,3,2,1};
-  RequestState request3(Name("/ndn/site2"), requestId2, RequestType::NEW, Status::BEFORE_CHALLENGE, cert2, makeStringBlock(ndn::tlv::ContentType_Key, "PretendItIsAKey"));
+  std::array<uint8_t, 16> aesKey3;
+  RequestState request3(Name("/ndn/site2"), requestId2, RequestType::NEW,
+                        Status::BEFORE_CHALLENGE, cert2, std::move(aesKey3));
   storage.addRequest(request3);
 
   // list operation
@@ -91,7 +96,9 @@
 
     // add operation
     RequestId requestId = {1,2,3,4,5,6,7,8};
-    RequestState request1(Name("/ndn/site1"),requestId, RequestType::NEW, Status::BEFORE_CHALLENGE, cert1, makeEmptyBlock(ndn::tlv::ContentType_Key));
+    std::array<uint8_t, 16> aesKey;
+    RequestState request1(Name("/ndn/site1"),requestId, RequestType::NEW,
+                          Status::BEFORE_CHALLENGE, cert1, std::move(aesKey));
     BOOST_CHECK_NO_THROW(storage.addRequest(request1));
     // add again
     BOOST_CHECK_THROW(storage.addRequest(request1), std::runtime_error);