commit 370d260f315c0800b487238c361068f1ba1838b9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 20 10:21:34 2014 -0500
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 20 11:13:52 2014 -0500
tree c63a33d09a871becdf117100369b5b64bd1eca41
parent a4ebb927ffe2245022e2204aa465ff6e0bcb3444

tests: Small correction to make test case more stable

Change-Id: I720499212a3857df2e1467cfee8c7e1f4decdf78

tests/unit-tests/dummy-client-face.hpp

diff --git a/tests/unit-tests/dummy-client-face.hpp b/tests/unit-tests/dummy-client-face.hpp
index d8789bd..b744882 100644
--- a/tests/unit-tests/dummy-client-face.hpp
+++ b/tests/unit-tests/dummy-client-face.hpp
@@ -90,6 +90,14 @@
     m_transport->m_sentDatas     = &m_sentDatas;
   }
 
+  DummyClientFace(shared_ptr<DummyClientTransport> transport, boost::asio::io_service& ioService)
+    : Face(transport, ioService)
+    , m_transport(transport)
+  {
+    m_transport->m_sentInterests = &m_sentInterests;
+    m_transport->m_sentDatas     = &m_sentDatas;
+  }
+
   /** \brief cause the Face to receive a packet
    */
   template<typename Packet>
@@ -121,6 +129,12 @@
   return make_shared<DummyClientFace>(make_shared<DummyClientTransport>());
 }
 
+inline shared_ptr<DummyClientFace>
+makeDummyClientFace(boost::asio::io_service& ioService)
+{
+  return make_shared<DummyClientFace>(make_shared<DummyClientTransport>(), ref(ioService));
+}
+
 } // namespace tests
 } // namespace ndn
 

tests/unit-tests/util/notification-subscriber.cpp

diff --git a/tests/unit-tests/util/notification-subscriber.cpp b/tests/unit-tests/util/notification-subscriber.cpp
index 1633ccf..092a601 100644
--- a/tests/unit-tests/util/notification-subscriber.cpp
+++ b/tests/unit-tests/util/notification-subscriber.cpp
@@ -62,9 +62,9 @@
 public:
   EndToEndFixture()
     : streamPrefix("ndn:/NotificationSubscriberTest")
-    , publisherFace(makeDummyClientFace())
+    , publisherFace(makeDummyClientFace(ioService))
     , notificationStream(*publisherFace, streamPrefix, publisherKeyChain)
-    , subscriberFace(makeDummyClientFace())
+    , subscriberFace(makeDummyClientFace(ioService))
     , subscriber(*subscriberFace, streamPrefix, time::seconds(1))
   {
   }
@@ -77,7 +77,9 @@
     publisherFace->m_sentDatas.clear();
     SimpleNotification notification(msg);
     notificationStream.postNotification(notification);
-    publisherFace->processEvents();
+
+    publisherFace->processEvents(time::milliseconds(100));
+
     BOOST_REQUIRE_EQUAL(publisherFace->m_sentDatas.size(), 1);
 
     lastDeliveredSeqNo = publisherFace->m_sentDatas[0].getName().at(-1).toSequenceNumber();
@@ -145,6 +147,7 @@
   }
 
 protected:
+  boost::asio::io_service ioService;
   Name streamPrefix;
   shared_ptr<DummyClientFace> publisherFace;
   ndn::KeyChain publisherKeyChain;
@@ -173,27 +176,27 @@
 
   // not received when subscriber is not running
   this->deliverNotification("n1");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(100));
   BOOST_CHECK(lastNotification.getMessage().empty());
   BOOST_CHECK_EQUAL(subscriberFace->m_sentInterests.size(), 0);
 
   subscriberFace->m_sentInterests.clear();
   subscriber.start();
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_REQUIRE_EQUAL(subscriber.isRunning(), true);
   BOOST_CHECK(this->hasInitialRequest());
 
   // respond to initial request
   subscriberFace->m_sentInterests.clear();
   this->deliverNotification("n2");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_CHECK_EQUAL(lastNotification.getMessage(), "n2");
   BOOST_CHECK_EQUAL(this->getRequestSeqNo(), lastDeliveredSeqNo + 1);
 
   // respond to continuation request
   subscriberFace->m_sentInterests.clear();
   this->deliverNotification("n3");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_CHECK_EQUAL(lastNotification.getMessage(), "n3");
   BOOST_CHECK_EQUAL(this->getRequestSeqNo(), lastDeliveredSeqNo + 1);
 
@@ -213,7 +216,7 @@
   subscriberFace->receive(wrongData);
   subscriberFace->m_sentInterests.clear();
   lastNotification.setMessage("");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_CHECK(lastNotification.getMessage().empty());
   BOOST_CHECK_EQUAL(lastDecodeErrorData.getName(), wrongName);
   BOOST_CHECK(this->hasInitialRequest());
@@ -222,7 +225,7 @@
   subscriberFace->m_sentInterests.clear();
   lastNotification.setMessage("");
   this->deliverNotification("\x07n4");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_CHECK(lastNotification.getMessage().empty());
   BOOST_CHECK(this->hasInitialRequest());
 
@@ -230,7 +233,7 @@
   subscriber.onNotification += bind(&EndToEndFixture::clearNotificationHandlers, this);
   subscriberFace->m_sentInterests.clear();
   this->deliverNotification("n5");
-  subscriberFace->processEvents(time::milliseconds(10));
+  subscriberFace->processEvents(time::milliseconds(-100));
   BOOST_CHECK_EQUAL(subscriberFace->m_sentInterests.size(), 0);
 }