commit 85d9083b35a6d9b804b5dd3d45b1039e96d1bf57
author Junxiao Shi <git@mail1.yoursunny.com> Thu Aug 04 03:19:46 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Aug 04 03:19:46 2016 +0000
tree 4e0593d4b896fb676239d6ee9bf61befa03bd654
parent 3e62a83f5c4333b2beb3b4bc7f03e430bb986469

tests: move makeInterest/makeData/etc to ndn::tests namespace

refs #2376

Change-Id: If824388f1e2859d7d2199cd622db2aa1a3277798

tests/unit-tests/security/validator-config.t.cpp

diff --git a/tests/unit-tests/security/validator-config.t.cpp b/tests/unit-tests/security/validator-config.t.cpp
index 028d790..63b0142 100644
--- a/tests/unit-tests/security/validator-config.t.cpp
+++ b/tests/unit-tests/security/validator-config.t.cpp
@@ -601,25 +601,25 @@
   conf::Checker& checker1 = *validator.m_dataRules.front()->m_checkers[1];
   conf::Checker& checker2 = *validator.m_dataRules.front()->m_checkers[2];
 
-  auto data1 = util::makeData(Name(identity1).append("Test"));
+  auto data1 = makeData(Name(identity1).append("Test"));
   BOOST_CHECK_NO_THROW(m_keyChain.sign(*data1, security::signingByIdentity(identity1)));
   BOOST_CHECK_EQUAL(checker0.check(*data1), 0);
   BOOST_CHECK_EQUAL(checker1.check(*data1), 0);
   BOOST_CHECK_EQUAL(checker2.check(*data1), 1);
 
-  auto data2 = util::makeData(Name(identity2).append("Data2"));
+  auto data2 = makeData(Name(identity2).append("Data2"));
   BOOST_CHECK_NO_THROW(m_keyChain.sign(*data2, security::signingByIdentity(identity2)));
   BOOST_CHECK_EQUAL(checker0.check(*data2), -1);
   BOOST_CHECK_EQUAL(checker1.check(*data2), 0);
   BOOST_CHECK_EQUAL(checker2.check(*data2), -1);
 
-  auto data3 = util::makeData(Name(identity2).append("Data3"));
+  auto data3 = makeData(Name(identity2).append("Data3"));
   BOOST_CHECK_NO_THROW(m_keyChain.sign(*data3, security::signingByIdentity(identity1)));
   BOOST_CHECK_EQUAL(checker0.check(*data3), 0);
   BOOST_CHECK_EQUAL(checker1.check(*data3), -1);
   BOOST_CHECK_EQUAL(checker2.check(*data3), 1);
 
-  auto data4 = util::makeData("/Data4");
+  auto data4 = makeData("/Data4");
   BOOST_CHECK_NO_THROW(m_keyChain.sign(*data4, security::signingByIdentity(identity2)));
   BOOST_CHECK_EQUAL(checker0.check(*data4), -1);
   BOOST_CHECK_EQUAL(checker1.check(*data4), -1);