From af4fdd3606102988d7f39b5e8209b8532044a020 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 16 Feb 2015 21:04:27 -0600
Subject: [PATCH] auto-sync

---
 .../runConfigurations/Launcher_29001.xml      |  3 ++-
 .../autotest/src/com/rusefi/AutoTest.java     | 22 +++++++++++++++----
 .../autotest/src/com/rusefi/TestingUtils.java | 10 +++++----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/java_console/.idea/runConfigurations/Launcher_29001.xml b/java_console/.idea/runConfigurations/Launcher_29001.xml
index f5085b59cd..c9a998d275 100644
--- a/java_console/.idea/runConfigurations/Launcher_29001.xml
+++ b/java_console/.idea/runConfigurations/Launcher_29001.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Launcher 29001" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="com.irnems.Launcher" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="29001" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index e054bbc575..e72387f77c 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -2,6 +2,7 @@ package com.rusefi;
 
 
 import com.rusefi.waves.WaveChart;
+import com.rusefi.waves.WaveReport;
 
 import static com.rusefi.IoUtil.nextChart;
 import static com.rusefi.IoUtil.sendCommand;
@@ -35,24 +36,37 @@ public class AutoTest {
 
         chart = nextChart();
         double x = 100;
-        assertWave(true, msg, chart, WaveChart.SPARK_1, 0.194433, 0.005, x + 180, x + 540);
+        assertWave(true, msg, chart, WaveChart.SPARK_1, 0.194433, 0.005, WaveReport.RATIO, x + 180, x + 540);
         assertWaveNull(msg, chart, WaveChart.SPARK_2);
-        assertWave(true, msg, chart, WaveChart.SPARK_3, 0.194433, 0.005, x, x + 360);
+        assertWave(true, msg, chart, WaveChart.SPARK_3, 0.194433, 0.005, WaveReport.RATIO, x, x + 360);
         assertWaveNull(msg, chart, WaveChart.SPARK_4);
 
+        x = 176.856;
+        assertWave(true, msg, chart, WaveChart.INJECTOR_1, 0.008199999999, 0.01, 0.1, x, x + 180, x + 360, x + 540);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_2, 0.008199999999, 0.01, 0.1, x, x + 180, x + 360, x + 540);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_3, 0.008199999999, 0.01, 0.1, x, x + 180, x + 360, x + 540);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_4, 0.008199999999, 0.01, 0.1, x, x + 180, x + 360, x + 540);
+
         msg = "2003 Neon running";
         IoUtil.changeRpm(2000);
         chart = nextChart();
         x = 120;
-        assertWave(true, msg, chart, WaveChart.SPARK_1, 0.13299999999999998, 0.005, x + 180, x + 540);
+        assertWave(true, msg, chart, WaveChart.SPARK_1, 0.13299999999999998, 0.005, WaveReport.RATIO, x + 180, x + 540);
         assertWaveNull(msg, chart, WaveChart.SPARK_2);
-        assertWave(true, msg, chart, WaveChart.SPARK_3, 0.13299999999999998, 0.005, x, x + 360);
+        assertWave(true, msg, chart, WaveChart.SPARK_3, 0.13299999999999998, 0.005, WaveReport.RATIO, x, x + 360);
         assertWaveNull(msg, chart, WaveChart.SPARK_4);
+
+        x = 168.12;
+        assertWave(true, msg, chart, WaveChart.INJECTOR_1, 0.03333333333333302, 0.01, 0.1, x + 360);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_2, 0.03333333333333302, 0.01, 0.1, x + 180);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_3, 0.03333333333333302, 0.01, 0.1, x + 540);
+        assertWave(true, msg, chart, WaveChart.INJECTOR_4, 0.03333333333333302, 0.01, 0.1, x);
     }
 
     private static void testMazdaProtege() {
         sendCommand("set_engine_type 14");
         WaveChart chart;
+        nextChart(); // a bit of extra time to change engine type
         IoUtil.changeRpm(200);
         String msg = "ProtegeLX cranking";
         chart = nextChart();
diff --git a/java_console/autotest/src/com/rusefi/TestingUtils.java b/java_console/autotest/src/com/rusefi/TestingUtils.java
index 4bd40ff9e1..44391202b4 100644
--- a/java_console/autotest/src/com/rusefi/TestingUtils.java
+++ b/java_console/autotest/src/com/rusefi/TestingUtils.java
@@ -24,6 +24,8 @@ public class TestingUtils {
             if (isCloseEnough(fixAngle(expected), current, ratio))
                 return;
         }
+        if (expectations.length == 1)
+            fail(msg + ": Got " + current + " while expecting " + Arrays.toString(expectations) + " ratio=" + Math.abs(1 - expectations[0] / current));
         fail(msg + ": Got " + current + " while expecting " + Arrays.toString(expectations));
     }
 
@@ -48,7 +50,7 @@ public class TestingUtils {
     }
 
     static void assertWave(String msg, WaveChart chart, String key, double width, double... expectedAngles) {
-        assertWave(true, msg, chart, key, width, WaveReport.RATIO, expectedAngles);
+        assertWave(true, msg, chart, key, width, WaveReport.RATIO, WaveReport.RATIO, expectedAngles);
     }
 
     static void assertWaveFall(WaveChart chart, String key, double width, double... expectedAngles) {
@@ -56,10 +58,10 @@ public class TestingUtils {
     }
 
     static void assertWaveFall(String msg, WaveChart chart, String key, double width, double... expectedAngles) {
-        assertWave(false, msg, chart, key, width, WaveReport.RATIO, expectedAngles);
+        assertWave(false, msg, chart, key, width, WaveReport.RATIO, WaveReport.RATIO, expectedAngles);
     }
 
-    static void assertWave(boolean rise, String msg, WaveChart chart, String key, double width, double angleRatio, double... expectedAngles) {
+    static void assertWave(boolean rise, String msg, WaveChart chart, String key, double width, double angleRatio, double widthRatio, double... expectedAngles) {
         RevolutionLog revolutionLog = chart.getRevolutionsLog();
         if (revolutionLog.keySet().isEmpty())
             throw new IllegalStateException(msg + " Empty revolutions in " + chart);
@@ -73,7 +75,7 @@ public class TestingUtils {
             double angleByTime = revolutionLog.getCrankAngleByTime(eventTime);
             assertCloseEnough(msg + " angle for " + key + "@" + eventTime, fixAngle(angleByTime), angleRatio, expectedAngles);
 
-            assertCloseEnough(msg + "width for " + key, ud.getDutyCycle(revolutionLog), WaveReport.RATIO, width);
+            assertCloseEnough(msg + "width for " + key, ud.getDutyCycle(revolutionLog), widthRatio, width);
         }
     }