fixed some bug

FlippR-Driver/.settings/language.settings.xml

@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-	<configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default">
+    	
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+    <configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+        		
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+            			
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525411911894964134" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
+            			
-				<language-scope id="org.eclipse.cdt.core.g++"/>
+            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			</provider>
+            			
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-		</extension>
+            			
-	</configuration>
+            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="709603775115835139" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+                				
+                <language-scope id="org.eclipse.cdt.core.gcc"/>
+                				
+                <language-scope id="org.eclipse.cdt.core.g++"/>
+                			
+            </provider>
+            			
+            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+            		
+        </extension>
+        	
+    </configuration>
+    
 </project>

FlippR-Driver/src/input/EventNotifier.cpp

@@ -26,6 +26,8 @@ EventNotifier::~EventNotifier()
 {
   is_running = false;
 
+  event_queue.release();
+
   notify_thread.join();
 }
 

FlippR-Driver/src/utilities/BlockingQueue.hpp

@@ -38,6 +38,11 @@ public:
     this->p_queue.pop();
     return rc;
   }
+
+  void release()
+  {
+    this->d_condition.notify_one();
+  }
 };
 
 

FlippR-Driver/tests/input/TestEventNotifier.cpp

@@ -9,6 +9,111 @@
 #include "../catch.hpp"
 #include "../fakeit.hpp"
 #include "../../src/utilities/LoggerFactory.hpp"
+#include "../../src/utilities/IEventHandler.h"
+
 
 // testing purposes
 #define private public
+
+#include "../../src/input/EventNotifier.h"
+
+using namespace Input;
+using namespace fakeit;
+
+SCENARIO("An EventNotifier gets created", "[construction]")
+{
+  LoggerFactory::CreateInputLogger();
+
+  WHEN("The EventNotifier gets created")
+  {
+    EventNotifier notifier;
+    THEN("It sets the running variable to true")
+    {
+      REQUIRE(notifier.is_running);
+    }
+    THEN("It creates a notify thread")
+    {
+      //REQUIRE(typeid(notifier.notify_thread).hash_code() == typeid(std::thread).hash_code());
+    }
+  }
+}
+
+SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register notifier]")
+{
+  GIVEN("An EventHandler")
+  {
+    LoggerFactory::CreateInputLogger();
+
+    Mock<IEventHandler> event_handler_mock;
+    Fake(Method(event_handler_mock, handle));
+    Fake(Dtor(event_handler_mock));
+
+    EventNotifier notifier;
+
+    WHEN("The EventHandler gets registered at the eventNotifier")
+    {
+      notifier.register_event_handler(&event_handler_mock.get());
+
+      THEN("The EventHandler gets saved")
+      {
+        REQUIRE(*(notifier.event_handler.find(&event_handler_mock.get())) == &event_handler_mock.get());
+      }
+    }
+
+    WHEN("The EventHandler gets unregistered at the driver")
+    {
+      REQUIRE(!notifier.event_handler.empty());
+
+      notifier.unregister_event_handler(&event_handler_mock.get());
+
+      THEN("The unregister_event_handler at the event_notifier gets called")
+      {
+        REQUIRE(notifier.event_handler.empty());
+      }
+    }
+  }
+}
+
+SCENARIO("An event should be distributed", "[distribute]")
+{
+  GIVEN("An event")
+  {
+    Event event(0, 0, "test");
+
+    EventNotifier notifier;
+    WHEN("The event comes in")
+    {
+      notifier.distribute_event(event);
+      THEN("The event gets queued")
+      {
+        REQUIRE(!notifier.event_queue.p_queue.empty());
+      }
+    }
+  }
+}
+
+SCENARIO("The EventHandler gets notified")
+{
+  GIVEN("An Event and an EventHandler")
+  {
+    Event event(0, 0, "test");
+
+    Mock<IEventHandler> event_handler_mock;
+    Fake(Method(event_handler_mock, handle));
+    Fake(Dtor(event_handler_mock));
+
+    EventNotifier notifier;
+
+
+    WHEN("The event gets queued")
+    {
+      notifier.event_queue.push(event);
+
+      std::this_thread::sleep_for(std::chrono::milliseconds(50));
+      THEN("The EventHandler gets called")
+      {
+        REQUIRE((bool) Verify(Method(event_handler_mock, handle)));
+      }
+    }
+  }
+}