Improve error handling and reporting
Change-Id: I41a58409c1d488ab2038ae534851e1ab59c6d952
diff --git a/tests/security/test-certificate-store.cpp b/tests/security/test-certificate-store.cpp
index df74c28..ffb94d1 100644
--- a/tests/security/test-certificate-store.cpp
+++ b/tests/security/test-certificate-store.cpp
@@ -27,12 +27,12 @@
#include <ndn-cxx/security/key-chain.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/property_tree/info_parser.hpp>
namespace nlsr {
namespace test {
using std::shared_ptr;
-using namespace nlsr::test;
class CertificateStoreFixture : public UnitTestTimeFixture
{
diff --git a/tests/update/test-save-delete-prefix.cpp b/tests/update/test-save-delete-prefix.cpp
index 7f93e9d..9843489 100644
--- a/tests/update/test-save-delete-prefix.cpp
+++ b/tests/update/test-save-delete-prefix.cpp
@@ -32,14 +32,14 @@
#include <ndn-cxx/security/signing-helpers.hpp>
#include <boost/filesystem.hpp>
+#include <boost/property_tree/info_parser.hpp>
namespace nlsr {
namespace test {
-namespace pt = boost::property_tree;
-using namespace pt;
+namespace bpt = boost::property_tree;
-class PrefixSaveDeleteFixture : public nlsr::test::UnitTestTimeFixture
+class PrefixSaveDeleteFixture : public UnitTestTimeFixture
{
public:
PrefixSaveDeleteFixture()
@@ -70,8 +70,8 @@
std::ifstream inputFile;
inputFile.open(testConfFile);
BOOST_REQUIRE(inputFile.is_open());
- pt::ptree pt;
- boost::property_tree::read_info(inputFile, pt);
+ bpt::ptree pt;
+ bpt::read_info(inputFile, pt);
// Loads section and file name
for (const auto& section : pt) {
if (section.first == "security") {
@@ -117,20 +117,18 @@
bool
checkPrefix(const std::string prefixName)
{
- counter = 0;
- pt::ptree m_savePrefix;
- pt::info_parser::read_info(testConfFile, m_savePrefix);
+ bpt::ptree m_savePrefix;
+ bpt::read_info(testConfFile, m_savePrefix);
+
// counter helps to check if multiple prefix of same name exists on conf file
+ counter = 0;
for (const auto& section : m_savePrefix.get_child("advertising")) {
- std:: string b = section.second.get_value<std::string>();
+ auto b = section.second.get_value<std::string>();
if (b == prefixName) {
counter++;
}
}
- if (counter > 0) {
- return true;
- }
- return false;
+ return counter > 0;
}
ndn::Interest
@@ -176,7 +174,6 @@
BOOST_AUTO_TEST_CASE(Basic)
{
-
face.receive(advertiseWithdraw("/prefix/to/save", "advertise", false));
this->advanceClocks(ndn::time::milliseconds(10));
BOOST_CHECK_EQUAL(checkPrefix("/prefix/to/save"), false);