From bce5b12738e83bf6232f207e66bc336c2f349721 Mon Sep 17 00:00:00 2001
From: Neeflix <johanneswendel9@gmail.com>
Date: Thu, 28 Jun 2018 19:03:17 +0200
Subject: [PATCH] finished Detector tests

---
 FlippR-Driver/src/input/Detector.cpp       | 9 +++++++--
 FlippR-Driver/src/input/Event.cpp          | 9 ++++++---
 FlippR-Driver/src/input/Event.h            | 7 ++++---
 FlippR-Driver/tests/input/TestDetector.cpp | 8 +++++---
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index 0283f10..6e0e8a8 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -12,14 +12,15 @@
 
 #include "../utilities/config.h"
 
-using namespace Input;
+namespace Input
+{
 
 Detector::Detector(IInputGPIOInterface* input_gpio_interface, std::map<char, Event> events, IEventNotifier* event_notifier) :
   input_gpio_interface(input_gpio_interface), events(events), is_running(true), event_notifier(event_notifier)
 {
   this->detect_thread = std::thread(&Detector::detect, this);
 
-  CLOG(WARNING, INPUT_LOGGER) << "Created Detector";
+  CLOG(INFO, INPUT_LOGGER) << "Created Detector";
 }
 
 Detector::~Detector()
@@ -68,3 +69,7 @@ bool Detector::check_inputs(char& address)
   }
   return false;
 }
+
+
+
+}
diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
index cb09173..2697c2c 100644
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -6,7 +6,8 @@
  */
 #include "Event.h"
 
-using namespace Input;
+namespace Input
+{
 
 Event::Event(char address, int priority, std::string name) :
   address(address), priority(priority), name(name)
@@ -14,7 +15,9 @@ Event::Event(char address, int priority, std::string name) :
   CLOG_IF(VLOG_IS_ON(HIGH_VERBOSITY), INFO, INPUT_LOGGER) << "Created event: " << name << ", address: " << address;
 }
 
-bool Event::operator==(const Event& other)
+bool operator==(const Event& left, const Event& right)
 {
-  return this->name == other.name;
+  return left.name == right.name;
+}
+
 }
diff --git a/FlippR-Driver/src/input/Event.h b/FlippR-Driver/src/input/Event.h
index 53f9e1b..ee370a4 100644
--- a/FlippR-Driver/src/input/Event.h
+++ b/FlippR-Driver/src/input/Event.h
@@ -20,7 +20,8 @@ class Event
 {
 public:
   Event(char address, int priority, std::string name);
-  bool operator==(const Event& other);
+
+  friend bool operator==(const Event& left, const Event& right);
   friend bool operator<(const Event& left, const Event& right)
   {
     return left.priority < right.priority;
@@ -32,10 +33,10 @@ private:
 public:
   int priority;
   std::string name;
-
-
 };
 
+bool operator==(const Event& left, const Event& right);
+
 }
 
 
diff --git a/FlippR-Driver/tests/input/TestDetector.cpp b/FlippR-Driver/tests/input/TestDetector.cpp
index 786f839..a4ff681 100644
--- a/FlippR-Driver/tests/input/TestDetector.cpp
+++ b/FlippR-Driver/tests/input/TestDetector.cpp
@@ -35,18 +35,20 @@ SCENARIO("Creating a Detector object", "")
     Mock<IInputGPIOInterface> gpio_interface_mock;
 
     Fake(Dtor(gpio_interface_mock));
-    When(Method(gpio_interface_mock, read_input_data).Using('2')).Return(true);
+    When(Method(gpio_interface_mock, read_input_data)).AlwaysDo([](char c){return c==2;});
 
     Fake(Dtor(event_notifier_mock));
     When(Method(event_notifier_mock, distribute_event)).AlwaysReturn();
 
     Event event1(1, '1', "event 1");
     Event event2(2, '2', "event 2");
+    Event event3(3, '3', "event 3");
 
     std::map<char, Event> events;
 
     events.insert(std::make_pair(1, event1));
     events.insert(std::make_pair(2, event2));
+    events.insert(std::make_pair(3, event3));
 
     WHEN("Detector is created")
     {
@@ -58,9 +60,9 @@ SCENARIO("Creating a Detector object", "")
 
       AND_WHEN("an event can be found at gpio interface")
       {
-	THEN("only the fitting event should be distributed the event notifier")
+	THEN("only the fitting event should be distributed by event notifier")
 	{
-//	  REQUIRE((bool)Verify(Method(event_notifier_mock, distribute_event).Using(event2)));
+	  REQUIRE((bool)Verify(Method(event_notifier_mock, distribute_event).Using(event2)));
 	}
       }
     }