parent
5202b492de
commit
27cb27748d
|
@ -1,6 +1,7 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import com.rusefi.functional_tests.EcuTestHelper;
|
import com.rusefi.functional_tests.EcuTestHelper;
|
||||||
|
import com.rusefi.waves.EngineChart;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
|
||||||
public class RusefiTestBase {
|
public class RusefiTestBase {
|
||||||
|
@ -15,4 +16,8 @@ public class RusefiTestBase {
|
||||||
public void startUp() {
|
public void startUp() {
|
||||||
ecu = EcuTestHelper.createInstance(needsHardwareTriggerInput());
|
ecu = EcuTestHelper.createInstance(needsHardwareTriggerInput());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected EngineChart nextChart() {
|
||||||
|
return TestingUtils.nextChart(ecu.commandQueue);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,6 @@ package com.rusefi.f4discovery;
|
||||||
|
|
||||||
|
|
||||||
import com.rusefi.RusefiTestBase;
|
import com.rusefi.RusefiTestBase;
|
||||||
import com.rusefi.TestingUtils;
|
|
||||||
import com.rusefi.config.generated.Fields;
|
|
||||||
import com.rusefi.core.Sensor;
|
import com.rusefi.core.Sensor;
|
||||||
import com.rusefi.core.SensorCentral;
|
import com.rusefi.core.SensorCentral;
|
||||||
import com.rusefi.functional_tests.EcuTestHelper;
|
import com.rusefi.functional_tests.EcuTestHelper;
|
||||||
|
@ -12,9 +10,8 @@ import org.junit.Test;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import static com.rusefi.IoUtil.getDisableCommand;
|
|
||||||
import static com.rusefi.IoUtil.getEnableCommand;
|
import static com.rusefi.IoUtil.getEnableCommand;
|
||||||
import static com.rusefi.TestingUtils.*;
|
import static com.rusefi.TestingUtils.assertNull;
|
||||||
import static com.rusefi.config.generated.Fields.*;
|
import static com.rusefi.config.generated.Fields.*;
|
||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
@ -28,22 +25,6 @@ import static org.junit.Assert.assertTrue;
|
||||||
* 3/5/14
|
* 3/5/14
|
||||||
*/
|
*/
|
||||||
public class CommonFunctionalTest extends RusefiTestBase {
|
public class CommonFunctionalTest extends RusefiTestBase {
|
||||||
@Test
|
|
||||||
public void scheduleBurnDoesNotAffectTriggerIssue2839() {
|
|
||||||
ecu.setEngineType(ET_FORD_ASPIRE);
|
|
||||||
sendComplexCommand("set " + "trigger_type" + " " + TT_TT_TOOTHED_WHEEL_60_2);
|
|
||||||
ecu.sendCommand(getDisableCommand(Fields.CMD_SELF_STIMULATION));
|
|
||||||
ecu.sendCommand(getEnableCommand(CMD_EXTERNAL_STIMULATION));
|
|
||||||
ecu.changeRpm(1200);
|
|
||||||
nextChart();
|
|
||||||
nextChart();
|
|
||||||
int triggerErrors = (int) SensorCentral.getInstance().getValueSource(Sensor.totalTriggerErrorCounter).getValue();
|
|
||||||
for (int i = 0; i < 7; i++)
|
|
||||||
sendComplexCommand(CMD_BURNCONFIG);
|
|
||||||
int totalTriggerErrorsNow = (int) SensorCentral.getInstance().getValueSource(Sensor.totalTriggerErrorCounter).getValue();
|
|
||||||
EcuTestHelper.assertEquals("totalTriggerErrorCounter", totalTriggerErrorsNow, triggerErrors);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testChangingIgnitionMode() {
|
public void testChangingIgnitionMode() {
|
||||||
ecu.setEngineType(ET_FORD_ASPIRE);
|
ecu.setEngineType(ET_FORD_ASPIRE);
|
||||||
|
@ -526,7 +507,4 @@ public class CommonFunctionalTest extends RusefiTestBase {
|
||||||
Arrays.stream(keys).peek(k -> assertWaveNoRises(chart, k));
|
Arrays.stream(keys).peek(k -> assertWaveNoRises(chart, k));
|
||||||
}
|
}
|
||||||
|
|
||||||
private EngineChart nextChart() {
|
|
||||||
return TestingUtils.nextChart(ecu.commandQueue);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ import com.rusefi.config.generated.Fields;
|
||||||
import com.rusefi.core.Sensor;
|
import com.rusefi.core.Sensor;
|
||||||
import com.rusefi.core.SensorCentral;
|
import com.rusefi.core.SensorCentral;
|
||||||
import com.rusefi.functional_tests.EcuTestHelper;
|
import com.rusefi.functional_tests.EcuTestHelper;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static com.rusefi.IoUtil.getDisableCommand;
|
import static com.rusefi.IoUtil.getDisableCommand;
|
||||||
|
@ -29,6 +28,24 @@ public class PwmHardwareTest extends RusefiTestBase {
|
||||||
|
|
||||||
private static final int FREQUENCY = 160;
|
private static final int FREQUENCY = 160;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void scheduleBurnDoesNotAffectTriggerIssue2839() {
|
||||||
|
ecu.setEngineType(ET_FORD_ASPIRE);
|
||||||
|
ecu.sendCommand("set " + "trigger_type" + " " + TT_TT_TOOTHED_WHEEL_60_2);
|
||||||
|
ecu.sendCommand(getDisableCommand(Fields.CMD_SELF_STIMULATION));
|
||||||
|
ecu.sendCommand(getEnableCommand(CMD_EXTERNAL_STIMULATION));
|
||||||
|
ecu.changeRpm(1200);
|
||||||
|
nextChart();
|
||||||
|
nextChart();
|
||||||
|
int triggerErrors = (int) SensorCentral.getInstance().getValueSource(Sensor.totalTriggerErrorCounter).getValue();
|
||||||
|
/*
|
||||||
|
for (int i = 0; i < 7; i++)
|
||||||
|
ecu.sendCommand(CMD_BURNCONFIG);
|
||||||
|
*/
|
||||||
|
int totalTriggerErrorsNow = (int) SensorCentral.getInstance().getValueSource(Sensor.totalTriggerErrorCounter).getValue();
|
||||||
|
EcuTestHelper.assertEquals("totalTriggerErrorCounter", totalTriggerErrorsNow, triggerErrors);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testIdlePin() {
|
public void testIdlePin() {
|
||||||
ecu.setEngineType(ET_FRANKENSO_MIATA_NA6);
|
ecu.setEngineType(ET_FRANKENSO_MIATA_NA6);
|
||||||
|
|
Loading…
Reference in New Issue