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

migrating hardware tests to junit

This commit is contained in:
rusefillc 2020-12-12 20:33:19 -05:00
parent 02e788d0e1
commit a7ff26d3c3
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/.idea/runConfigurations/RealHwTest.xml → java_console/.idea/runConfigurations/RealHardwareTestLauncher.xml
View File

@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RealHwTest" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.rusefi.RealHwTest" />
<configuration default="false" name="RealHardwareTestLauncher" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.rusefi.RealHardwareTestLauncher" />
<module name="autotest" />
<extension name="coverage">
<pattern>

5
java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java
View File

@ -63,11 +63,6 @@ public class RealHardwareTestLauncher {
}
private static void runRealHardwareTest(LinkManager linkManager) {
// first run tests which require real hardware
new HardwareTests(linkManager.getCommandQueue()).runRealHardwareTests();
if (ControllerConnectorState.firmwareVersion == null)
throw new IllegalStateException("firmwareVersion has not arrived");
// now run common part of the test which should be same on real hardware and simulator
new FunctionalTestsSuite(linkManager, linkManager.getCommandQueue()).mainTestBody();
}

30
java_console/autotest/src/com/rusefi/HardwareTests.java → java_console/autotest/src/com/rusefi/VssHardwareLoopTest.java
View File

@ -4,27 +4,23 @@ import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.functional_tests.EcuTestHelper;
import com.rusefi.io.CommandQueue;
import org.junit.Test;
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.*;
public class HardwareTests {
/**
* This test relies on jumpers connecting physical pins on Discovery:
* PD1<>PC6
* PD2<>PA5
*/
public class VssHardwareLoopTest {
@Test
public void test() {
EcuTestHelper ecu = new EcuTestHelper(ControllerConnectorState.getLinkManager().getCommandQueue());
private final EcuTestHelper ecu;
public HardwareTests(CommandQueue commandQueue) {
ecu = new EcuTestHelper(commandQueue);
}
/**
* This test relies on jumpers connecting physical pins on Discovery:
* PD1<>PC6
* PD2<>PA5
*/
public void runRealHardwareTests() {
ecu.sendCommand(getEnableCommand(Fields.CMD_TRIGGER_HW_INPUT));
ecu.enableFunctionalMode();
@ -36,13 +32,15 @@ public class HardwareTests {
// moving second trigger to another pin
ecu.sendCommand(CMD_TRIGGER_PIN + " 1 PA8");
ecu.assertEquals("VSS no input", 0, SensorCentral.getInstance().getValue(Sensor.VSS));
EcuTestHelper.assertEquals("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);
ecu.assertEquals("VSS with input", 3, SensorCentral.getInstance().getValue(Sensor.VSS));
EcuTestHelper.assertEquals("VSS with input", 3, SensorCentral.getInstance().getValue(Sensor.VSS));
if (ControllerConnectorState.firmwareVersion == null)
throw new IllegalStateException("firmwareVersion has not arrived");
}
}