From a914b2b0c8c0dc1db44c03cdd770b223a4342be8 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 26 Sep 2018 20:59:50 +0200 Subject: [PATCH] todo make tests working --- FlippR-Driver/src/input/DistributingEvent.cpp | 2 +- FlippR-Driver/src/input/EventNotifier.cpp | 4 ++-- FlippR-Driver/src/input/EventNotifier.h | 2 +- FlippR-Driver/src/input/IEventNotifier.h | 2 +- FlippR-Driver/tests/input/TestEventNotifier.cpp | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/FlippR-Driver/src/input/DistributingEvent.cpp b/FlippR-Driver/src/input/DistributingEvent.cpp index 1369a4c..1d4ddd6 100644 --- a/FlippR-Driver/src/input/DistributingEvent.cpp +++ b/FlippR-Driver/src/input/DistributingEvent.cpp @@ -15,7 +15,7 @@ void FlippR_Driver::Input::DistributingEvent::distribute() std::chrono::milliseconds elapsed_time = std::chrono::duration_cast(now - last_activation); if(elapsed_time > deactivation_time) { - event_notifier->distribute_event(std::shared_ptr(this)); // todo why new shared ptr? + event_notifier->distribute_event(*this); // todo why new shared ptr? this->last_activation = now; } } diff --git a/FlippR-Driver/src/input/EventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp index a948689..00a786a 100644 --- a/FlippR-Driver/src/input/EventNotifier.cpp +++ b/FlippR-Driver/src/input/EventNotifier.cpp @@ -49,9 +49,9 @@ void EventNotifier::unregister_event_handler(IEventHandler* handler) this->event_handlers.erase(handler); } -void EventNotifier::distribute_event(std::shared_ptr event) +void EventNotifier::distribute_event(Event &event) { - this->event_queue->push(*event); + this->event_queue->push(event); } void EventNotifier::notify() diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h index 62427bc..5d20a75 100644 --- a/FlippR-Driver/src/input/EventNotifier.h +++ b/FlippR-Driver/src/input/EventNotifier.h @@ -36,7 +36,7 @@ public: void register_event_handler(IEventHandler* handler); void unregister_event_handler(IEventHandler* handler); - void distribute_event(std::shared_ptr event); + void distribute_event(Event &event); private: void notify(); diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h index 2b3fa7a..4353275 100644 --- a/FlippR-Driver/src/input/IEventNotifier.h +++ b/FlippR-Driver/src/input/IEventNotifier.h @@ -25,7 +25,7 @@ public: virtual void register_event_handler(IEventHandler* handler) = 0; virtual void unregister_event_handler(IEventHandler* handler) = 0; - virtual void distribute_event(std::shared_ptr event) = 0; + virtual void distribute_event(Event &event) = 0; }; } diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp index 508c66f..ac22069 100644 --- a/FlippR-Driver/tests/input/TestEventNotifier.cpp +++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp @@ -98,7 +98,6 @@ SCENARIO("An event should be distributed", "[distribute]") GIVEN("An event") { Event event(0, 0, "test"); - auto event_ptr = std::make_shared(event); Mock> queue_mock; Fake(Method(queue_mock, push)); @@ -109,7 +108,7 @@ SCENARIO("An event should be distributed", "[distribute]") WHEN("The event comes in") { - notifier.distribute_event(event_ptr); + notifier.distribute_event(event); THEN("The event gets queued") { notifier.is_running = false;