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

off-topic method rename

This commit is contained in:
rusefillc 2021-06-21 02:46:11 -04:00
parent 3d5bba4226
commit f42c6fce58
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java_console/autotest/src/com/rusefi/f4discovery/CommonFunctionalTest.java
View File

@ -214,7 +214,7 @@ public class CommonFunctionalTest extends RusefiTestBase {
ecu.changeRpm(200);
ecu.changeRpm(250); // another approach to artificial delay
ecu.changeRpm(200);
EcuTestHelper.assertEquals("VBatt", 12, SensorCentral.getInstance().getValue(Sensor.VBATT));
EcuTestHelper.assertSomewhatClose("VBatt", 12, SensorCentral.getInstance().getValue(Sensor.VBATT));
chart = nextChart();
double x = 100;
@ -284,7 +284,7 @@ public class CommonFunctionalTest extends RusefiTestBase {
ecu.changeRpm(200);
String msg = "ProtegeLX cranking";
chart = nextChart();
EcuTestHelper.assertEquals("", 12, SensorCentral.getInstance().getValue(Sensor.VBATT), 0.1);
EcuTestHelper.assertSomewhatClose("", 12, SensorCentral.getInstance().getValue(Sensor.VBATT), 0.1);
assertWaveNotNull(msg, chart, EngineChart.SPARK_3);
assertWaveNotNull(msg, chart, EngineChart.SPARK_1);
assertWaveNotNull(msg, chart, EngineChart.INJECTOR_1);
@ -359,9 +359,8 @@ public class CommonFunctionalTest extends RusefiTestBase {
sendComplexCommand("set cranking_rpm 500");
ecu.changeRpm(200);
double x;
chart = nextChart();
EcuTestHelper.assertEquals(12, SensorCentral.getInstance().getValue(Sensor.VBATT));
EcuTestHelper.assertSomewhatClose(12, SensorCentral.getInstance().getValue(Sensor.VBATT));
assertWaveNotNull("aspire default cranking ", chart, EngineChart.SPARK_1);
ecu.changeRpm(600);
@ -445,7 +444,7 @@ public class CommonFunctionalTest extends RusefiTestBase {
ecu.changeRpm(2400);
ecu.changeRpm(2000);
chart = nextChart();
EcuTestHelper.assertEquals("MAP", 69.12, SensorCentral.getInstance().getValue(Sensor.MAP));
EcuTestHelper.assertSomewhatClose("MAP", 69.12, SensorCentral.getInstance().getValue(Sensor.MAP));
//assertEquals(1, SensorCentral.getInstance().getValue(Sensor.));
assertWaveNotNull(msg + " fuel SD #1", chart, EngineChart.INJECTOR_1);

5
java_console/autotest/src/com/rusefi/f4discovery/PwmHardwareTest.java
View File

@ -14,6 +14,7 @@ import static com.rusefi.IoUtil.getDisableCommand;
import static com.rusefi.IoUtil.getEnableCommand;
import static com.rusefi.binaryprotocol.BinaryProtocol.sleep;
import static com.rusefi.config.generated.Fields.*;
import static org.junit.Assert.assertEquals;
/**
* This test relies on jumpers connecting physical pins on Discovery:
@ -50,7 +51,7 @@ public class PwmHardwareTest extends RusefiTestBase {
int totalTriggerErrorsNow = (int) SensorCentral.getInstance().getValueSource(Sensor.totalTriggerErrorCounter).getValue();
log.info("totalTriggerErrorsNow " + totalTriggerErrorsNow);
EcuTestHelper.assertTotallyEquals("totalTriggerErrorCounter", triggerErrors, totalTriggerErrorsNow);
assertEquals("totalTriggerErrorCounter", triggerErrors, totalTriggerErrorsNow);
}
@Test
@ -84,6 +85,6 @@ public class PwmHardwareTest extends RusefiTestBase {
sleep(2 * Timeouts.SECOND);
/* +-1% is still acceptable */
EcuTestHelper.assertEquals("Idle PWM freq", FREQUENCY, SensorCentral.getInstance().getValue(Sensor.debugIntField1), 0.01);
EcuTestHelper.assertSomewhatClose("Idle PWM freq", FREQUENCY, SensorCentral.getInstance().getValue(Sensor.debugIntField1), 0.01);
}
}

4
java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
View File

@ -34,14 +34,14 @@ public class VssHardwareLoopTest extends RusefiTestBase {
// moving second trigger to another pin
ecu.sendCommand(CMD_TRIGGER_PIN + " 1 PA8");
EcuTestHelper.assertEquals("VSS no input", 0, SensorCentral.getInstance().getValue(Sensor.VSS));
EcuTestHelper.assertSomewhatClose("VSS no input", 0, SensorCentral.getInstance().getValue(Sensor.VSS));
// attaching VSS to trigger simulator since there is a jumper on test discovery
ecu.sendCommand("set " + CMD_VSS_PIN + " pa5");
sleep(2 * Timeouts.SECOND);
EcuTestHelper.assertEquals("VSS with input", 3, SensorCentral.getInstance().getValue(Sensor.VSS));
EcuTestHelper.assertSomewhatClose("VSS with input", 3, SensorCentral.getInstance().getValue(Sensor.VSS));
// not related to VSS test, just need to validate this somewhere, so this random test is as good as any
if (ControllerConnectorState.firmwareVersion == null)

18
java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
View File

@ -62,24 +62,18 @@ public class EcuTestHelper {
return linkManager;
}
public static void assertEquals(double expected, double actual) {
EcuTestHelper.assertEquals("", expected, actual);
public static void assertSomewhatClose(double expected, double actual) {
EcuTestHelper.assertSomewhatClose("", expected, actual);
}
public static void assertTotallyEquals(String msg, int expected, int actual) {
if (expected != actual)
throw new IllegalStateException(msg + " Expected " + expected + " but got " + actual);
public static void assertSomewhatClose(String msg, double expected, double actual) {
EcuTestHelper.assertSomewhatClose(msg, expected, actual, EngineReport.RATIO);
}
/**
* WARNING this is a LOOSE equals
* @see #assertTotallyEquals
* todo: it's time to leverage junit a bit more properly
*/
public static void assertEquals(String msg, double expected, double actual) {
EcuTestHelper.assertEquals(msg, expected, actual, EngineReport.RATIO);
}
public static void assertEquals(String msg, double expected, double actual, double ratio) {
public static void assertSomewhatClose(String msg, double expected, double actual, double ratio) {
if (!isCloseEnough(expected, actual, ratio))
throw new IllegalStateException(msg + " Expected " + expected + " but got " + actual);
}