From 5bafd2c7c41013e62f2853360937a761c7450b82 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Tue, 28 Jul 2020 16:16:27 -0400
Subject: [PATCH] tests: fix Face/TestLpFragmenter after Data encoding changes
 in ndn-cxx

Change-Id: I6f01ca36ba6f5833a9d73ddc777c5fcdadcd7334
---
 tests/daemon/face/lp-fragmenter.t.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/daemon/face/lp-fragmenter.t.cpp b/tests/daemon/face/lp-fragmenter.t.cpp
index 7e38a62e..d4403100 100644
--- a/tests/daemon/face/lp-fragmenter.t.cpp
+++ b/tests/daemon/face/lp-fragmenter.t.cpp
@@ -51,10 +51,9 @@ BOOST_AUTO_TEST_CASE(FragmentSingleFragment)
   lp::Packet packet;
   packet.add<lp::IncomingFaceIdField>(123);
 
-  shared_ptr<Data> data = makeData("/test/data1");
+  auto data = makeData("/test/data123");
   BOOST_REQUIRE_EQUAL(data->wireEncode().size(), 30);
-  packet.add<lp::FragmentField>(std::make_pair(data->wireEncode().begin(),
-                                               data->wireEncode().end()));
+  packet.add<lp::FragmentField>({data->wireEncode().begin(), data->wireEncode().end()});
 
   bool isOk = false;
   std::vector<lp::Packet> frags;
@@ -81,10 +80,9 @@ BOOST_AUTO_TEST_CASE(FragmentMultipleFragments)
   lp::Packet packet;
   packet.add<lp::IncomingFaceIdField>(123);
 
-  shared_ptr<Data> data = makeData("/test/data1/123456789/987654321/123456789");
+  auto data = makeData("/test/data123/123456789/987654321/123456789");
   BOOST_REQUIRE_EQUAL(data->wireEncode().size(), 63);
-  packet.add<lp::FragmentField>(std::make_pair(data->wireEncode().begin(),
-                                               data->wireEncode().end()));
+  packet.add<lp::FragmentField>({data->wireEncode().begin(), data->wireEncode().end()});
 
   bool isOk = false;
   std::vector<lp::Packet> frags;
@@ -161,13 +159,12 @@ BOOST_AUTO_TEST_CASE(FragmentMtuTooSmall)
   lp::Packet packet;
   packet.add<lp::IncomingFaceIdField>(123);
 
-  shared_ptr<Data> data = makeData("/test/data1/123456789/987654321/123456789");
-  packet.add<lp::FragmentField>(std::make_pair(data->wireEncode().begin(),
-                                               data->wireEncode().end()));
+  auto data = makeData("/test/data123/123456789/987654321/123456789");
+  packet.add<lp::FragmentField>({data->wireEncode().begin(), data->wireEncode().end()});
 
   bool isOk = false;
   std::tie(isOk, std::ignore) = fragmenter.fragmentPacket(packet, mtu);
-  BOOST_REQUIRE(!isOk);
+  BOOST_CHECK_EQUAL(isOk, false);
 }
 
 BOOST_AUTO_TEST_CASE(FragmentOverFragCount)
@@ -181,13 +178,12 @@ BOOST_AUTO_TEST_CASE(FragmentOverFragCount)
   lp::Packet packet;
   packet.add<lp::IncomingFaceIdField>(123);
 
-  shared_ptr<Data> data = makeData("/test/data1/123456789/987654321/123456789");
-  packet.add<lp::FragmentField>(std::make_pair(data->wireEncode().begin(),
-                                               data->wireEncode().end()));
+  auto data = makeData("/test/data123/123456789/987654321/123456789");
+  packet.add<lp::FragmentField>({data->wireEncode().begin(), data->wireEncode().end()});
 
   bool isOk = false;
   std::tie(isOk, std::ignore) = fragmenter.fragmentPacket(packet, mtu);
-  BOOST_REQUIRE(!isOk);
+  BOOST_CHECK_EQUAL(isOk, false);
 }
 
 BOOST_AUTO_TEST_SUITE_END() // TestLpFragmentation