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/face.t.cpp

diff --git a/tests/unit-tests/face.t.cpp b/tests/unit-tests/face.t.cpp
index 877e6bd..1fc9c86 100644
--- a/tests/unit-tests/face.t.cpp
+++ b/tests/unit-tests/face.t.cpp
@@ -78,8 +78,8 @@
 
   advanceClocks(time::milliseconds(1), 40);
 
-  face.receive(*util::makeData("/Bye/World/a"));
-  face.receive(*util::makeData("/Hello/World/a"));
+  face.receive(*makeData("/Bye/World/a"));
+  face.receive(*makeData("/Hello/World/a"));
 
   advanceClocks(time::milliseconds(1), 100);
 
@@ -113,8 +113,8 @@
 
   advanceClocks(time::milliseconds(1), 40);
 
-  face.receive(*util::makeData("/Bye/World/a"));
-  face.receive(*util::makeData("/Hello/World/a"));
+  face.receive(*makeData("/Bye/World/a"));
+  face.receive(*makeData("/Hello/World/a"));
 
   advanceClocks(time::milliseconds(1), 100);
 
@@ -131,7 +131,7 @@
                            BOOST_FAIL("Unexpected timeout");
                          }));
   advanceClocks(time::milliseconds(1), 40);
-  face.receive(*util::makeData("/Hello/World/a/1/xxxxx"));
+  face.receive(*makeData("/Hello/World/a/1/xxxxx"));
 
   advanceClocks(time::milliseconds(1), 100);
 
@@ -241,7 +241,7 @@
   face.removePendingInterest(interestId);
   advanceClocks(time::milliseconds(10));
 
-  face.receive(*util::makeData("/Hello/World/!"));
+  face.receive(*makeData("/Hello/World/!"));
   advanceClocks(time::milliseconds(10), 100);
 }
 
@@ -264,8 +264,8 @@
 
   BOOST_CHECK_EQUAL(face.getNPendingInterests(), 0);
 
-  face.receive(*util::makeData("/Hello/World/0"));
-  face.receive(*util::makeData("/Hello/World/1"));
+  face.receive(*makeData("/Hello/World/0"));
+  face.receive(*makeData("/Hello/World/1"));
   advanceClocks(time::milliseconds(10), 100);
 }