From 93af466bef25d9737968156ca0e4bba8d1c806c1 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 11 Jul 2018 17:03:57 +0200 Subject: [PATCH] all current tests clean --- .../tests/input/TestEventNotifier.cpp | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp index c1397fb..affa692 100644 --- a/FlippR-Driver/tests/input/TestEventNotifier.cpp +++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp @@ -58,19 +58,21 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no { REQUIRE(*notifier.event_handler.begin() == &event_handler_mock.get()); } - } - WHEN("The EventHandler gets unregistered at the driver") - { - REQUIRE(!notifier.event_handler.empty()); - - notifier.unregister_event_handler(&event_handler_mock.get()); - - THEN("The unregister_event_handler at the event_notifier gets called") + AND_WHEN("The EventHandler gets unregistered at the driver") { - REQUIRE(notifier.event_handler.empty()); + REQUIRE(!notifier.event_handler.empty()); + + notifier.unregister_event_handler(&event_handler_mock.get()); + + THEN("The list of event_handlers is empty") + { + REQUIRE(notifier.event_handler.empty()); + } } } + + } } @@ -103,7 +105,7 @@ SCENARIO("The EventHandler gets notified") Fake(Dtor(event_handler_mock)); EventNotifier notifier; - + notifier.event_handler.emplace(&event_handler_mock.get()); WHEN("The event gets queued") {