From 1ac264acc07c147de3255169963fe19ea8e12100 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 14 Feb 2020 22:27:37 -0500 Subject: [PATCH] unit test refactoring --- .../test/ConfigFieldParserIssue1057Test.java | 10 +--------- .../com/rusefi/test/ConfigFieldParserTest.java | 16 ++-------------- .../rusefi/test/TestJavaFieldsConsumer.java | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java index 61d06e81b8..d6c263e34f 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java @@ -15,15 +15,7 @@ public class ConfigFieldParserIssue1057Test { @Test public void testBitsPadding() throws IOException { ReaderState state = new ReaderState(); - JavaFieldsConsumer javaFieldsConsumer = new JavaFieldsConsumer(state) { - @Override - public void startFile() { - } - - @Override - public void endFile() { - } - }; + JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); String inputString = "struct pid_s\nbit activateAuxPid1;\n" + "int fieldName;\n" + 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 b71c29e17b..bdc336aadb 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java @@ -45,7 +45,7 @@ public class ConfigFieldParserTest { ReaderState state = new ReaderState(); BufferedReader reader = new BufferedReader(new StringReader(test)); - JavaFieldsConsumer javaFieldsConsumer = createTestJavaConsumer(state); + JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); state.readBufferedReader(reader, Arrays.asList(javaFieldsConsumer)); assertEquals(16, TypesHelper.getElementSize(state, "pid_s")); @@ -77,7 +77,7 @@ public class ConfigFieldParserTest { ""; BufferedReader reader = new BufferedReader(new StringReader(test)); - JavaFieldsConsumer javaFieldsConsumer = createTestJavaConsumer(state); + JavaFieldsConsumer javaFieldsConsumer = new TestJavaFieldsConsumer(state); FsioSettingsConsumer fsioSettingsConsumer = new FsioSettingsConsumer(state) { @Override @@ -162,18 +162,6 @@ public class ConfigFieldParserTest { } } - private JavaFieldsConsumer createTestJavaConsumer(ReaderState state) { - return new JavaFieldsConsumer(state) { - @Override - public void startFile() { - } - - @Override - public void endFile() { - } - }; - } - @Test public void testParseLine() { ReaderState state = new ReaderState(); diff --git a/java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java b/java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java new file mode 100644 index 0000000000..5d4b53a687 --- /dev/null +++ b/java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java @@ -0,0 +1,18 @@ +package com.rusefi.test; + +import com.rusefi.ReaderState; +import com.rusefi.output.JavaFieldsConsumer; + +public class TestJavaFieldsConsumer extends JavaFieldsConsumer { + public TestJavaFieldsConsumer(ReaderState state) { + super(state); + } + + @Override + public void startFile() { + } + + @Override + public void endFile() { + } +}