commit 7afcab4652d40706d82497277b9f62f1214b3f94
author Nick Gordon <nmgordon@memphis.edu> Mon Aug 21 14:12:22 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Tue Aug 22 14:05:43 2017 -0700
tree 00243142c1c83c09fd21b52a442c5488d5c9aed3
parent e98480b5d1eb37efdf97b9b4a72b4c4ae7b33100

tests: make sync tests more deterministic

This change makes the UpdateForOther{LS,HR} tests more deterministic by
removing the temporal ordering requirement of sent interests.

Change-Id: Iceab5735baa2ff2fb97b18babfcf2bb32110a3c2
refs: #4253

tests/test-sync-logic-handler.cpp

diff --git a/tests/test-sync-logic-handler.cpp b/tests/test-sync-logic-handler.cpp
index 24bd065..5ebe679 100644
--- a/tests/test-sync-logic-handler.cpp
+++ b/tests/test-sync-logic-handler.cpp
@@ -90,13 +90,11 @@
 
     receiveUpdate(updateName, syncSeqNo, sync);
 
-    std::vector<ndn::Interest>& interests = face->sentInterests;
-
-    std::vector<ndn::Interest>::iterator it = interests.begin();
-
-    BOOST_REQUIRE_EQUAL(interests.size(), 1);
-
-    BOOST_CHECK_EQUAL(it->getName().getPrefix(-1), updateName + "/");
+    const auto& it = std::find_if(face->sentInterests.begin(), face->sentInterests.end(),
+                                  [updateName] (const ndn::Interest& interest) {
+                                    return interest.getName().getPrefix(-1) == updateName + "/";
+                                  });
+    BOOST_REQUIRE(it != face->sentInterests.end());
   }
 }
 
@@ -124,12 +122,12 @@
 
     receiveUpdate(updateName, syncSeqNo, sync_hr);
 
-    std::vector<ndn::Interest>& interests = face->sentInterests;
-    std::vector<ndn::Interest>::iterator it = interests.begin();
+    const auto& it = std::find_if(face->sentInterests.begin(), face->sentInterests.end(),
+                                  [updateName] (const ndn::Interest& interest) {
+                                    return interest.getName().getPrefix(-1) == updateName + "/";
+                                  });
 
-    BOOST_REQUIRE_EQUAL(interests.size(), 1);
-
-    BOOST_CHECK_EQUAL(it->getName().getPrefix(-1), updateName + "/");
+    BOOST_REQUIRE(it != face->sentInterests.end());
   }
 }