🔀 Merge branch 'yann/feature/fix/ble/eventqueue-called-only-once' int…

…o develop
leka · Feb 11, 2022 · c2d810a · c2d810a
2 parents dfca888 + 12e0490
commit c2d810a
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/drivers/CoreEventQueue/include/CoreEventQueue.h b/drivers/CoreEventQueue/include/CoreEventQueue.h
@@ -21,6 +21,8 @@ class CoreEventQueue : public interface::EventQueue
 
 	void call(std::function<void()> const &f) final;
 
+	void callMbedCallback(mbed::Callback<void()> const &f);
+
   private:
 	rtos::Thread _event_queue_thread {};
 	events::EventQueue _event_queue {};

diff --git a/drivers/CoreEventQueue/source/CoreEventQueue.cpp b/drivers/CoreEventQueue/source/CoreEventQueue.cpp
@@ -11,3 +11,8 @@ void CoreEventQueue::call(std::function<void()> const &f)
 {
 	_event_queue.call(f);
 }
+
+void CoreEventQueue::callMbedCallback(mbed::Callback<void()> const &f)
+{
+	_event_queue.call(f);
+}
diff --git a/libs/BLEKit/include/BLEKit.h b/libs/BLEKit/include/BLEKit.h
@@ -26,7 +26,7 @@ class BLEKit
 	CoreEventQueue _event_queue {};
 
 	BLE &_ble = BLE::Instance();
-	CoreGap _core_gap {_event_queue, _ble.gap()};
+	CoreGap _core_gap {_ble.gap()};
 };
 
 }	// namespace leka

diff --git a/libs/BLEKit/include/CoreGap.h b/libs/BLEKit/include/CoreGap.h
@@ -11,14 +11,13 @@
 #include "ble/Gap.h"
 
 #include "CoreGapEventHandler.h"
-#include "interface/drivers/EventQueue.h"
 
 namespace leka {
 
 class CoreGap
 {
   public:
-	explicit CoreGap(interface::EventQueue &event_queue, ble::Gap &gap) : _gap_event_handler(event_queue), _gap(gap) {};
+	explicit CoreGap(ble::Gap &gap) : _gap(gap) {};
 
 	void setDefaultAdvertising();
 

diff --git a/libs/BLEKit/include/CoreGapEventHandler.h b/libs/BLEKit/include/CoreGapEventHandler.h
@@ -8,14 +8,12 @@
 #include "ble/BLE.h"
 #include "ble/Gap.h"
 
-#include "interface/drivers/EventQueue.h"
-
 namespace leka {
 
 class CoreGapEventHandler : public ble::Gap::EventHandler
 {
   public:
-	explicit CoreGapEventHandler(interface::EventQueue &event_queue) : _event_queue(event_queue) {};
+	explicit CoreGapEventHandler() = default;
 
 	void registerStartAdvertising(std::function<void()> const &function);
 
@@ -26,7 +24,6 @@ class CoreGapEventHandler : public ble::Gap::EventHandler
 	void onAdvertisingEnd(ble::AdvertisingEndEvent const &event) override;
 
   private:
-	interface::EventQueue &_event_queue;
 	std::function<void()> _start_advertising {};
 };
 

diff --git a/libs/BLEKit/source/BLEKit.cpp b/libs/BLEKit/source/BLEKit.cpp
@@ -22,5 +22,5 @@ void BLEKit::init()
 
 void BLEKit::processEvents(BLE::OnEventsToProcessCallbackContext *context)
 {
-	_event_queue.call(mbed::callback(&context->ble, &BLE::processEvents));
+	_event_queue.callMbedCallback(mbed::callback(&context->ble, &BLE::processEvents));
 }
diff --git a/libs/BLEKit/source/CoreGapEventHandler.cpp b/libs/BLEKit/source/CoreGapEventHandler.cpp
@@ -14,22 +14,22 @@ void CoreGapEventHandler::onInitializationComplete(BLE::InitializationCompleteCa
 		return;
 	}
 
-	_event_queue.call(_start_advertising);
+	_start_advertising();
 }
 
 void CoreGapEventHandler::onConnectionComplete(ConnectionCompleteEvent const &event)
 {
 	if (event.getStatus() != BLE_ERROR_NONE) {
-		_event_queue.call(_start_advertising);
+		_start_advertising();
 	}
 }
 
 void CoreGapEventHandler::onDisconnectionComplete(DisconnectionCompleteEvent const &event)
 {
-	_event_queue.call(_start_advertising);
+	_start_advertising();
 }
 
 void CoreGapEventHandler::onAdvertisingEnd(AdvertisingEndEvent const &event)
 {
-	_event_queue.call(_start_advertising);
+	_start_advertising();
 }
diff --git a/libs/BLEKit/tests/CoreGapEventHandler_test.cpp b/libs/BLEKit/tests/CoreGapEventHandler_test.cpp
@@ -8,7 +8,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "stubs/leka/CoreEventQueue.h"
 
 using namespace leka;
 using namespace ble;
@@ -25,8 +24,7 @@ class CoreGapEventHandlerTest : public testing::Test
 	void TearDown() override { ble::delete_mocks(); }
 
 	BLE &ble = BLE::Instance();
-	CoreEventQueue core_event_queue {};
-	CoreGapEventHandler core_gap_event_handler {core_event_queue};
+	CoreGapEventHandler core_gap_event_handler {};
 
 	MockFunction<void()> mock_start_advertising_func;
 };

diff --git a/libs/BLEKit/tests/CoreGap_test.cpp b/libs/BLEKit/tests/CoreGap_test.cpp
@@ -8,7 +8,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "stubs/leka/CoreEventQueue.h"
 #include "stubs/mbed/BLE.h"
 
 using namespace leka;
@@ -31,8 +30,7 @@ class CoreGapTest : public testing::Test
 
 	BLE &ble		  = BLE::Instance();
 	GapMock &mock_gap = gap_mock();
-	CoreEventQueue eq {};
-	CoreGap coregap {eq, ble.gap()};
+	CoreGap coregap {ble.gap()};
 
 	void expectStartAdvertisingCall(bool expected)
 	{

diff --git a/tests/unit/stubs/stubs/leka/source/CoreEventQueue.cpp b/tests/unit/stubs/stubs/leka/source/CoreEventQueue.cpp
@@ -9,7 +9,13 @@ void CoreEventQueue::dispatch_forever()
 	// do nothing
 }
 
-void CoreEventQueue::call(const std::function<void()> &f)
+void CoreEventQueue::call(std::function<void()> const &f)
+{
+	f();
+	spy_CoreEventQueue_did_call_function = true;
+}
+
+void CoreEventQueue::callMbedCallback(mbed::Callback<void()> const &f)
 {
 	f();
 	spy_CoreEventQueue_did_call_function = true;