From 19a8685644f49b91ccd5aeb9d3e2213c38782484 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 24 Dec 2021 16:51:31 -0500 Subject: [PATCH] refactoring --- unit_tests/global.h | 4 ++-- unit_tests/test_basic_math/test_interpolation_3d.cpp | 2 -- unit_tests/tests/ignition_injection/test_fuel_map.cpp | 6 +++--- unit_tests/tests/lua/test_lua_hooks.cpp | 1 - unit_tests/tests/sensor/test_vehicle_speed_converter.cpp | 1 - unit_tests/tests/trigger/test_cam_vvt_input.cpp | 2 +- unit_tests/tests/trigger/test_quad_cam.cpp | 8 ++++---- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/unit_tests/global.h b/unit_tests/global.h index fb9c104b5b..f760c19bd3 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -24,8 +24,8 @@ typedef uint32_t ioportmask_t; #define EXPECTED_REMAINING_STACK 1 #define getCurrentRemainingStack() (999999) -// this is needed by all DECLARE_ENGINE_PARAMETER_* usages -#include "engine_configuration_generated_structures.h" +#define EXPECT_NEAR_M3(x, y) EXPECT_NEAR((x), (y), 1e-3) +#define EXPECT_NEAR_M4(a, b) EXPECT_NEAR(a, b, 1e-4) #ifdef __cplusplus diff --git a/unit_tests/test_basic_math/test_interpolation_3d.cpp b/unit_tests/test_basic_math/test_interpolation_3d.cpp index 721da7e9ce..78ee6b0467 100644 --- a/unit_tests/test_basic_math/test_interpolation_3d.cpp +++ b/unit_tests/test_basic_math/test_interpolation_3d.cpp @@ -32,8 +32,6 @@ float map[4][5] = { { 4, 5, 300, 600, 600 }, }; -#define EXPECT_NEAR_M4(a, b) EXPECT_NEAR(a, b, 1e-4) - static float getValue(float rpm, float maf) { Map3D<5, 4, float, float, float> x1; x1.init(map, mafBins, rpmBins); diff --git a/unit_tests/tests/ignition_injection/test_fuel_map.cpp b/unit_tests/tests/ignition_injection/test_fuel_map.cpp index faf7968b8e..b77d78e2f2 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_map.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_map.cpp @@ -79,11 +79,11 @@ TEST(misc, testFuelMap) { Sensor::setMockValue(SensorType::Clt, 0); EXPECT_NEAR(7.7333, getCrankingFuel3(2, 4), EPS4D); Sensor::setMockValue(SensorType::Clt, 8); - EXPECT_NEAR(7, getCrankingFuel3(2, 15), EPS4D); + EXPECT_NEAR_M4(7, getCrankingFuel3(2, 15)); Sensor::setMockValue(SensorType::Clt, 70); - EXPECT_NEAR(8, getCrankingFuel3(2, 0), EPS4D); + EXPECT_NEAR_M4(8, getCrankingFuel3(2, 0)); Sensor::setMockValue(SensorType::Clt, 70); - EXPECT_NEAR(4, getCrankingFuel3(2, 50), EPS4D); + EXPECT_NEAR_M4(4, getCrankingFuel3(2, 50)); } diff --git a/unit_tests/tests/lua/test_lua_hooks.cpp b/unit_tests/tests/lua/test_lua_hooks.cpp index d5e9260af9..e18c2471c4 100644 --- a/unit_tests/tests/lua/test_lua_hooks.cpp +++ b/unit_tests/tests/lua/test_lua_hooks.cpp @@ -1,5 +1,4 @@ #include "pch.h" - #include "rusefi_lua.h" diff --git a/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp b/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp index a4251af732..46cd8e86a5 100644 --- a/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp +++ b/unit_tests/tests/sensor/test_vehicle_speed_converter.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include "vehicle_speed_converter.h" -#define EXPECT_NEAR_M3(x, y) EXPECT_NEAR((x), (y), 1e-3) float GetVssFor(float revPerKm, float axle, float teeth, float hz) { EngineTestHelper eth(TEST_ENGINE); diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp index 05b6a52f8f..872db3383f 100644 --- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp +++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp @@ -118,7 +118,7 @@ TEST(trigger, testCamInput) { // asserting that error code has cleared ASSERT_EQ(0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testCamInput #3"; - ASSERT_NEAR(-181, engine->triggerCentral.getVVTPosition(0, 0), EPS3D); + EXPECT_NEAR_M3(-181, engine->triggerCentral.getVVTPosition(0, 0)); } TEST(trigger, testNB2CamInput) { diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index 8d0b4b40eb..078c8cbb79 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -64,10 +64,10 @@ TEST(trigger, testQuadCam) { float basePos = -80.2f; // All four cams should now have the same position - EXPECT_NEAR(360 + basePos, engine->triggerCentral.getVVTPosition(firstBank, firstCam), EPS3D); - EXPECT_NEAR(basePos, engine->triggerCentral.getVVTPosition(firstBank, secondCam), EPS3D); - EXPECT_NEAR(basePos, engine->triggerCentral.getVVTPosition(secondBank, firstCam), EPS3D); - EXPECT_NEAR(basePos, engine->triggerCentral.getVVTPosition(secondBank, secondCam), EPS3D); + EXPECT_NEAR_M3(360 + basePos, engine->triggerCentral.getVVTPosition(firstBank, firstCam)); + EXPECT_NEAR_M3(basePos, engine->triggerCentral.getVVTPosition(firstBank, secondCam)); + EXPECT_NEAR_M3(basePos, engine->triggerCentral.getVVTPosition(secondBank, firstCam)); + EXPECT_NEAR_M3(basePos, engine->triggerCentral.getVVTPosition(secondBank, secondCam)); // Now fire cam events again, but with time gaps between each eth.moveTimeForwardMs(1);