diff --git a/java_console/inifile/src/test/java/com/opensr5/ini/test/IniEnumDecoderTest.java b/java_console/inifile/src/test/java/com/opensr5/ini/test/IniEnumDecoderTest.java index cbf993183b..6c0097574b 100644 --- a/java_console/inifile/src/test/java/com/opensr5/ini/test/IniEnumDecoderTest.java +++ b/java_console/inifile/src/test/java/com/opensr5/ini/test/IniEnumDecoderTest.java @@ -1,9 +1,9 @@ package com.opensr5.ini.test; import com.opensr5.ini.field.EnumIniField; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class IniEnumDecoderTest { @Test diff --git a/java_console/inifile/src/test/java/com/opensr5/ini/test/IniFileReaderTest.java b/java_console/inifile/src/test/java/com/opensr5/ini/test/IniFileReaderTest.java index a3d50596cc..40266d634d 100644 --- a/java_console/inifile/src/test/java/com/opensr5/ini/test/IniFileReaderTest.java +++ b/java_console/inifile/src/test/java/com/opensr5/ini/test/IniFileReaderTest.java @@ -5,12 +5,12 @@ import com.opensr5.ini.field.ArrayIniField; import com.opensr5.ini.field.EnumIniField; import com.opensr5.ini.field.IniField; import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Andrey Belomutskiy, (c) 2013-2020 diff --git a/java_console/shared_io/src/test/java/com/rusefi/core/io/BundleUtilTest.java b/java_console/shared_io/src/test/java/com/rusefi/core/io/BundleUtilTest.java index 26faae6c36..dbf4807d1c 100644 --- a/java_console/shared_io/src/test/java/com/rusefi/core/io/BundleUtilTest.java +++ b/java_console/shared_io/src/test/java/com/rusefi/core/io/BundleUtilTest.java @@ -1,6 +1,6 @@ package com.rusefi.core.io; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; 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 bfc5f73ab7..22bb31a18c 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 @@ -8,7 +8,8 @@ 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.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URISyntaxException; @@ -19,7 +20,7 @@ import static org.junit.Assert.assertTrue; public class LiveDataConventionTest { @Test - @Ignore + @Disabled public void assertLiveDataConvention() throws IOException, URISyntaxException { for (live_data_e view : live_data_e.values()) { String fileName = StateDictionary.INSTANCE.getFileName(view) + CPP_SUFFIX; diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java index 467a867e5d..942cc9d019 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/FullServerTest.java @@ -19,8 +19,8 @@ import com.rusefi.proxy.client.UpdateType; import com.rusefi.server.*; import com.rusefi.tools.online.HttpUtil; import org.apache.http.HttpResponse; -import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; import java.io.IOException; import java.net.MalformedURLException; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue; public class FullServerTest { private static final Logging log = getLogging(FullServerTest.class); - @Before + @BeforeEach public void setup() throws MalformedURLException { BackendTestHelper.commonServerTest(); } diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java index e91de4d3d9..5a63a6efcc 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/ServerTest.java @@ -14,8 +14,8 @@ import com.rusefi.server.*; import com.rusefi.tools.online.HttpUtil; import com.rusefi.tools.online.ProxyClient; import com.rusefi.tools.online.PublicSession; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.MalformedURLException; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; * https://github.com/rusefi/web_backend/blob/master/documentation/rusEFI%20remote.png */ public class ServerTest { - @Before + @BeforeEach public void setup() throws MalformedURLException { BackendTestHelper.commonServerTest(); } diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java index 164c263bb5..f746140e67 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java @@ -10,8 +10,8 @@ import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.TcpConnector; import com.rusefi.server.Backend; import com.rusefi.server.ControllerConnectionState; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.MalformedURLException; import java.util.concurrent.CountDownLatch; @@ -23,7 +23,7 @@ import static com.rusefi.binaryprotocol.BinaryProtocol.sleep; public class NetworkConnectorTest { private static final Logging log = getLogging(NetworkConnectorTest.class); - @Before + @BeforeEach public void setup() throws MalformedURLException { BackendTestHelper.commonServerTest(); } diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java index 5eb7c3eca0..c5f8efc6f7 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java @@ -15,8 +15,8 @@ import com.rusefi.server.SessionDetails; import com.rusefi.tools.online.ProxyClient; import com.rusefi.ui.StatusConsumer; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.MalformedURLException; @@ -25,7 +25,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static com.rusefi.BackendTestHelper.createTestUserResolver; import static com.rusefi.TestHelper.*; import static com.rusefi.Timeouts.SECOND; import static com.rusefi.binaryprotocol.BinaryProtocol.findCommand; @@ -34,12 +33,12 @@ import static com.rusefi.config.generated.Fields.TS_PROTOCOL; import static com.rusefi.io.tcp.BinaryProtocolServer.getPacketLength; import static com.rusefi.io.tcp.TcpConnector.LOCALHOST; import static com.rusefi.core.FileUtil.close; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class LocalApplicationProxyTest { private static final AtomicInteger portNumber = new AtomicInteger(4000); - @Before + @BeforeEach public void setup() throws MalformedURLException { BackendTestHelper.commonServerTest(); } diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/server/BirthdayTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/server/BirthdayTest.java index 3ab8274acb..b3e32dd8a9 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/server/BirthdayTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/server/BirthdayTest.java @@ -1,6 +1,6 @@ package com.rusefi.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static com.rusefi.Timeouts.MINUTE; import static com.rusefi.Timeouts.SECOND; diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/server/SessionDetailsTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/server/SessionDetailsTest.java index bc9618b414..0d0aa97585 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/server/SessionDetailsTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/server/SessionDetailsTest.java @@ -3,7 +3,7 @@ package com.rusefi.server; import com.rusefi.TestHelper; import com.rusefi.proxy.NetworkConnector; import com.rusefi.core.rusEFIVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; diff --git a/java_tools/proxy_server/src/test/java/com/rusefi/server/TwoKindSemaphoreTest.java b/java_tools/proxy_server/src/test/java/com/rusefi/server/TwoKindSemaphoreTest.java index 48e80b7034..497070b726 100644 --- a/java_tools/proxy_server/src/test/java/com/rusefi/server/TwoKindSemaphoreTest.java +++ b/java_tools/proxy_server/src/test/java/com/rusefi/server/TwoKindSemaphoreTest.java @@ -1,8 +1,8 @@ package com.rusefi.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TwoKindSemaphoreTest { @Test diff --git a/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java b/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java index 70e065322c..2340a4f834 100644 --- a/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java +++ b/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java @@ -1,7 +1,7 @@ package com.rusefi; import com.rusefi.core.SignatureHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; diff --git a/java_tools/ts_plugin/src/test/java/com/rusefi/ts_plugin/ConnectPanelTest.java b/java_tools/ts_plugin/src/test/java/com/rusefi/ts_plugin/ConnectPanelTest.java index 99c66bb13a..7a589be954 100644 --- a/java_tools/ts_plugin/src/test/java/com/rusefi/ts_plugin/ConnectPanelTest.java +++ b/java_tools/ts_plugin/src/test/java/com/rusefi/ts_plugin/ConnectPanelTest.java @@ -1,6 +1,6 @@ package com.rusefi.ts_plugin; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertEquals; diff --git a/java_tools/tune-tools/src/test/java/com/rusefi/tune/LoadOlderTuneTest.java b/java_tools/tune-tools/src/test/java/com/rusefi/tune/LoadOlderTuneTest.java index c15e49a10c..9aa49f471f 100644 --- a/java_tools/tune-tools/src/test/java/com/rusefi/tune/LoadOlderTuneTest.java +++ b/java_tools/tune-tools/src/test/java/com/rusefi/tune/LoadOlderTuneTest.java @@ -7,10 +7,10 @@ import com.rusefi.tools.tune.TuneTools; import com.rusefi.tune.xml.Msq; import com.rusefi.tune.xml.Page; import org.junit.Assert; -import org.junit.Test; +import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.*; public class LoadOlderTuneTest { @Test @@ -127,11 +127,13 @@ public class LoadOlderTuneTest { " // defa", sb.substring(0, 3500)); } - @Test(expected = IllegalStateException.class) + @Test public void testLegacyCustomEnumOrdinal() { + assertThrows(IllegalStateException.class, () -> { String tsCustomLine = "bits, U08, @OFFSET@, [0:1], \"Single Coil\", \"Individual Coils\", \"Wasted Spark\", \"Two Distributors\""; Assert.assertEquals(0, TuneTools.resolveEnumByName(tsCustomLine, "One coil")); + }); } @Test diff --git a/java_tools/tune-tools/src/test/java/com/rusefi/tune/ReadCurrentIniTest.java b/java_tools/tune-tools/src/test/java/com/rusefi/tune/ReadCurrentIniTest.java index cd56ba5b3e..07ef7b4d3b 100644 --- a/java_tools/tune-tools/src/test/java/com/rusefi/tune/ReadCurrentIniTest.java +++ b/java_tools/tune-tools/src/test/java/com/rusefi/tune/ReadCurrentIniTest.java @@ -2,7 +2,7 @@ package com.rusefi.tune; import com.opensr5.ini.IniFileModel; import com.rusefi.tools.tune.WriteSimulatorConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.junit.Assert.assertNotNull; diff --git a/java_tools/tune-tools/src/test/java/com/rusefi/tune/TuneReadWriteTest.java b/java_tools/tune-tools/src/test/java/com/rusefi/tune/TuneReadWriteTest.java index 3ccdaab3c1..5fb3d42569 100644 --- a/java_tools/tune-tools/src/test/java/com/rusefi/tune/TuneReadWriteTest.java +++ b/java_tools/tune-tools/src/test/java/com/rusefi/tune/TuneReadWriteTest.java @@ -12,13 +12,13 @@ import com.rusefi.tools.tune.TuneCanTool; import com.rusefi.tune.xml.Constant; import com.rusefi.tune.xml.Msq; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TuneReadWriteTest { private static final String PATH = TuneCanTool.SRC_TEST_RESOURCES + "frankenso/"; @@ -200,7 +200,7 @@ public class TuneReadWriteTest { * Looks like I am not getting something right around Field#FIELD_PRECISION * See also TuneWriterTest :( */ - assertEquals("Binary match expected", 66, compareImages(binaryDataFromXml, fileBinaryData, model)); + assertEquals(66, compareImages(binaryDataFromXml, fileBinaryData, model), "Binary match expected"); // todo: looks like this is not removing the temporary file? Files.delete(path); }