commit 3c6b1fd0017a7f7a34ba8811d205a8e89311ee03
author Yumin Xia <me@yumin-xia.com> Sun Dec 11 19:08:47 2016 -0800
committer Yumin Xia <me@yumin-xia.com> Sat Dec 31 21:14:33 2016 -0800
tree 7dbcc7dead81af4b7417cb76ec1668c766cee94d
parent a484ba73de7e7deefb3c6a8e895950fd9dc77296

Use standard BLOB,KEY,NACK as contentType instead of customized types

Change-Id: I792e19b8f1e2aa359605da44074fc25bf7963a9a

tests/unit/clients/response.cpp

diff --git a/tests/unit/clients/response.cpp b/tests/unit/clients/response.cpp
index 5c41f7d..88941c8 100644
--- a/tests/unit/clients/response.cpp
+++ b/tests/unit/clients/response.cpp
@@ -36,12 +36,12 @@
   ndns::Response r(zone, qType);
   r.setRrLabel(Name("/ndnsim/www"));
   r.setRrType(label::CERT_RR_TYPE);
-  r.setContentType(NDNS_BLOB);
+  r.setContentType(NDNS_KEY);
   r.setFreshnessPeriod(time::seconds(4000));
 
   BOOST_CHECK_EQUAL(r.getFreshnessPeriod(), time::seconds(4000));
   BOOST_CHECK_EQUAL(r.getRrType(), label::CERT_RR_TYPE);
-  BOOST_CHECK_EQUAL(r.getContentType(), NDNS_BLOB);
+  BOOST_CHECK_EQUAL(r.getContentType(), NDNS_KEY);
   BOOST_CHECK_EQUAL(r.getZone(), zone);
   BOOST_CHECK_EQUAL(r.getQueryType(), qType);
 

tests/unit/daemon/name-server.cpp

diff --git a/tests/unit/daemon/name-server.cpp b/tests/unit/daemon/name-server.cpp
index 4b6af12..581f3e0 100644
--- a/tests/unit/daemon/name-server.cpp
+++ b/tests/unit/daemon/name-server.cpp
@@ -85,8 +85,6 @@
   BOOST_CHECK_EQUAL(hasDataBack, true);
 }
 
-BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES(KeyQuery, 2)
-
 BOOST_AUTO_TEST_CASE(KeyQuery)
 {
   Query q(zone, ndns::label::NDNS_ITERATIVE_QUERY);
@@ -109,7 +107,7 @@
   face.receive(q.toInterest());
   run();
 
-  // will ask for the existing record (will have type NDNS_BLOB, as it is certificate)
+  // will ask for the existing record (will have type NDNS_KEY, as it is certificate)
   face.onSendData.connectSingleShot([&] (const Data& data) {
     ++nDataBack;
     NDNS_LOG_TRACE("get Data back");
@@ -117,7 +115,7 @@
 
     Response resp;
     BOOST_CHECK_NO_THROW(resp.fromData(zone, data));
-    BOOST_CHECK_EQUAL(resp.getContentType(), NDNS_BLOB);
+    BOOST_CHECK_EQUAL(resp.getContentType(), NDNS_KEY);
   });
 
   q.setRrLabel("dsk-1");
@@ -135,7 +133,7 @@
 
     Response resp;
     BOOST_CHECK_NO_THROW(resp.fromData(zone, data));
-    BOOST_CHECK_EQUAL(resp.getContentType(), NDNS_BLOB);
+    BOOST_CHECK_EQUAL(resp.getContentType(), NDNS_KEY);
   });
 
   run();

tests/unit/database-test-data.cpp

diff --git a/tests/unit/database-test-data.cpp b/tests/unit/database-test-data.cpp
index 4b1de42..c3f6e07 100644
--- a/tests/unit/database-test-data.cpp
+++ b/tests/unit/database-test-data.cpp
@@ -80,7 +80,7 @@
     name::Component qType(label::NDNS_ITERATIVE_QUERY);
     NdnsContentType contentType = NDNS_RESP;
     if (type == label::CERT_RR_TYPE) {
-      contentType = NDNS_BLOB;
+      contentType = NDNS_KEY;
       qType = label::NDNS_CERT_QUERY;
     } else if (type == label::NS_RR_TYPE) {
       contentType = NDNS_LINK;