encoding: provide FormattedOutputFunction for Block
refs #2225
Change-Id: Ie38539ff93293b3919789043b01e09b573fb619a
diff --git a/tests/unit-tests/security/v2/additional-description.t.cpp b/tests/unit-tests/security/v2/additional-description.t.cpp
index 98431b6..7ceee8c 100644
--- a/tests/unit-tests/security/v2/additional-description.t.cpp
+++ b/tests/unit-tests/security/v2/additional-description.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -82,13 +82,13 @@
BOOST_REQUIRE_NO_THROW(AdditionalDescription(Block(description, sizeof(description))));
AdditionalDescription aDescription2(Block(description, sizeof(description)));
- BOOST_CHECK(aDescription2 == aDescription);
+ BOOST_CHECK_EQUAL(aDescription2, aDescription);
AdditionalDescription aDescription3;
aDescription3.set("key3", "val3");
aDescription3.set("key2", "val2");
- BOOST_CHECK(aDescription2 != aDescription3);
+ BOOST_CHECK_NE(aDescription2, aDescription3);
std::ostringstream os;
os << aDescription;
diff --git a/tests/unit-tests/security/v2/key-chain.t.cpp b/tests/unit-tests/security/v2/key-chain.t.cpp
index d03f572..a4cc2f7 100644
--- a/tests/unit-tests/security/v2/key-chain.t.cpp
+++ b/tests/unit-tests/security/v2/key-chain.t.cpp
@@ -216,9 +216,9 @@
// Create the third key
Key key3 = m_keyChain.createKey(id);
- BOOST_CHECK(key3.getName() != key2.getName());
+ BOOST_CHECK_NE(key3.getName(), key2.getName());
// The added key will not be the default key, because the default key already exists
- BOOST_CHECK(id.getDefaultKey().getName() == key2.getName());
+ BOOST_CHECK_EQUAL(id.getDefaultKey().getName(), key2.getName());
BOOST_CHECK_EQUAL(id.getKeys().size(), 2);
BOOST_REQUIRE_NO_THROW(key3.getDefaultCertificate());