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

https://rusefi.com/forum/viewtopic.php?f=19&t=2177 

refactoring and test coverage
This commit is contained in:
rusefillc 2021-10-28 13:02:08 -04:00
parent 83aa4c625a
commit d2b923edc8
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java
View File

@ -32,6 +32,11 @@ public class TSProjectConsumer implements ConfigurationConsumer {
this.state = state;
}
// also known as TS tooltips
public StringBuilder getSettingContextHelp() {
return settingContextHelp;
}
private int writeTunerStudio(ConfigField configField, String prefix, Writer tsHeader, int tsPosition, ConfigField next, int bitIndex) throws IOException {
String nameWithPrefix = prefix + configField.getName();

48
java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java
View File

@ -41,8 +41,8 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
CharArrayWriter writer = new CharArrayWriter();
TestTSProjectConsumer javaFieldsConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Collections.singletonList(tsProjectConsumer));
assertEquals("afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" +
"afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" +
"; total TS size = 8\n", new String(writer.toCharArray()));
@ -63,7 +63,7 @@ public class ConfigFieldParserTest {
public void endFile() {
}
};
state.readBufferedReader(reader, Arrays.asList(consumer));
state.readBufferedReader(reader, Collections.singletonList(consumer));
}
@Test
@ -77,8 +77,8 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
CharArrayWriter writer = new CharArrayWriter();
TestTSProjectConsumer javaFieldsConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Collections.singletonList(tsProjectConsumer));
assertEquals("afr_type = bits, S32, 0, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" +
"; total TS size = 4\n", new String(writer.toCharArray()));
}
@ -96,7 +96,7 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
assertEquals(16, TypesHelper.getElementSize(state, "pid_s"));
@ -157,9 +157,9 @@ public class ConfigFieldParserTest {
CharArrayWriter writer = new CharArrayWriter();
ReaderState state = new ReaderState();
TSProjectConsumer javaFieldsConsumer = new TestTSProjectConsumer(writer, "", state);
TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(tsProjectConsumer));
assertEquals("periodMs = scalar, S16, 0, \"ms\", 0.1, 0, 0, 3000, 0\n" +
"periodMs2 = scalar, S16, 2, \"ms\", 1, 0, 0, 3000, 0\n" +
@ -180,7 +180,7 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
assertEquals("\tpublic static final Field VAR = Field.create(\"VAR\", 0, 120, FieldType.STRING);\n" +
"\tpublic static final Field PERIODMS = Field.create(\"PERIODMS\", 120, FieldType.INT16);\n",
@ -196,7 +196,7 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
assertEquals("\tpublic static final char SD_r = 'r';\n" +
"",
@ -213,7 +213,7 @@ public class ConfigFieldParserTest {
BufferedReader reader = new BufferedReader(new StringReader(test));
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer));
state.readBufferedReader(reader, Collections.singletonList(javaFieldsConsumer));
assertEquals("\tpublic static final int ERROR_BUFFER_SIZE = 120;\n" +
"\tpublic static final int ERROR_BUFFER_SIZE_H = 0x120;\n" +
@ -259,7 +259,8 @@ public class ConfigFieldParserTest {
}
};
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer, fsioSettingsConsumer));
state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer,
fsioSettingsConsumer));
assertEquals("\tpublic static final Field OFFSET = Field.create(\"OFFSET\", 0, FieldType.INT16);\n" +
@ -417,4 +418,27 @@ public class ConfigFieldParserTest {
assertEquals(512, state.parseSize("2*@@var@@", ""));
assertEquals(512, state.parseSize("2x@@var@@", ""));
}
@Test
public void testStructTooltips() throws IOException {
String test = "struct total\n" +
"struct pid_s\n" +
"floatms_t afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"percent_t afr_typet;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" +
"end_struct\n" +
"pid_s pid;comment\n" +
"end_struct\n";
ReaderState state = new ReaderState();
BufferedReader reader = new BufferedReader(new StringReader(test));
CharArrayWriter writer = new CharArrayWriter();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(writer, "", state);
state.readBufferedReader(reader, Collections.singletonList(tsProjectConsumer));
assertEquals("pid_afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" +
"pid_afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" +
"; total TS size = 8\n", new String(writer.toCharArray()));
assertEquals("\tpid = \"comment\"\n" +
"\tpid_afr_type = \"PID dTime\"\n" +
"\tpid_afr_typet = \"PID dTime\"\n", tsProjectConsumer.getSettingContextHelp().toString());
}
}