From 3c1889fbd0d7b96aae16f3479ac8aae70a7e15f7 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Wed, 28 Oct 2015 19:13:53 +0100
Subject: Use Catch for our test suite

`make check` is also added to compile and run the tests
Catch is fetched with cmake automatically into the build directory when needed
---
 tests/timed_events.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 tests/timed_events.cpp

(limited to 'tests/timed_events.cpp')

diff --git a/tests/timed_events.cpp b/tests/timed_events.cpp
new file mode 100644
index 0000000..3844f3d
--- /dev/null
+++ b/tests/timed_events.cpp
@@ -0,0 +1,62 @@
+#include "catch.hpp"
+
+#include <utils/timed_events.hpp>
+
+/**
+ * Let Catch know how to display std::chrono::duration values
+ */
+namespace Catch
+{
+  template<typename Rep, typename Period> struct StringMaker<std::chrono::duration<Rep, Period>>
+  {
+    static std::string convert(const std::chrono::duration<Rep, Period>& value)
+    {
+      return  std::to_string(std::chrono::duration_cast<std::chrono::milliseconds>(value).count()) + "ms";
+    }
+  };
+}
+
+/**
+ * TODO, use a mock clock instead of relying on the real time with a sleep:
+ * it’s unreliable on heavy load.
+ */
+#include <thread>
+
+TEST_CASE("Test timed event expiration")
+{
+  SECTION("Check what happens when there is no events")
+    {
+      CHECK(TimedEventsManager::instance().get_timeout() == utils::no_timeout);
+      CHECK(TimedEventsManager::instance().execute_expired_events() == 0);
+    }
+
+  // Add a single event
+  TimedEventsManager::instance().add_event(TimedEvent(std::chrono::steady_clock::now() + 50ms, [](){}));
+
+  // The event should not yet be expired
+  CHECK(TimedEventsManager::instance().get_timeout() > 0ms);
+  CHECK(TimedEventsManager::instance().execute_expired_events() == 0);
+
+  std::chrono::milliseconds timoute = TimedEventsManager::instance().get_timeout();
+  INFO("Sleeping for " << timoute.count() << "ms");
+  std::this_thread::sleep_for(timoute);
+
+  // Event is now expired
+  CHECK(TimedEventsManager::instance().execute_expired_events() == 1);
+  CHECK(TimedEventsManager::instance().get_timeout() == utils::no_timeout);
+}
+
+TEST_CASE("Test timed event cancellation")
+{
+  auto now = std::chrono::steady_clock::now();
+  TimedEventsManager::instance().add_event(TimedEvent(now + 100ms, [](){ }, "un"));
+  TimedEventsManager::instance().add_event(TimedEvent(now + 200ms, [](){ }, "deux"));
+  TimedEventsManager::instance().add_event(TimedEvent(now + 300ms, [](){ }, "deux"));
+
+  CHECK(TimedEventsManager::instance().get_timeout() > 0ms);
+  CHECK(TimedEventsManager::instance().size() == 3);
+  CHECK(TimedEventsManager::instance().cancel("un") == 1);
+  CHECK(TimedEventsManager::instance().size() == 2);
+  CHECK(TimedEventsManager::instance().cancel("deux") == 2);
+  CHECK(TimedEventsManager::instance().get_timeout() == utils::no_timeout);
+}
-- 
cgit v1.2.3


From 0d1e0629e7efe07bacce6a22e45ddfd7652eb505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Thu, 28 Jul 2016 10:47:44 +0200
Subject: Fix the timeout test, now that we don't wait 1ms too much everytime

---
 tests/timed_events.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/timed_events.cpp')

diff --git a/tests/timed_events.cpp b/tests/timed_events.cpp
index 3844f3d..d63abef 100644
--- a/tests/timed_events.cpp
+++ b/tests/timed_events.cpp
@@ -39,7 +39,7 @@ TEST_CASE("Test timed event expiration")
 
   std::chrono::milliseconds timoute = TimedEventsManager::instance().get_timeout();
   INFO("Sleeping for " << timoute.count() << "ms");
-  std::this_thread::sleep_for(timoute);
+  std::this_thread::sleep_for(timoute + 1ms);
 
   // Event is now expired
   CHECK(TimedEventsManager::instance().execute_expired_events() == 1);
-- 
cgit v1.2.3