commit 914d05f871e6afc1bacd6af591499c90992aa561
author Davide Pesavento <davidepesa@gmail.com> Sat Jul 13 16:20:19 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sun Jul 14 14:37:32 2019 -0400
tree 886376f5f4177754ebe1f1b15ee26556bd0ce046
parent 4bd6b4f12208b9b30927dfadaf3fc1eea2badff7

tests: ignore ParametersSha256DigestComponent in name prefix check

Plus various minor cleanups

Change-Id: I0907eb80a550a663fbef2ff0a7e24a40614e8655

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

diff --git a/tests/unit-tests/client-module.t.cpp b/tests/unit-tests/client-module.t.cpp
index 1da13ce..9dde9dd 100644
--- a/tests/unit-tests/client-module.t.cpp
+++ b/tests/unit-tests/client-module.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.
@@ -19,9 +19,11 @@
  */
 
 #include "client-module.hpp"
-#include "identity-management-fixture.hpp"
 #include "challenge-module.hpp"
 #include "ca-module.hpp"
+
+#include "identity-management-fixture.hpp"
+
 #include <ndn-cxx/util/dummy-client-face.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
 #include <ndn-cxx/security/transform/public-key.hpp>
@@ -56,12 +58,14 @@
   client.getClientConf().m_caItems.push_back(item);
 
   auto firstInterest = client.generateProbeInterest(item, "zhiyi@cs.ucla.edu:987654321:Zhiyi Zhang");
-  BOOST_CHECK_EQUAL(firstInterest->getName().toUri(), "/site/CA/_PROBE");
+  BOOST_CHECK(firstInterest->getName().at(-1).isParametersSha256Digest());
+  // ignore the last name component (ParametersSha256Digest)
+  BOOST_CHECK_EQUAL(firstInterest->getName().getPrefix(-1), "/site/CA/_PROBE");
   BOOST_CHECK_EQUAL(CaModule::jsonFromBlock(firstInterest->getApplicationParameters()).get<std::string>("email"),
                     "zhiyi@cs.ucla.edu");
 }
 
-BOOST_AUTO_TEST_CASE(genProbeRequestJson)
+BOOST_AUTO_TEST_CASE(GenProbeRequestJson)
 {
   ClientModule client(m_keyChain);
   client.getClientConf().load("tests/unit-tests/client.conf.test");