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

@@ -12,10 +12,10 @@
// testing purposes
#define private public
#include "input/InputDriver.h"
#include "input/detail/InputDriver.h"
#include "input/IEventNotifier.h"
#include "input/IDetector.h"
#include "input/EventNotifier.h"
#include "input/Detector.h"
using namespace fakeit;
@@ -29,19 +29,17 @@ SCENARIO("An InputDriver gets created", "[construction}")
{
LoggerFactory::CreateInputTestLogger();
Mock<IDetector> detector_mock;
Mock<Detector> detector_mock;
Fake(Dtor(detector_mock));
Mock<IEventNotifier> event_notifier_mock;
Mock<EventNotifier> event_notifier_mock;
Fake(Dtor(event_notifier_mock));
Mock<IEventHandler> event_handler_mock;
Fake(Dtor(event_handler_mock));
WHEN("The InputDriver gets created")
{
std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
std::map<std::string, std::shared_ptr<Event>> events;
InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
THEN("It saves the EventNotifier and the Detector")
{
@@ -58,23 +56,23 @@ SCENARIO("An EventHandler [un]registers at the driver", "[un-register]")
{
LoggerFactory::CreateInputTestLogger();
Mock<flippR_driver::input::IDetector> detector_mock;
Mock<flippR_driver::input::Detector> detector_mock;
Fake(Dtor(detector_mock));
Mock<IEventHandler> event_handler_mock;
Mock<input::EventHandler> event_handler_mock;
Fake(Method(event_handler_mock, handle));
Fake(Dtor(event_handler_mock));
Mock<flippR_driver::input::IEventNotifier> event_notifier_mock;
Mock<flippR_driver::input::EventNotifier> event_notifier_mock;
Fake(Method(event_notifier_mock, register_event_handler));
Fake(Method(event_notifier_mock, unregister_event_handler));
Fake(Dtor(event_notifier_mock));
std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
std::map<std::string, std::shared_ptr<Event>> events;
InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
WHEN("The EventHandler registers at the driver")
{
@@ -105,16 +103,16 @@ SCENARIO("An Input Driver is created normally", "")
{
LoggerFactory::CreateInputTestLogger();
Mock<flippR_driver::input::IDetector> detector_mock;
Mock<flippR_driver::input::Detector> detector_mock;
Fake(Dtor(detector_mock));
Mock<IEventHandler> event_handler_mock;
Mock<input::EventHandler> event_handler_mock;
Fake(Dtor(event_handler_mock));
Mock<flippR_driver::input::IEventNotifier> event_notifier_mock;
Mock<flippR_driver::input::EventNotifier> event_notifier_mock;
Fake(Dtor(event_notifier_mock));
std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
Event event1('a', 2, "e1");
auto event1_ptr = std::make_shared<Event>(event1 );
@@ -129,7 +127,7 @@ SCENARIO("An Input Driver is created normally", "")
events.emplace("e4", std::make_shared<Event>(event4));
InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
WHEN("Someone asks for an event that is registered")
{
@@ -147,7 +145,7 @@ SCENARIO("An Input Driver is created normally", "")
THEN("the obtained event should be null")
{
REQUIRE(event->name == "ERROR");
REQUIRE(event->get()->name == "ERROR");
}
}
}