tests: ignore ParametersSha256DigestComponent in name prefix check
Plus various minor cleanups
Change-Id: I0907eb80a550a663fbef2ff0a7e24a40614e8655
diff --git a/tests/unit-tests/client-config.t.cpp b/tests/unit-tests/client-config.t.cpp
index 1026ad8..5d662ff 100644
--- a/tests/unit-tests/client-config.t.cpp
+++ b/tests/unit-tests/client-config.t.cpp
@@ -1,5 +1,5 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
* Copyright (c) 2017-2019, Regents of the University of California.
*
* This file is part of ndncert, a certificate management system based on NDN.
@@ -35,10 +35,10 @@
BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
const auto& item = config.m_caItems.front();
- BOOST_CHECK_EQUAL(item.m_caName.toUri(), "/ndn/edu/ucla");
+ BOOST_CHECK_EQUAL(item.m_caName, "/ndn/edu/ucla");
BOOST_CHECK_EQUAL(item.m_caInfo, "UCLA's ceritificate authority, located in BH4805.");
BOOST_CHECK_EQUAL(item.m_probe, "email");
- BOOST_CHECK_EQUAL(item.m_anchor.getName().toUri(),
+ BOOST_CHECK_EQUAL(item.m_anchor.getName(),
"/ndn/site1/KEY/%11%BC%22%F4c%15%FF%17/self/%FD%00%00%01Y%C8%14%D9%A5");
BOOST_CHECK_EQUAL(config.m_localNdncertAnchor, "/usr/local/etc/ndncert/anchor.key");
@@ -57,12 +57,12 @@
config.m_caItems.push_back(item);
BOOST_CHECK_EQUAL(config.m_caItems.size(), 3);
auto lastItem = config.m_caItems.back();
- BOOST_CHECK_EQUAL(lastItem.m_caName.toUri(), "/test");
+ BOOST_CHECK_EQUAL(lastItem.m_caName, "/test");
config.removeCaItem(Name("/test"));
BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
lastItem = config.m_caItems.back();
- BOOST_CHECK_EQUAL(lastItem.m_caName.toUri(), "/ndn/edu/ucla/zhiyi");
+ BOOST_CHECK_EQUAL(lastItem.m_caName, "/ndn/edu/ucla/zhiyi");
}
BOOST_AUTO_TEST_SUITE_END() // TestClientConfig