commit 7890a9f26debd540978dfbdc134f2d8c6d09d32e
author Davide Pesavento <davidepesa@gmail.com> Sun Aug 25 23:11:18 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sun Aug 25 23:11:18 2019 -0400
tree 190975bea568c219d31b6c379a3aeda7008322f0
parent eb7b7abbeed1ddb759ae2b09d66b0cac39dfbd25

tests: avoid comparing Interests with operator==

Refs: #4569
Change-Id: Ia75169c147976d3980dd113054ba560caf0f33c8

tests/daemon/face/generic-link-service.t.cpp

diff --git a/tests/daemon/face/generic-link-service.t.cpp b/tests/daemon/face/generic-link-service.t.cpp
index 8f0dbae..612e6ee 100644
--- a/tests/daemon/face/generic-link-service.t.cpp
+++ b/tests/daemon/face/generic-link-service.t.cpp
@@ -163,7 +163,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInInterests, 1);
   BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
-  BOOST_CHECK_EQUAL(receivedInterests.back(), *interest1);
+  BOOST_CHECK_EQUAL(receivedInterests.back().wireEncode(), interest1->wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(ReceiveInterest)
@@ -183,7 +183,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInInterests, 1);
   BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
-  BOOST_CHECK_EQUAL(receivedInterests.back(), *interest1);
+  BOOST_CHECK_EQUAL(receivedInterests.back().wireEncode(), interest1->wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(ReceiveBareData)
@@ -198,7 +198,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInData, 1);
   BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
-  BOOST_CHECK_EQUAL(receivedData.back(), *data1);
+  BOOST_CHECK_EQUAL(receivedData.back().wireEncode(), data1->wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(ReceiveData)
@@ -218,7 +218,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInData, 1);
   BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
-  BOOST_CHECK_EQUAL(receivedData.back(), *data1);
+  BOOST_CHECK_EQUAL(receivedData.back().wireEncode(), data1->wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(ReceiveNack)
@@ -239,8 +239,8 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInNacks, 1);
   BOOST_REQUIRE_EQUAL(receivedNacks.size(), 1);
-  BOOST_CHECK(receivedNacks.back().getReason() == nack1.getReason());
-  BOOST_CHECK(receivedNacks.back().getInterest() == nack1.getInterest());
+  BOOST_CHECK_EQUAL(receivedNacks.back().getReason(), nack1.getReason());
+  BOOST_CHECK_EQUAL(receivedNacks.back().getInterest().wireEncode(), nack1.getInterest().wireEncode());
 }
 
 BOOST_AUTO_TEST_CASE(ReceiveIdlePacket)
@@ -360,7 +360,7 @@
     }
     else {
       BOOST_CHECK_EQUAL(receivedInterests.size(), 1);
-      BOOST_CHECK_EQUAL(receivedInterests.back(), *interest);
+      BOOST_CHECK_EQUAL(receivedInterests.back().wireEncode(), interest->wireEncode());
       BOOST_CHECK_EQUAL(service->getCounters().nReassembling, 0);
     }
   }
@@ -809,7 +809,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
-  shared_ptr<lp::NextHopFaceIdTag> tag = receivedInterests.back().getTag<lp::NextHopFaceIdTag>();
+  auto tag = receivedInterests.back().getTag<lp::NextHopFaceIdTag>();
   BOOST_REQUIRE(tag != nullptr);
   BOOST_CHECK_EQUAL(*tag, 1000);
 }
@@ -884,7 +884,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
-  shared_ptr<lp::CachePolicyTag> tag = receivedData.back().getTag<lp::CachePolicyTag>();
+  auto tag = receivedData.back().getTag<lp::CachePolicyTag>();
   BOOST_REQUIRE(tag != nullptr);
   BOOST_CHECK_EQUAL(tag->get().getPolicy(), lp::CachePolicyType::NO_CACHE);
 }
@@ -1069,7 +1069,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
-  shared_ptr<lp::CongestionMarkTag> tag = receivedInterests.back().getTag<lp::CongestionMarkTag>();
+  auto tag = receivedInterests.back().getTag<lp::CongestionMarkTag>();
   BOOST_REQUIRE(tag != nullptr);
   BOOST_CHECK_EQUAL(*tag, 1);
 }
@@ -1083,7 +1083,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
-  shared_ptr<lp::CongestionMarkTag> tag = receivedData.back().getTag<lp::CongestionMarkTag>();
+  auto tag = receivedData.back().getTag<lp::CongestionMarkTag>();
   BOOST_REQUIRE(tag != nullptr);
   BOOST_CHECK_EQUAL(*tag, 1);
 }
@@ -1101,7 +1101,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedNacks.size(), 1);
-  shared_ptr<lp::CongestionMarkTag> tag = receivedNacks.back().getTag<lp::CongestionMarkTag>();
+  auto tag = receivedNacks.back().getTag<lp::CongestionMarkTag>();
   BOOST_REQUIRE(tag != nullptr);
   BOOST_CHECK_EQUAL(*tag, 1);
 }
@@ -1151,7 +1151,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
-  shared_ptr<lp::NonDiscoveryTag> tag = receivedInterests.back().getTag<lp::NonDiscoveryTag>();
+  auto tag = receivedInterests.back().getTag<lp::NonDiscoveryTag>();
   BOOST_CHECK(tag != nullptr);
 }
 
@@ -1169,8 +1169,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInNetInvalid, 0); // not an error
   BOOST_CHECK_EQUAL(receivedInterests.size(), 1);
-
-  shared_ptr<lp::NonDiscoveryTag> tag = receivedInterests.back().getTag<lp::NonDiscoveryTag>();
+  auto tag = receivedInterests.back().getTag<lp::NonDiscoveryTag>();
   BOOST_CHECK(tag == nullptr);
 }
 
@@ -1258,7 +1257,7 @@
   transport->receivePacket(packet.wireEncode());
 
   BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
-  shared_ptr<lp::PrefixAnnouncementTag> tag = receivedData.back().getTag<lp::PrefixAnnouncementTag>();
+  auto tag = receivedData.back().getTag<lp::PrefixAnnouncementTag>();
   BOOST_CHECK_EQUAL(tag->get().getPrefixAnn()->getAnnouncedName(), "/local/ndn/prefix");
 }
 
@@ -1277,8 +1276,7 @@
 
   BOOST_CHECK_EQUAL(service->getCounters().nInNetInvalid, 0); // not an error
   BOOST_CHECK_EQUAL(receivedData.size(), 1);
-
-  shared_ptr<lp::PrefixAnnouncementTag> tag = receivedData.back().getTag<lp::PrefixAnnouncementTag>();
+  auto tag = receivedData.back().getTag<lp::PrefixAnnouncementTag>();
   BOOST_CHECK(tag == nullptr);
 }