From fdcce9558ec3e55a32fc4d6831e670b1d87c6541 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 8 Nov 2021 12:27:02 -0500 Subject: [PATCH] WITH_ENGINE_TEST_HELPER_BOARD_CALLBACK --- unit_tests/global.h | 4 ++++ unit_tests/tests/test_etb.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/unit_tests/global.h b/unit_tests/global.h index 1fb898a011..af439b2b19 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -77,6 +77,10 @@ void chDbgAssert(int c, char *msg, void *arg); EngineTestHelper eth(x, std::unordered_map{}); \ EXPAND_EngineTestHelper; +#define WITH_ENGINE_TEST_HELPER_BOARD_CALLBACK(x, callback) \ + EngineTestHelper eth(x, callback, std::unordered_map{}); \ + EXPAND_EngineTestHelper; + #define CONFIG_PARAM(x) (x) #ifdef __cplusplus diff --git a/unit_tests/tests/test_etb.cpp b/unit_tests/tests/test_etb.cpp index 2b6140fd9d..dc58e05473 100644 --- a/unit_tests/tests/test_etb.cpp +++ b/unit_tests/tests/test_etb.cpp @@ -137,15 +137,15 @@ TEST(etb, initializationDualThrottle) { TEST(etb, initializationWastegate) { StrictMock mocks[ETB_COUNT]; - WITH_ENGINE_TEST_HELPER(TEST_ENGINE); + WITH_ENGINE_TEST_HELPER_BOARD_CALLBACK(TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + engineConfiguration->etbFunctions[0] = ETB_Wastegate; + engineConfiguration->etbFunctions[1] = ETB_None; + }); for (int i = 0; i < ETB_COUNT; i++) { engine->etbControllers[i] = &mocks[i]; } - engineConfiguration->etbFunctions[0] = ETB_Wastegate; - engineConfiguration->etbFunctions[1] = ETB_None; - // Expect mock0 to be init as throttle 1, and PID wastegate params EXPECT_CALL(mocks[0], init(ETB_Wastegate, _, &engineConfiguration->etbWastegatePid, Ne(nullptr), false)).WillOnce(Return(true));