only:dead

This commit is contained in:
rusefillc 2025-01-15 22:36:47 -05:00
parent 481882b0ac
commit 57194f404c
4 changed files with 18 additions and 18 deletions

View File

@ -53,7 +53,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" + assertEquals("afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" +
"afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" + "afr_typet = scalar, F32, 4, \"ms\", 1, 0, 0, 3000, 0\n" +
@ -67,7 +67,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type = array, S32, 0, [1x3], \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" + assertEquals("afr_type = array, S32, 0, [1x3], \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" +
"; total TS size = 12\n", tsProjectConsumer.getContent()); "; total TS size = 12\n", tsProjectConsumer.getContent());
@ -84,7 +84,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
}); });
} }
@ -96,7 +96,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type = array, S32, 0, [1x3], {bitStringValue(fuelUnits, fuelAlgorithm) }, 1, 0, 0, 3000, 0, noMsqSave\n" + assertEquals("afr_type = array, S32, 0, [1x3], {bitStringValue(fuelUnits, fuelAlgorithm) }, 1, 0, 0, 3000, 0, noMsqSave\n" +
"; total TS size = 12\n", tsProjectConsumer.getContent()); "; total TS size = 12\n", tsProjectConsumer.getContent());
@ -129,7 +129,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type1 = bits, S08, 0, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + assertEquals("afr_type1 = bits, S08, 0, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" +
"afr_type2 = bits, S08, 1, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + "afr_type2 = bits, S08, 1, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" +
@ -147,7 +147,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type1 = bits, S08, 0, [0:1], $ego_sensor_e_list\n" + assertEquals("afr_type1 = bits, S08, 0, [0:1], $ego_sensor_e_list\n" +
"int = scalar, S16, 2, \"\", 1, 0, 0, 32000, 0\n" + "int = scalar, S16, 2, \"\", 1, 0, 0, 32000, 0\n" +
@ -165,7 +165,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("afr_type1 = bits, S08, 0, [0:1], \"BPSX\"\n" + assertEquals("afr_type1 = bits, S08, 0, [0:1], \"BPSX\"\n" +
"afr_type2 = bits, S08, 1, [0:1], \"BPSX\"\n" + "afr_type2 = bits, S08, 1, [0:1], \"BPSX\"\n" +
@ -184,7 +184,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("int = scalar, S08, 0, \"\", 1, 0, 0, 100, 0\n" + assertEquals("int = scalar, S08, 0, \"\", 1, 0, 0, 100, 0\n" +
"afr_type1 = bits, S16, 2, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + "afr_type1 = bits, S16, 2, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" +
@ -202,7 +202,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("int2 = scalar, S08, 0, \"\", 1, 0, 0, 100, 0\n" + assertEquals("int2 = scalar, S08, 0, \"\", 1, 0, 0, 100, 0\n" +
"afr_type3 = bits, S32, 4, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" + "afr_type3 = bits, S32, 4, [0:1], \"BPSX\", \"Innovate\", \"14Point7\", \"INVALID\"\n" +
@ -298,7 +298,7 @@ public class ConfigFieldParserTest {
""; "";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
@ -795,7 +795,7 @@ public class ConfigFieldParserTest {
"end_struct\n"; "end_struct\n";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals("pid_afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" + assertEquals("pid_afr_type = scalar, F32, 0, \"ms\", 1, 0, 0, 3000, 0\n" +
"pid_afr_typet = scalar, F32, 4, \"\", 1, 0, 0, 100, 0\n" + "pid_afr_typet = scalar, F32, 4, \"\", 1, 0, 0, 100, 0\n" +

View File

@ -186,7 +186,7 @@ public class OutputsTest {
String test = "struct total\n" + String test = "struct total\n" +
"\tint[3 iterate] triggerSimulatorPins;Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board.\\nSee also directSelfStimulation which is different.\n" + "\tint[3 iterate] triggerSimulatorPins;Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board.\\nSee also directSelfStimulation which is different.\n" +
"end_struct\n"; "end_struct\n";
TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
state.readBufferedReader(test, tsProjectConsumer); state.readBufferedReader(test, tsProjectConsumer);
assertEquals( assertEquals(
"\ttriggerSimulatorPins1 = \"Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board.\\nSee also directSelfStimulation which is different. 1\"\n" + "\ttriggerSimulatorPins1 = \"Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board.\\nSee also directSelfStimulation which is different. 1\"\n" +

View File

@ -47,7 +47,7 @@ public class TSProjectConsumerTest {
""; "";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
@ -111,7 +111,7 @@ public class TSProjectConsumerTest {
""; "";
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state); TSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer(state);
JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state);
@ -133,7 +133,7 @@ public class TSProjectConsumerTest {
@Test @Test
public void testReaderKeepComments() throws IOException { public void testReaderKeepComments() throws IOException {
TSProjectConsumer consumer = new TestTSProjectConsumer(null, new ReaderStateImpl()); TSProjectConsumer consumer = new TestTSProjectConsumer(new ReaderStateImpl());
TsFileContent content = consumer.getTsFileContent(new StringBufferInputStream(smallContent)); TsFileContent content = consumer.getTsFileContent(new StringBufferInputStream(smallContent));
assertEquals(smallContent, content.getPrefix()); assertEquals(smallContent, content.getPrefix());
assertEquals("", content.getPostfix()); assertEquals("", content.getPostfix());
@ -142,7 +142,7 @@ public class TSProjectConsumerTest {
@Test @Test
public void testReaderDropComments() throws IOException { public void testReaderDropComments() throws IOException {
ReaderStateImpl state = new ReaderStateImpl(); ReaderStateImpl state = new ReaderStateImpl();
TSProjectConsumer consumer = new TestTSProjectConsumer(null, state); TSProjectConsumer consumer = new TestTSProjectConsumer(state);
state.getVariableRegistry().put(TSProjectConsumer.TS_DROP_TEMPLATE_COMMENTS, "true"); state.getVariableRegistry().put(TSProjectConsumer.TS_DROP_TEMPLATE_COMMENTS, "true");
TsFileContent content = consumer.getTsFileContent(new StringBufferInputStream(smallContent)); TsFileContent content = consumer.getTsFileContent(new StringBufferInputStream(smallContent));
assertEquals("hello = \";\"\n" + assertEquals("hello = \";\"\n" +

View File

@ -4,8 +4,8 @@ import com.rusefi.ReaderStateImpl;
import com.rusefi.output.TSProjectConsumer; import com.rusefi.output.TSProjectConsumer;
public class TestTSProjectConsumer extends TSProjectConsumer { public class TestTSProjectConsumer extends TSProjectConsumer {
public TestTSProjectConsumer(String tsPath, ReaderStateImpl state) { public TestTSProjectConsumer(ReaderStateImpl state) {
super(tsPath, state); super(null, state);
} }
@Override @Override