rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TestEventNotifier is working now

Browse Source
This commit is contained in:
Neeflix
2018-07-11 22:17:49 +02:00
parent 8b9ec68662
commit 9e3231f037
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FlippR-Driver/src/input/EventNotifier.cpp
View File

@@ -14,13 +14,12 @@
namespace Input namespace Input
{ {
EventNotifier::EventNotifier() : EventNotifier::EventNotifier(IBlockingQueue<Event>* queue) :
is_running(true) is_running(true),
event_queue(queue)
{ {
this->notify_thread = std::thread(&EventNotifier::notify, this); this->notify_thread = std::thread(&EventNotifier::notify, this);
this->event_queue = new BlockingQueue<Event>();
CLOG(INFO, INPUT_LOGGER) << "Created EventNotifier and started thread"; CLOG(INFO, INPUT_LOGGER) << "Created EventNotifier and started thread";
} }

2
FlippR-Driver/src/input/EventNotifier.h
View File

@@ -28,7 +28,7 @@ class EventNotifier : public IEventNotifier
{ {
public: public:
EventNotifier(); EventNotifier(IBlockingQueue<Event>* queue);
~EventNotifier(); ~EventNotifier();
void register_event_handler(IEventHandler* handler); void register_event_handler(IEventHandler* handler);

4
FlippR-Driver/src/input/InputDriverFactory.cpp
View File

@@ -22,7 +22,9 @@ std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::istream& i
{ {
ConfigureLogger(); ConfigureLogger();
std::shared_ptr<IEventNotifier> event_notifier = std::make_shared<EventNotifier>(); IBlockingQueue<Event>* event_queue = new BlockingQueue<Event>;
std::shared_ptr<IEventNotifier> event_notifier = std::make_shared<EventNotifier>(event_queue);
std::unique_ptr<IInputGPIOInterface> input_gpio_interface = std::make_unique<InputGPIOInterface>(input_config_stream); std::unique_ptr<IInputGPIOInterface> input_gpio_interface = std::make_unique<InputGPIOInterface>(input_config_stream);

35
FlippR-Driver/tests/input/TestEventNotifier.cpp
View File

@@ -29,7 +29,14 @@ SCENARIO("An EventNotifier gets created", "[construction]")
WHEN("The EventNotifier gets created") WHEN("The EventNotifier gets created")
{ {
EventNotifier notifier; Event event(0, 0, "test");
Mock<IBlockingQueue<Event>> queue_mock;
Fake(Method(queue_mock, push));
When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock));
EventNotifier notifier(&(queue_mock.get()));
THEN("It sets the running variable to true") THEN("It sets the running variable to true")
{ {
REQUIRE(notifier.is_running); REQUIRE(notifier.is_running);
@@ -47,11 +54,18 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputLogger();
Event event(0, 0, "test");
Mock<IBlockingQueue<Event>> queue_mock;
Fake(Method(queue_mock, push));
When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock));
Mock<IEventHandler> event_handler_mock; Mock<IEventHandler> event_handler_mock;
Fake(Method(event_handler_mock, handle)); Fake(Method(event_handler_mock, handle));
Fake(Dtor(event_handler_mock)); Fake(Dtor(event_handler_mock));
EventNotifier notifier; EventNotifier notifier(&(queue_mock.get()));
WHEN("The EventHandler gets registered at the eventNotifier") WHEN("The EventHandler gets registered at the eventNotifier")
{ {
@@ -85,19 +99,19 @@ SCENARIO("An event should be distributed", "[distribute]")
Event event(0, 0, "test"); Event event(0, 0, "test");
Mock<IBlockingQueue<Event>> queue_mock; Mock<IBlockingQueue<Event>> queue_mock;
When(Method(queue_mock, push)).AlwaysReturn(); Fake(Method(queue_mock, push));
When(Method(queue_mock, pop)).AlwaysDo([](){return Event(0,0,"mock");}); When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
Fake(Dtor(queue_mock)); Fake(Dtor(queue_mock));
EventNotifier notifier; EventNotifier notifier(&(queue_mock.get()));
notifier.event_queue = &(queue_mock.get());
WHEN("The event comes in") WHEN("The event comes in")
{ {
notifier.distribute_event(event); notifier.distribute_event(event);
THEN("The event gets queued") THEN("The event gets queued")
{ {
notifier.is_running = false;
// REQUIRE((bool)Verify(Method(queue_mock, push)));
REQUIRE((bool)Verify(Method(queue_mock, push).Using(event))); REQUIRE((bool)Verify(Method(queue_mock, push).Using(event)));
} }
} }
@@ -111,17 +125,18 @@ SCENARIO("The EventHandler gets notified")
Event event(0, 0, "test"); Event event(0, 0, "test");
Mock<IEventHandler> event_handler_mock; Mock<IEventHandler> event_handler_mock;
When(Method(event_handler_mock, handle)).AlwaysDo([](Event e){std::cout << "called handle\n";}); When(Method(event_handler_mock, handle)).AlwaysReturn();
Fake(Dtor(event_handler_mock)); Fake(Dtor(event_handler_mock));
Event test_event(0, 0, "test"); Event test_event(0, 0, "test");
Mock<IBlockingQueue<Event>> queue_mock; Mock<IBlockingQueue<Event>> queue_mock;
Fake(Method(queue_mock, push));
When(Method(queue_mock, pop)).AlwaysDo([test_event](void){return test_event;}); When(Method(queue_mock, pop)).AlwaysDo([test_event](void){return test_event;});
Fake(Dtor(queue_mock)); Fake(Dtor(queue_mock));
EventNotifier notifier; EventNotifier notifier(&(queue_mock.get()));
notifier.event_queue = &(queue_mock.get());
notifier.event_handlers.insert(&(event_handler_mock.get())); notifier.event_handlers.insert(&(event_handler_mock.get()));
WHEN("The event gets queued") WHEN("The event gets queued")