From c071074475af87050fc9cc2d23c8fcdafc29bac4 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 14 Feb 2024 14:43:20 -0500 Subject: [PATCH] only: reducing junit4 --- java_console/autotest/build.gradle | 4 ++-- .../com/rusefi/io/TcpCommunicationIntegrationTest.java | 2 +- .../java/com/rusefi/livedata/LiveDataConventionTest.java | 7 +++---- .../ui/src/test/java/com/rusefi/ui/LuaFormatterTest.java | 2 +- .../java/com/rusefi/ui/livedata/LiveDataColorTest.java | 6 +++--- .../test/java/com/rusefi/ui/livedata/SourceReaderTest.java | 2 +- .../ui/src/test/java/com/rusefi/ui/lua/LuaImportsTest.java | 2 +- java_tools/build.gradle | 1 - java_tools/configuration_definition/build.gradle | 1 - java_tools/dependencies.gradle | 2 +- java_tools/enum_to_string/build.gradle | 3 +-- java_tools/ts_plugin_launcher/build.gradle | 1 - 12 files changed, 14 insertions(+), 19 deletions(-) diff --git a/java_console/autotest/build.gradle b/java_console/autotest/build.gradle index 2a97295cd0..3bb8a1ebde 100644 --- a/java_console/autotest/build.gradle +++ b/java_console/autotest/build.gradle @@ -7,7 +7,7 @@ apply from: '../../java_tools/dependencies.gradle' dependencies { api project(':ecu_io') - implementation global_libs.junit + implementation global_libs.junit4 } task simulatorFunctionalTestLauncherWithSimulator(type: Exec) { @@ -24,4 +24,4 @@ task simulatorFunctionalTestLauncherAssumungSimulatorWasStartedExternally(type: description = "Run the main class with ExecTask" workingDir = rootProject.projectDir commandLine "java", "-classpath", sourceSets.main.runtimeClasspath.getAsPath(), "com.rusefi.SimulatorFunctionalTestLauncher" -} \ No newline at end of file +} diff --git a/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java b/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java index bc755481b7..359d9dcb49 100644 --- a/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java +++ b/java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import static com.rusefi.TestHelper.assertLatch; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TcpCommunicationIntegrationTest { // todo: implement & test TCP connector restart! diff --git a/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java b/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java index 22bb31a18c..e9b898b5da 100644 --- a/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java +++ b/java_console/ui/src/test/java/com/rusefi/livedata/LiveDataConventionTest.java @@ -7,7 +7,6 @@ import com.rusefi.ldmp.StateDictionary; import com.rusefi.ui.livedata.SourceCodePainter; import com.rusefi.ui.livedata.VariableValueSource; import org.antlr.v4.runtime.tree.ParseTree; -import org.junit.Ignore; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -16,7 +15,7 @@ import java.net.URISyntaxException; import static com.rusefi.livedata.LiveDataParserPanel.getParseTree; import static com.rusefi.ui.LiveDataPane.CPP_SUFFIX; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LiveDataConventionTest { @Test @@ -41,12 +40,12 @@ public class LiveDataConventionTest { String sourceCode = LiveDataParserPanel.getContent(LiveDataParserPanel.class, fileName); - assertTrue("No content " + fileName + " size=" + sourceCode.length(), sourceCode.length() > 100); + assertTrue(sourceCode.length() > 100, "No content " + fileName + " size=" + sourceCode.length()); ParseTree tree = getParseTree(sourceCode); ParseResult parseResult = CodeWalkthrough.applyVariables(valueSource, sourceCode, SourceCodePainter.VOID, tree); - assertTrue("Broken live data constraint in " + fileName + ": " + parseResult.geBrokenConditions(), parseResult.geBrokenConditions().isEmpty()); + assertTrue(parseResult.geBrokenConditions().isEmpty(), "Broken live data constraint in " + fileName + ": " + parseResult.geBrokenConditions()); } } diff --git a/java_console/ui/src/test/java/com/rusefi/ui/LuaFormatterTest.java b/java_console/ui/src/test/java/com/rusefi/ui/LuaFormatterTest.java index 867e481682..9b4a82e650 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/LuaFormatterTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/LuaFormatterTest.java @@ -3,7 +3,7 @@ package com.rusefi.ui; import neoe.formatter.lua.LuaFormatter; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LuaFormatterTest { @Test diff --git a/java_console/ui/src/test/java/com/rusefi/ui/livedata/LiveDataColorTest.java b/java_console/ui/src/test/java/com/rusefi/ui/livedata/LiveDataColorTest.java index e092ba61d7..542bae4ab3 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/livedata/LiveDataColorTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/livedata/LiveDataColorTest.java @@ -14,8 +14,8 @@ import java.net.URISyntaxException; import static com.rusefi.livedata.LiveDataParserPanel.getContentOrNull; import static com.rusefi.ui.LiveDataPane.CPP_SUFFIX; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @Ignore // todo: https://github.com/rusefi/rusefi/issues/4669 public class LiveDataColorTest { @@ -40,7 +40,7 @@ public class LiveDataColorTest { private void testSpecificFile(String fileName) throws IOException { String sourceCode = getContentOrNull(getClass(), fileName); - assertNotNull("Not found: sourceCode for " + fileName, sourceCode); + assertNotNull(sourceCode, "Not found: sourceCode for " + fileName); ParseTree tree = LiveDataParserPanel.getParseTree(sourceCode); diff --git a/java_console/ui/src/test/java/com/rusefi/ui/livedata/SourceReaderTest.java b/java_console/ui/src/test/java/com/rusefi/ui/livedata/SourceReaderTest.java index 495f1f00c0..8ef8560f5e 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/livedata/SourceReaderTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/livedata/SourceReaderTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import java.io.*; import java.net.URISyntaxException; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class SourceReaderTest { @Test diff --git a/java_console/ui/src/test/java/com/rusefi/ui/lua/LuaImportsTest.java b/java_console/ui/src/test/java/com/rusefi/ui/lua/LuaImportsTest.java index 0f6a8e0875..d236885bcf 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/lua/LuaImportsTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/lua/LuaImportsTest.java @@ -2,7 +2,7 @@ package com.rusefi.ui.lua; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LuaImportsTest { @Test diff --git a/java_tools/build.gradle b/java_tools/build.gradle index 814d0c4b43..c8455d1432 100644 --- a/java_tools/build.gradle +++ b/java_tools/build.gradle @@ -9,7 +9,6 @@ allprojects { plugins.withType(JavaPlugin) { dependencies { implementation global_libs.annotations - testImplementation global_libs.junit testImplementation global_libs.junit5 testImplementation global_libs.junit5engine } diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle index f8d27ef5da..33fce3e6ea 100644 --- a/java_tools/configuration_definition/build.gradle +++ b/java_tools/configuration_definition/build.gradle @@ -30,7 +30,6 @@ shadowJar { } dependencies { exclude(dependency(global_libs.jsr305)) - exclude(dependency(global_libs.junit)) exclude(dependency(global_libs.annotations)) exclude(dependency('com.ibm.icu:icu4j:.*')) } diff --git a/java_tools/dependencies.gradle b/java_tools/dependencies.gradle index e66b5b0c1f..ab5f0fee06 100644 --- a/java_tools/dependencies.gradle +++ b/java_tools/dependencies.gradle @@ -1,6 +1,6 @@ ext { global_libs = [ - junit : "junit:junit:4.13.2", + junit4 : "junit:junit:4.13.2", junit5 : "org.junit.jupiter:junit-jupiter-api:$junit5Version", junit5engine : "org.junit.jupiter:junit-jupiter-engine:$junit5Version", junit5api : "org.junit.jupiter:junit-jupiter-api:$junit5Version", diff --git a/java_tools/enum_to_string/build.gradle b/java_tools/enum_to_string/build.gradle index eabe5dfe62..da2b3bf210 100644 --- a/java_tools/enum_to_string/build.gradle +++ b/java_tools/enum_to_string/build.gradle @@ -24,7 +24,6 @@ shadowJar { dependencies { exclude(dependency(global_libs.jsr305)) - exclude(dependency(global_libs.junit)) exclude(dependency(global_libs.annotations)) } -} \ No newline at end of file +} diff --git a/java_tools/ts_plugin_launcher/build.gradle b/java_tools/ts_plugin_launcher/build.gradle index 27ee114993..41488ef417 100644 --- a/java_tools/ts_plugin_launcher/build.gradle +++ b/java_tools/ts_plugin_launcher/build.gradle @@ -51,7 +51,6 @@ shadowJar { dependencies in resulting jar */ dependencies { - exclude(dependency(global_libs.junit)) exclude(dependency(global_libs.annotations)) exclude(dependency(ts_plugin_libs.launcher_api)) }