From 6e04b2da983ece4b99101175cd6b5837369d55eb Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 27 Mar 2023 02:09:57 -0700 Subject: [PATCH] tests --- .../rusefi/test/ConfigFieldParserTest.java | 189 +++++++++--------- .../rusefi/test/TSProjectConsumerTest.java | 32 ++- 2 files changed, 104 insertions(+), 117 deletions(-) diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java index 6344062387..f799b553e6 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java @@ -364,130 +364,124 @@ public class ConfigFieldParserTest { "\tpublic static final Field PERIODMS = Field.create(\"PERIODMS\", 12, FieldType.BIT, 0).setBaseOffset(0);\n", javaFieldsConsumer.getContent()); assertEquals("struct pid_s {\n" + - "\t/**\n" + - "\t * offset 0\n" + - "\t */\n" + + "\t// offset 0\n" + "\tint8_t byte1 = (int8_t)0;\n" + - "\t/**\n" + - "\t * need 4 byte alignment\n" + - "\tunits\n" + - "\t * offset 1\n" + - "\t */\n" + + "\n" + + "\t// need 4 byte alignment\n" + + "\t// units\n" + + "\t// offset 1\n" + "\tuint8_t alignmentFill_at_1[1];\n" + - "\t/**\n" + - "\t * offset 2\n" + - "\t */\n" + + "\n" + + "\t// offset 2\n" + "\tint16_t short = (int16_t)0;\n" + - "\t/**\n" + - "\t * offset 4\n" + - "\t */\n" + + "\n" + + "\t// offset 4\n" + "\tint int2 = (int)0;\n" + - "\t/**\n" + - "\t * offset 8\n" + - "\t */\n" + + "\n" + + "\t// offset 8\n" + "\tint8_t byte2 = (int8_t)0;\n" + - "\t/**\n" + - "\t * need 4 byte alignment\n" + - "\tunits\n" + - "\t * offset 9\n" + - "\t */\n" + + "\n" + + "\t// need 4 byte alignment\n" + + "\t// units\n" + + "\t// offset 9\n" + "\tuint8_t alignmentFill_at_9[3];\n" + - "\t/**\n" + - "\toffset 12 bit 0 */\n" + + "\n" + + "\t// offset 12 bit 0\n" + "\tbool periodMs : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 1 */\n" + + "\n" + + "\t// offset 12 bit 1\n" + "\tbool unusedBit_7_1 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 2 */\n" + + "\n" + + "\t// offset 12 bit 2\n" + "\tbool unusedBit_7_2 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 3 */\n" + + "\n" + + "\t// offset 12 bit 3\n" + "\tbool unusedBit_7_3 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 4 */\n" + + "\n" + + "\t// offset 12 bit 4\n" + "\tbool unusedBit_7_4 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 5 */\n" + + "\n" + + "\t// offset 12 bit 5\n" + "\tbool unusedBit_7_5 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 6 */\n" + + "\n" + + "\t// offset 12 bit 6\n" + "\tbool unusedBit_7_6 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 7 */\n" + + "\n" + + "\t// offset 12 bit 7\n" + "\tbool unusedBit_7_7 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 8 */\n" + + "\n" + + "\t// offset 12 bit 8\n" + "\tbool unusedBit_7_8 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 9 */\n" + + "\n" + + "\t// offset 12 bit 9\n" + "\tbool unusedBit_7_9 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 10 */\n" + + "\n" + + "\t// offset 12 bit 10\n" + "\tbool unusedBit_7_10 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 11 */\n" + + "\n" + + "\t// offset 12 bit 11\n" + "\tbool unusedBit_7_11 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 12 */\n" + + "\n" + + "\t// offset 12 bit 12\n" + "\tbool unusedBit_7_12 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 13 */\n" + + "\n" + + "\t// offset 12 bit 13\n" + "\tbool unusedBit_7_13 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 14 */\n" + + "\n" + + "\t// offset 12 bit 14\n" + "\tbool unusedBit_7_14 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 15 */\n" + + "\n" + + "\t// offset 12 bit 15\n" + "\tbool unusedBit_7_15 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 16 */\n" + + "\n" + + "\t// offset 12 bit 16\n" + "\tbool unusedBit_7_16 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 17 */\n" + + "\n" + + "\t// offset 12 bit 17\n" + "\tbool unusedBit_7_17 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 18 */\n" + + "\n" + + "\t// offset 12 bit 18\n" + "\tbool unusedBit_7_18 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 19 */\n" + + "\n" + + "\t// offset 12 bit 19\n" + "\tbool unusedBit_7_19 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 20 */\n" + + "\n" + + "\t// offset 12 bit 20\n" + "\tbool unusedBit_7_20 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 21 */\n" + + "\n" + + "\t// offset 12 bit 21\n" + "\tbool unusedBit_7_21 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 22 */\n" + + "\n" + + "\t// offset 12 bit 22\n" + "\tbool unusedBit_7_22 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 23 */\n" + + "\n" + + "\t// offset 12 bit 23\n" + "\tbool unusedBit_7_23 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 24 */\n" + + "\n" + + "\t// offset 12 bit 24\n" + "\tbool unusedBit_7_24 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 25 */\n" + + "\n" + + "\t// offset 12 bit 25\n" + "\tbool unusedBit_7_25 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 26 */\n" + + "\n" + + "\t// offset 12 bit 26\n" + "\tbool unusedBit_7_26 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 27 */\n" + + "\n" + + "\t// offset 12 bit 27\n" + "\tbool unusedBit_7_27 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 28 */\n" + + "\n" + + "\t// offset 12 bit 28\n" + "\tbool unusedBit_7_28 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 29 */\n" + + "\n" + + "\t// offset 12 bit 29\n" + "\tbool unusedBit_7_29 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 30 */\n" + + "\n" + + "\t// offset 12 bit 30\n" + "\tbool unusedBit_7_30 : 1 {};\n" + - "\t/**\n" + - "\toffset 12 bit 31 */\n" + + "\n" + + "\t// offset 12 bit 31\n" + "\tbool unusedBit_7_31 : 1 {};\n" + + "\n" + "};\n" + "static_assert(sizeof(pid_s) == 16);\n" + "\n", consumer.getContent()); @@ -541,8 +535,8 @@ public class ConfigFieldParserTest { "\t// offset 0\n" + "\tint8_t byte1 = (int8_t)0;\n" + "\n" + - "\t * need 4 byte alignment\n" + - "\tunits\n" + + "\t// need 4 byte alignment\n" + + "\t// units\n" + "\t// offset 1\n" + "\tuint8_t alignmentFill_at_1[3];\n" + "\n" + @@ -567,20 +561,17 @@ public class ConfigFieldParserTest { ReaderStateImpl state = new ReaderStateImpl(); state.readBufferedReader(test, consumer); assertEquals("struct pid_s {\n" + - "\t/**\n" + - "\t * offset 0\n" + - "\t */\n" + + "\t// offset 0\n" + "\tint8_t byte1 = (int8_t)0;\n" + - "\t/**\n" + - "\t * offset 1\n" + - "\t */\n" + + "\n" + + "\t// offset 1\n" + "\tint8_t byte2 = (int8_t)0;\n" + - "\t/**\n" + - "\t * need 4 byte alignment\n" + - "\tunits\n" + - "\t * offset 2\n" + - "\t */\n" + + "\n" + + "\t// need 4 byte alignment\n" + + "\t// units\n" + + "\t// offset 2\n" + "\tuint8_t alignmentFill_at_2[2];\n" + + "\n" + "};\n" + "static_assert(sizeof(pid_s) == 4);\n" + "\n", diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java index 1e87f12c05..95d3f528bf 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/TSProjectConsumerTest.java @@ -67,28 +67,24 @@ public class TSProjectConsumerTest { assertEquals("struct pid_s {\n" + - "\t/**\n" + - "\t * PID dTime\n" + - "\tms\n" + - "\t * offset 0\n" + - "\t */\n" + + "\t// PID dTime\n" + + "\t// ms\n" + + "\t// offset 0\n" + "\tint periodMs2 = (int)0;\n" + - "\t/**\n" + - "\t * offset 4\n" + - "\t */\n" + + "\n" + + "\t// offset 4\n" + "\tafr_table_t afrTable;\n" + - "\t/**\n" + - "\t * PID dTime\n" + - "\tms\n" + - "\t * offset 20\n" + - "\t */\n" + + "\n" + + "\t// PID dTime\n" + + "\t// ms\n" + + "\t// offset 20\n" + "\tscaled_channel periodMs = (int16_t)0;\n" + - "\t/**\n" + - "\t * need 4 byte alignment\n" + - "\tunits\n" + - "\t * offset 22\n" + - "\t */\n" + + "\n" + + "\t// need 4 byte alignment\n" + + "\t// units\n" + + "\t// offset 22\n" + "\tuint8_t alignmentFill_at_22[2];\n" + + "\n" + "};\n" + "static_assert(sizeof(pid_s) == 24);\n" + "\n", consumer.getContent());