made some stuff working 😠 @Jonas

This commit is contained in:
Johannes Wendel
2019-04-25 00:46:44 +02:00
parent 218cb65dd4
commit 878b5f52ce
32 changed files with 781 additions and 731 deletions

View File

@@ -9,17 +9,17 @@
#include "catch.hpp"
#include "fakeit.hpp"
#include "utility/LoggerFactory.h"
#include "input/IEventHandler.h"
#include "utility/IBlockingQueue.h"
// testing purposes
#define private public
#include "utility/LoggerFactory.h"
#include "input/EventHandler.h"
#include "utility/IBlockingQueue.h"
#include "input/detail/EventNotifier.h"
#include "input/EventNotifier.h"
using namespace flippR_driver;
using namespace input;
using namespace fakeit;
@@ -38,7 +38,7 @@ SCENARIO("An EventNotifier gets created", "[construction]")
When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock));
EventNotifier notifier(&(queue_mock.get()));
input::detail::EventNotifier notifier(&(queue_mock.get()));
THEN("It sets the running variable to true")
{
REQUIRE(notifier.is_running);
@@ -63,11 +63,11 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no
When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock));
Mock<IEventHandler> event_handler_mock;
Mock<input::EventHandler> event_handler_mock;
Fake(Method(event_handler_mock, handle));
Fake(Dtor(event_handler_mock));
EventNotifier notifier(&(queue_mock.get()));
input::detail::EventNotifier notifier(&(queue_mock.get()));
WHEN("The EventHandler gets registered at the eventNotifier")
{
@@ -105,7 +105,7 @@ SCENARIO("An event should be distributed", "[distribute]")
When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock));
EventNotifier notifier(&(queue_mock.get()));
input::detail::EventNotifier notifier(&(queue_mock.get()));
WHEN("The event comes in")
{
@@ -126,7 +126,7 @@ SCENARIO("The EventHandler gets notified")
{
Event event(0, 0, "test");
Mock<IEventHandler> event_handler_mock;
Mock<input::EventHandler> event_handler_mock;
When(Method(event_handler_mock, handle)).AlwaysReturn();
Fake(Dtor(event_handler_mock));
@@ -137,7 +137,7 @@ SCENARIO("The EventHandler gets notified")
When(Method(queue_mock, pop)).AlwaysDo([test_event](void){return test_event;});
Fake(Dtor(queue_mock));
EventNotifier notifier(&(queue_mock.get()));
input::detail::EventNotifier notifier(&(queue_mock.get()));
notifier.event_handlers.insert(&(event_handler_mock.get()));