From dee24023415f8091b71d87e80f2fa42ff98629e3 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 9 Jan 2019 20:06:41 -0500
Subject: [PATCH] The Big Refactoring of 2019: scheduler should not be global
 #655

---
 unit_tests/global_execution_queue.cpp   | 4 ----
 unit_tests/global_execution_queue.h     | 3 +++
 unit_tests/tests/test_pwm_generator.cpp | 3 ---
 unit_tests/tests/test_speed_density.cpp | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/unit_tests/global_execution_queue.cpp b/unit_tests/global_execution_queue.cpp
index 0f7913259b..e90fc56aa4 100644
--- a/unit_tests/global_execution_queue.cpp
+++ b/unit_tests/global_execution_queue.cpp
@@ -6,12 +6,8 @@
  */
 
 #include "signal_executor.h"
-#include "event_queue.h"
 #include "global_execution_queue.h"
 
-// this global instance is used by integration tests via 'scheduleByTimestamp' global methods below
-static EventQueue schedulingQueue;
-
 bool_t debugSignalExecutor = false;
 
 TestExecutor::TestExecutor() {
diff --git a/unit_tests/global_execution_queue.h b/unit_tests/global_execution_queue.h
index 3fb6ad6a2b..e4a6e9c6ab 100644
--- a/unit_tests/global_execution_queue.h
+++ b/unit_tests/global_execution_queue.h
@@ -9,6 +9,7 @@
 #define GLOBAL_EXECUTION_QUEUE_H_
 
 #include "scheduler.h"
+#include "event_queue.h"
 
 class TestExecutor : public ExecutorInterface {
 public:
@@ -19,6 +20,8 @@ public:
 	int executeAll(efitime_t now);
 	int size();
 	scheduling_s* getForUnitTest(int index);
+private:
+	EventQueue schedulingQueue;
 };
 
 #endif /* GLOBAL_EXECUTION_QUEUE_H_ */
diff --git a/unit_tests/tests/test_pwm_generator.cpp b/unit_tests/tests/test_pwm_generator.cpp
index d91ad18c8c..8c775bf1a1 100644
--- a/unit_tests/tests/test_pwm_generator.cpp
+++ b/unit_tests/tests/test_pwm_generator.cpp
@@ -46,7 +46,6 @@ static void test100dutyCycle() {
 	TestExecutor executor;
 	SimplePwm pwm("test PWM1");
 	OutputPin pin;
-	executor.clear();
 
 	startSimplePwm(&pwm, "unit_test",
 			&executor,
@@ -74,7 +73,6 @@ static void testSwitchToNanPeriod() {
 	TestExecutor executor;
 	SimplePwm pwm("test PWM1");
 	OutputPin pin;
-	executor.clear();
 
 	startSimplePwm(&pwm, "unit_test",
 			&executor,
@@ -113,7 +111,6 @@ void testPwmGenerator() {
 	TestExecutor executor;
 	SimplePwm pwm("test PWM3");
 	OutputPin pin;
-	executor.clear();
 
 	startSimplePwm(&pwm,
 			"unit_test",
diff --git a/unit_tests/tests/test_speed_density.cpp b/unit_tests/tests/test_speed_density.cpp
index 15ad461fde..3867fd42a8 100644
--- a/unit_tests/tests/test_speed_density.cpp
+++ b/unit_tests/tests/test_speed_density.cpp
@@ -14,7 +14,6 @@ void testSpeedDensity(void) {
 	printf("*************************************************** testSpeedDensity\r\n");
 	EngineTestHelper eth(FORD_INLINE_6_1995);
 	EXPAND_EngineTestHelper;
-	engine->executor.clear(); // todo: there must be a better place for this
 
 	engineConfiguration->trigger.customTotalToothCount = 8;
 	eth.applyTriggerShape();