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

switch to array'd version of asserts (#2158)

This commit is contained in:
Matthew Kennedy 2020-12-29 16:42:03 -08:00 committed by GitHub
parent 98644b680f
commit 1df887bc8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 80 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
java_console/autotest/src/com/rusefi/FunctionalTest.java
View File

@ -10,6 +10,8 @@ import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.util.Arrays;
import static com.rusefi.IoUtil.getEnableCommand; import static com.rusefi.IoUtil.getEnableCommand;
import static com.rusefi.TestingUtils.*; import static com.rusefi.TestingUtils.*;
import static com.rusefi.config.generated.Fields.*; import static com.rusefi.config.generated.Fields.*;
@ -25,43 +27,49 @@ import static org.junit.Assert.assertFalse;
*/ */
public class FunctionalTest extends RusefiTestBase { public class FunctionalTest extends RusefiTestBase {
@Test @Test
public void testChangingIgnitionMode() { public void testChangingIgnitionMode() {
String msg = "change ign mode"; String msg = "change ign mode";
ecu.setEngineType(ET_FORD_ASPIRE); ecu.setEngineType(ET_FORD_ASPIRE);
ecu.changeRpm(2000); ecu.changeRpm(2000);
// First is wasted spark // First is wasted spark
ecu.sendCommand("set ignition_mode 2"); ecu.sendCommand("set ignition_mode 2");
{ {
// Check that we're in wasted spark mode // Check that we're in wasted spark mode
EngineChart chart = nextChart(); EngineChart chart = nextChart();
// Wasted spark should fire cylinders 1/3... // Wasted spark should fire cylinders 1/3...
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart,
assertWaveNotNull(chart, EngineChart.SPARK_3); EngineChart.SPARK_1,
EngineChart.SPARK_3
);
// ...but not cylinders 2/4 // ...but not cylinders 2/4
assertWaveNull(chart, EngineChart.SPARK_2); assertWaveNull(chart,
assertWaveNull(chart, EngineChart.SPARK_4); EngineChart.SPARK_2,
} EngineChart.SPARK_4
);
}
// Now switch to sequential mode // Now switch to sequential mode
ecu.sendCommand("set ignition_mode 1"); ecu.sendCommand("set ignition_mode 1");
{ {
// Check that we're in sequential spark mode // Check that we're in sequential spark mode
EngineChart chart = nextChart(); EngineChart chart = nextChart();
// All 4 cylinders should be firing // All 4 cylinders should be firing
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart,
assertWaveNotNull(chart, EngineChart.SPARK_2); EngineChart.SPARK_1,
assertWaveNotNull(chart, EngineChart.SPARK_3); EngineChart.SPARK_2,
assertWaveNotNull(chart, EngineChart.SPARK_4); EngineChart.SPARK_3,
} EngineChart.SPARK_4
);
}
// Now switch to "one coil" mode // Now switch to "one coil" mode
ecu.sendCommand("set ignition_mode 0"); ecu.sendCommand("set ignition_mode 0");
{ {
@ -72,27 +80,33 @@ public class FunctionalTest extends RusefiTestBase {
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart, EngineChart.SPARK_1);
// And no others // And no others
assertWaveNull(chart, EngineChart.SPARK_2); assertWaveNull(chart,
assertWaveNull(chart, EngineChart.SPARK_3); EngineChart.SPARK_2,
assertWaveNull(chart, EngineChart.SPARK_4); EngineChart.SPARK_3,
EngineChart.SPARK_4
);
} }
// Now switch BACK to wasted mode // Now switch BACK to wasted mode
ecu.sendCommand("set ignition_mode 2"); ecu.sendCommand("set ignition_mode 2");
{ {
// Check that we're in wasted spark mode // Check that we're in wasted spark mode
EngineChart chart = nextChart(); EngineChart chart = nextChart();
// Wasted spark should fire cylinders 1/3... // Wasted spark should fire cylinders 1/3...
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart,
assertWaveNotNull(chart, EngineChart.SPARK_3); EngineChart.SPARK_1,
EngineChart.SPARK_3
);
// ...but not cylinders 2/4 // ...but not cylinders 2/4
assertWaveNull(chart, EngineChart.SPARK_2); assertWaveNull(chart,
assertWaveNull(msg, chart, EngineChart.SPARK_4); EngineChart.SPARK_2,
} EngineChart.SPARK_4
} );
}
}
@Test @Test
public void testRevLimiter() { public void testRevLimiter() {
@ -111,8 +125,10 @@ public class FunctionalTest extends RusefiTestBase {
// Check that neither ignition nor injection is cut // Check that neither ignition nor injection is cut
EngineChart chart = nextChart(); EngineChart chart = nextChart();
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart,
assertWaveNotNull(chart, EngineChart.INJECTOR_1); EngineChart.SPARK_1,
EngineChart.INJECTOR_1
);
} }
// Now go above the hard limiter // Now go above the hard limiter
@ -124,8 +140,10 @@ public class FunctionalTest extends RusefiTestBase {
// These channels are allowed to have falling edges - aka closing injectors and firing coils // These channels are allowed to have falling edges - aka closing injectors and firing coils
// but not allowed to have rising edges - aka opening injectors and charging coils // but not allowed to have rising edges - aka opening injectors and charging coils
assertWaveNoRises(chart, EngineChart.SPARK_1); assertWaveNoRises(chart,
assertWaveNoRises(chart, EngineChart.INJECTOR_1); EngineChart.SPARK_1,
EngineChart.INJECTOR_1
);
} }
// Check that it recovers when we go back under the limit // Check that it recovers when we go back under the limit
@ -135,10 +153,12 @@ public class FunctionalTest extends RusefiTestBase {
// Check that neither ignition nor injection is cut // Check that neither ignition nor injection is cut
EngineChart chart = nextChart(); EngineChart chart = nextChart();
assertWaveNotNull(chart, EngineChart.SPARK_1); assertWaveNotNull(chart,
assertWaveNotNull(chart, EngineChart.INJECTOR_1); EngineChart.SPARK_1,
EngineChart.INJECTOR_1
);
} }
} }
@Test @Test
public void testCustomEngine() { public void testCustomEngine() {
@ -441,6 +461,10 @@ public class FunctionalTest extends RusefiTestBase {
assertWaveNull("", chart, key); assertWaveNull("", chart, key);
} }
private static void assertWaveNull(EngineChart chart, String... keys) {
Arrays.stream(keys).peek(k -> assertWaveNull(chart, k));
}
private static void assertWaveNull(String msg, EngineChart chart, String key) { private static void assertWaveNull(String msg, EngineChart chart, String key) {
assertNull(msg + "chart for " + key, chart.get(key)); assertNull(msg + "chart for " + key, chart.get(key));
} }
@ -453,6 +477,10 @@ public class FunctionalTest extends RusefiTestBase {
assertTrue(msg, chart.get(key) != null); assertTrue(msg, chart.get(key) != null);
} }
private static void assertWaveNotNull(EngineChart chart, String... keys) {
Arrays.stream(keys).peek(k -> assertWaveNotNull(chart, k));
}
private static void assertWaveNoRises(EngineChart chart, String key) { private static void assertWaveNoRises(EngineChart chart, String key) {
StringBuilder events = chart.get(key); StringBuilder events = chart.get(key);
@ -465,6 +493,10 @@ public class FunctionalTest extends RusefiTestBase {
assertFalse(events.toString().contains("u")); assertFalse(events.toString().contains("u"));
} }
private static void assertWaveNoRises(EngineChart chart, String... keys) {
Arrays.stream(keys).peek(k -> assertWaveNoRises(chart, k));
}
private EngineChart nextChart() { private EngineChart nextChart() {
return TestingUtils.nextChart(ecu.commandQueue); return TestingUtils.nextChart(ecu.commandQueue);
} }