From 1c7781449dc22441debd22acd44d4afff6def7e5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 27 Mar 2023 14:45:50 -0400 Subject: [PATCH] Improve toolset for default tune canned tune generation #4871 --- .../src/main/java/com/opensr5/ini/IniFileModel.java | 8 ++++++-- .../ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java b/java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java index b850fbb214..87b1ebd7f4 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java @@ -38,8 +38,8 @@ public class IniFileModel { private String currentSection; private String currentYBins; private String currentXBins; - private final Map xBinsByZBins = new HashMap<>(); - private final Map yBinsByZBins = new HashMap<>(); + private final Map xBinsByZBins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + private final Map yBinsByZBins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); public static void main(String[] args) { log.info("Dialogs: " + IniFileModel.getInstance().dialogs); @@ -194,6 +194,10 @@ public class IniFileModel { return xBinsByZBins.get(tableName); } + public Set getTables() { + return xBinsByZBins.keySet(); + } + public String getYBin(String tableName) { return yBinsByZBins.get(tableName); } diff --git a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java index 7fbf7f88e6..ace6f5c869 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java @@ -32,7 +32,9 @@ public class TuneReadWriteTest { @Test public void testIniReader() { IniFileModel model = IniFileModel.getInstance(); - assertEquals("fuelRpmBins", model.getXBin("fuelTable")); + assertTrue(model.getTables().contains("fueltable")); + assertEquals(21, model.getTables().size()); + assertEquals("fuelRpmBins", model.getXBin("FUELTable")); assertEquals("fuelLoadBins", model.getYBin("fuelTable")); }