rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
Andrey 2021-12-24 16:51:31 -05:00
parent 3fb6ab29ad
commit 19a8685644
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unit_tests/global.h
View File

@ -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

2
unit_tests/test_basic_math/test_interpolation_3d.cpp
View File

@ -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);

6
unit_tests/tests/ignition_injection/test_fuel_map.cpp
View File

@ -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));
}

1
unit_tests/tests/lua/test_lua_hooks.cpp
View File

@ -1,5 +1,4 @@
#include "pch.h"
#include "rusefi_lua.h"

1
unit_tests/tests/sensor/test_vehicle_speed_converter.cpp
View File

@ -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);

2
unit_tests/tests/trigger/test_cam_vvt_input.cpp
View File

@ -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) {

8
unit_tests/tests/trigger/test_quad_cam.cpp
View File

@ -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);