From ca933029690233ef59ff0e6a47af5a60d1482e3a Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 12 Apr 2020 23:24:14 -0400 Subject: [PATCH] that's how this works now --- .../rusefi/test/ConfigFieldParserTest.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java index bd3f18a3f2..a0e2057dcf 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java @@ -12,6 +12,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.Arrays; +import java.util.Collections; import static org.junit.Assert.*; @@ -51,6 +52,25 @@ public class ConfigFieldParserTest { assertEquals(16, TypesHelper.getElementSize(state, "pid_s")); } + @Test + public void multiplicationInDefine() throws IOException { + String test = "struct pid_s\n" + + "#define ERROR_BUFFER_SIZE 120\n" + + "#define ERROR_BUFFER_COUNT 120\n" + + "#define RESULT 120*@@ERROR_BUFFER_COUNT@@\n" + + "\tint16_t periodMs;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + + "end_struct\n" + + ""; + + VariableRegistry.INSTANCE.clear(); + BufferedReader reader = new BufferedReader(new StringReader(test)); + new ReaderState().readBufferedReader(reader, Collections.emptyList()); + + assertEquals("#define ERROR_BUFFER_COUNT 120\n" + + "#define ERROR_BUFFER_SIZE 120\n" + + "#define RESULT 120*@@ERROR_BUFFER_COUNT@@\n", VariableRegistry.INSTANCE.getDefinesSection()); + } + @Test public void useCustomType() throws IOException { ReaderState state = new ReaderState(); @@ -72,7 +92,6 @@ public class ConfigFieldParserTest { } - @Test public void testFsioVisible() throws IOException { {