🔀 Merge branch 'yann/tests/eventqueue/fix-call' into develop

leka · Mar 25, 2022 · 8fcb23f · 8fcb23f
2 parents e5a258d + 0b7e378
commit 8fcb23f
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 10 deletions.
diff --git a/libs/BatteryKit/source/BatteryKit.cpp b/libs/BatteryKit/source/BatteryKit.cpp
@@ -9,6 +9,8 @@ using namespace std::chrono_literals;
 
 void BatteryKit::startEventHandler()
 {
+	_event_queue.dispatch_forever();
+
 	auto on_tick = [this] {
 		if (_on_low_battery && level() <= 5) {
 			_on_low_battery();
@@ -19,10 +21,7 @@ void BatteryKit::startEventHandler()
 		}
 	};
 
-	on_tick();	 // TODO (@john_doe): only for unit tests. Due to event_queue that does not make the call
 	_event_queue.call_every(1s, on_tick);
-
-	_event_queue.dispatch_forever();
 }
 
 auto BatteryKit::level() -> uint8_t

diff --git a/libs/BatteryKit/tests/BatteryKit_test.cpp b/libs/BatteryKit/tests/BatteryKit_test.cpp
@@ -7,6 +7,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "mocks/leka/Battery.h"
+#include "mocks/leka/EventQueue.h"
 
 using namespace leka;
 
@@ -21,6 +22,8 @@ class BatteryKitTest : public ::testing::Test
 	// void SetUp() override {}
 	// void TearDown() override {}
 
+	mock::EventQueue event_queue {};
+
 	mock::Battery mock_battery;
 	BatteryKit batterykit;
 };

diff --git a/libs/RobotKit/tests/RobotController_test.cpp b/libs/RobotKit/tests/RobotController_test.cpp
@@ -14,6 +14,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "mocks/leka/Battery.h"
+#include "mocks/leka/EventQueue.h"
 #include "mocks/leka/FirmwareUpdate.h"
 #include "mocks/leka/LEDAnimation.h"
 #include "mocks/leka/MCU.h"
@@ -75,6 +76,8 @@ class RobotControllerTest : public testing::Test
 	}
 	void TearDown() override { ble::delete_mocks(); }
 
+	mock::EventQueue event_queue {};
+
 	mock::Timeout sleep_timeout {};
 	mock::Battery battery {};
 

diff --git a/tests/unit/headers/CMakeLists.txt b/tests/unit/headers/CMakeLists.txt
@@ -14,9 +14,6 @@ target_include_directories(mbed-os
 
 		${EXTERN_MBED_OS_DIR}
 
-		${EXTERN_MBED_OS_DIR}/events/tests/UNITTESTS/doubles
-		${EXTERN_MBED_OS_DIR}/events/tests/UNITTESTS/doubles/equeue
-
 		${EXTERN_MBED_OS_DIR}/cmsis/tests/UNITTESTS/doubles
 
 		${EXTERN_MBED_OS_DIR}/connectivity/tests/UNITTESTS/doubles
@@ -60,7 +57,6 @@ target_include_directories(mbed-os
 
 		${EXTERN_MBED_OS_DIR}/events
 		${EXTERN_MBED_OS_DIR}/events/include
-		${EXTERN_MBED_OS_DIR}/events/include/events
 
 		${EXTERN_MBED_OS_DIR}/hal
 		${EXTERN_MBED_OS_DIR}/hal/include

diff --git a/tests/unit/mocks/mocks/leka/EventQueue.h b/tests/unit/mocks/mocks/leka/EventQueue.h
@@ -0,0 +1,35 @@
+// Leka - LekaOS
+// Copyright 2022 APF France handicap
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "equeue_stub.h"
+#include "gmock/gmock.h"
+#include "stubs/leka/CoreEventQueue.h"
+#include "stubs/mbed/EventQueue_extension.h"
+
+namespace leka::mock {
+
+class EventQueue
+{
+  public:
+	EventQueue()
+	{
+		equeue_stub.void_ptr = &ptr;
+
+		spy_CoreEventQueue_on_dispatch_forever_call = [] { equeue_stub.call_cb_immediately = true; };
+		spy_EventQueue_on_dispatch_forever_call		= [] { equeue_stub.call_cb_immediately = true; };
+	}
+
+	~EventQueue()
+	{
+		equeue_stub.void_ptr			= nullptr;
+		equeue_stub.call_cb_immediately = false;
+	}
+
+  private:
+	struct equeue_event ptr;
+};
+
+}	// namespace leka::mock
diff --git a/tests/unit/stubs/CMakeLists.txt b/tests/unit/stubs/CMakeLists.txt
@@ -35,13 +35,13 @@ target_sources(stubs
 
 		${UNIT_TESTS_STUBS_LEKA_DIR}/source/CoreEventQueue.cpp
 
-		${EXTERN_MBED_OS_DIR}/events/tests/UNITTESTS/doubles/equeue_stub.c
 		${EXTERN_MBED_OS_DIR}/rtos/tests/UNITTESTS/doubles/mbed_rtos_rtx_stub.c
 		${EXTERN_MBED_OS_DIR}/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp
 		${EXTERN_MBED_OS_DIR}/rtos/tests/UNITTESTS/doubles/rtx_mutex_stub.c
 		${EXTERN_MBED_OS_DIR}/rtos/tests/UNITTESTS/doubles/ThisThread_stub.cpp
 		${EXTERN_MBED_OS_DIR}/rtos/tests/UNITTESTS/doubles/Thread_stub.cpp
 		${EXTERN_MBED_OS_DIR}/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp
+		${EXTERN_MBED_OS_DIR}/events/tests/UNITTESTS/doubles/equeue_stub.c
 		${EXTERN_MBED_OS_DIR}/events/tests/UNITTESTS/doubles/EventQueue_stub.cpp
 		${EXTERN_MBED_OS_DIR}/drivers/tests/UNITTESTS/doubles/SerialBase_stub.cpp
 		${EXTERN_MBED_OS_DIR}/platform/tests/UNITTESTS/doubles/FileHandle_stub.cpp

diff --git a/tests/unit/stubs/stubs/leka/CoreEventQueue.h b/tests/unit/stubs/stubs/leka/CoreEventQueue.h
@@ -8,4 +8,6 @@ namespace leka {
 
 extern bool spy_CoreEventQueue_did_call_function;
 
+extern std::function<void()> spy_CoreEventQueue_on_dispatch_forever_call;
+
 }	// namespace leka
diff --git a/tests/unit/stubs/stubs/leka/source/CoreEventQueue.cpp b/tests/unit/stubs/stubs/leka/source/CoreEventQueue.cpp
@@ -3,10 +3,13 @@
 namespace leka {
 
 bool spy_CoreEventQueue_did_call_function = false;
+std::function<void()> spy_CoreEventQueue_on_dispatch_forever_call;
 
 void CoreEventQueue::dispatch_forever()
 {
-	// do nothing
+	if (spy_CoreEventQueue_on_dispatch_forever_call) {
+		spy_CoreEventQueue_on_dispatch_forever_call();
+	}
 }
 
 void CoreEventQueue::callMbedCallback(mbed::Callback<void()> const &f)

diff --git a/tests/unit/stubs/stubs/mbed/EventQueue_extension.h b/tests/unit/stubs/stubs/mbed/EventQueue_extension.h
@@ -0,0 +1,11 @@
+// Leka - LekaOS
+// Copyright 2021 APF France handicap
+// SPDX-License-Identifier: Apache-2.0
+
+#include <functional>
+
+namespace leka {
+
+extern std::function<void()> spy_EventQueue_on_dispatch_forever_call;
+
+}	// namespace leka
diff --git a/tests/unit/stubs/stubs/mbed/source/EventQueue_extension.cpp b/tests/unit/stubs/stubs/mbed/source/EventQueue_extension.cpp
@@ -2,9 +2,15 @@
 // Copyright 2021 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+#include "../EventQueue_extension.h"
+
 #include "events/EventQueue.h"
 
+std::function<void()> leka::spy_EventQueue_on_dispatch_forever_call;
+
 void events::EventQueue::dispatch_forever()
 {
-	// nothing to do
+	if (leka::spy_EventQueue_on_dispatch_forever_call) {
+		leka::spy_EventQueue_on_dispatch_forever_call();
+	}
 }