From 0380d4d7094a93096522762399581f4a4e82c566 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 7 Oct 2019 21:54:03 -0400 Subject: [PATCH] refactoring --- unit_tests/engine_test_helper.cpp | 11 ++++++----- unit_tests/engine_test_helper.h | 4 ++-- unit_tests/tests/test_fasterEngineSpinningUp.cpp | 12 ++++++------ unit_tests/tests/test_issue_898.cpp | 4 ++-- .../tests/test_startOfCrankingPrimingPulse.cpp | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 99c15608be..008621e4c8 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -153,15 +153,16 @@ void EngineTestHelper::fireTriggerEvents(int count) { void EngineTestHelper::assertInjectorUpEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex) { InjectionSignalPair *pair = &engine.fuelActuators[injectorIndex]; - assertEvent(&engine.executor, msg, eventIndex, (void*)seTurnPinHigh, getTimeNowUs(), momentX, (long)pair); + assertEvent(msg, eventIndex, (void*)seTurnPinHigh, getTimeNowUs(), momentX, (long)pair); } void EngineTestHelper::assertInjectorDownEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex) { InjectionSignalPair *pair = &engine.fuelActuators[injectorIndex]; - assertEvent(&engine.executor, msg, eventIndex, (void*)seTurnPinLow, getTimeNowUs(), momentX, (long)pair); + assertEvent(msg, eventIndex, (void*)seTurnPinLow, getTimeNowUs(), momentX, (long)pair); } -scheduling_s * EngineTestHelper::assertEvent5(TestExecutor *executor, const char *msg, int index, void *callback, efitime_t start, efitime_t momentX) { +scheduling_s * EngineTestHelper::assertEvent5(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX) { + TestExecutor *executor = &engine.executor; EXPECT_TRUE(executor->size() > index) << msg; scheduling_s *event = executor->getForUnitTest(index); assertEqualsM4(msg, " up/down", (void*)event->callback == (void*) callback, 1); @@ -169,8 +170,8 @@ scheduling_s * EngineTestHelper::assertEvent5(TestExecutor *executor, const char return event; } -void EngineTestHelper::assertEvent(TestExecutor *executor, const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param) { - scheduling_s *event = assertEvent5(executor, msg, index, callback, start, momentX); +void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param) { + scheduling_s *event = assertEvent5(msg, index, callback, start, momentX); InjectionSignalPair *eventPair = (InjectionSignalPair *)event->param; diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h index 400c325237..36a93f88c7 100644 --- a/unit_tests/engine_test_helper.h +++ b/unit_tests/engine_test_helper.h @@ -46,8 +46,8 @@ public: void fireTriggerEvents2(int count, float delayMs); void clearQueue(); - scheduling_s * assertEvent5(TestExecutor *executor, const char *msg, int index, void *callback, efitime_t start, efitime_t momentX); - void assertEvent(TestExecutor *executor, const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param); + scheduling_s * assertEvent5(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX); + void assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param); void assertInjectorUpEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex); void assertInjectorDownEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex); // todo: open question if this is worth a helper method or should be inlined? diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/test_fasterEngineSpinningUp.cpp index ec071f9910..170dfb4608 100644 --- a/unit_tests/tests/test_fasterEngineSpinningUp.cpp +++ b/unit_tests/tests/test_fasterEngineSpinningUp.cpp @@ -53,8 +53,8 @@ TEST(cranking, testFasterEngineSpinningUp) { // test if ignition mode is temporary changed to wasted spark, if set to individual coils ASSERT_EQ(IM_WASTED_SPARK, getCurrentIgnitionMode(PASS_ENGINE_PARAMETER_SIGNATURE)); // check real events - eth.assertEvent5(&engine->executor, "inj start#1", 0, (void*)startSimultaniousInjection, timeStartUs, MS2US(200) + 98125); - eth.assertEvent5(&engine->executor, "inj end#1", 1, (void*)endSimultaniousInjection, timeStartUs, MS2US(200) + 100000); + eth.assertEvent5("inj start#1", 0, (void*)startSimultaniousInjection, timeStartUs, MS2US(200) + 98125); + eth.assertEvent5("inj end#1", 1, (void*)endSimultaniousInjection, timeStartUs, MS2US(200) + 100000); // skip the rest of the cycle eth.fireFall(200); @@ -75,8 +75,8 @@ TEST(cranking, testFasterEngineSpinningUp) { // two simultaneous injections ASSERT_EQ( 4, engine->executor.size()) << "plain#2"; // check real events - eth.assertEvent5(&engine->executor, "inj start#2", 0, (void*)startSimultaniousInjection, eth.getTimeNowUs(), 148125); - eth.assertEvent5(&engine->executor, "inj end#2", 1, (void*)endSimultaniousInjection, eth.getTimeNowUs(), 150000); + eth.assertEvent5("inj start#2", 0, (void*)startSimultaniousInjection, eth.getTimeNowUs(), 148125); + eth.assertEvent5("inj end#2", 1, (void*)endSimultaniousInjection, eth.getTimeNowUs(), 150000); // skip, clear & advance 1 more revolution at higher RPM eth.fireFall(60); @@ -96,8 +96,8 @@ TEST(cranking, testFasterEngineSpinningUp) { // check real events for sequential injection // Note: See addFuelEvents() fix inside setRpmValue()! - eth.assertEvent5(&engine->executor, "inj start#3", 0, (void*)seTurnPinHigh, timeStartUs, MS2US(60) + 28125); - eth.assertEvent5(&engine->executor, "inj end#3", 1, (void*)seTurnPinLow, timeStartUs, MS2US(60) + 28125 + 3000); + eth.assertEvent5("inj start#3", 0, (void*)seTurnPinHigh, timeStartUs, MS2US(60) + 28125); + eth.assertEvent5("inj end#3", 1, (void*)seTurnPinLow, timeStartUs, MS2US(60) + 28125 + 3000); } static void doTestFasterEngineSpinningUp60_2(int startUpDelayMs, int rpm1, int expectedRpm) { diff --git a/unit_tests/tests/test_issue_898.cpp b/unit_tests/tests/test_issue_898.cpp index fa23412712..165f9b7a51 100644 --- a/unit_tests/tests/test_issue_898.cpp +++ b/unit_tests/tests/test_issue_898.cpp @@ -1,7 +1,7 @@ /* - * test_issue_898.cpp + * @file test_issue_898.cpp * - * Created on: Aug 8, 2019 + * @date Aug 8, 2019 * @author Andrey Belomutskiy, (c) 2012-2019 */ diff --git a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp index 6627696b50..dd13f92cf4 100644 --- a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp +++ b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp @@ -25,8 +25,8 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { // two simultaneous injections ASSERT_EQ( 4, engine->executor.size()) << "plain#2"; - eth.assertEvent5(&engine->executor, "sim start", 0, (void*)startSimultaniousInjection, eth.getTimeNowUs(), 100000 - 1875); - eth.assertEvent5(&engine->executor, "sim end", 1, (void*)endSimultaniousInjection, eth.getTimeNowUs(), 100000); + eth.assertEvent5("sim start", 0, (void*)startSimultaniousInjection, eth.getTimeNowUs(), 100000 - 1875); + eth.assertEvent5("sim end", 1, (void*)endSimultaniousInjection, eth.getTimeNowUs(), 100000); }