From 4364a9730eb6375c75f8545235bb81aafcc75d3c Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 31 Oct 2023 01:14:22 -0700 Subject: [PATCH] soo many cleanups --- .../java/com/rusefi/f4discovery/CommonFunctionalTest.java | 7 +++---- .../test/java/com/opensr5/ini/test/IniFileReaderTest.java | 6 +++--- .../test/java/com/rusefi/binaryprotocol/test/CRCTest.java | 6 ++---- .../src/test/java/com/rusefi/test/TimeBasedBufferTest.java | 5 ++--- .../com/rusefi/test/newParse/ParseDefinitionsTest.java | 2 +- .../src/main/java/com/rusefi/VariableRegistry.java | 2 +- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java index 979a90e1f9..5d3f8b1236 100644 --- a/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java +++ b/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java @@ -14,8 +14,7 @@ import java.util.Arrays; import static com.rusefi.IoUtil.getEnableCommand; import static com.rusefi.TestingUtils.assertNull; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * rusEFI firmware simulator functional test suite @@ -333,7 +332,7 @@ public class CommonFunctionalTest extends RusefiTestBase { assertWaveNull(msg, chart, EngineChart.TRIGGER_2); sendComplexCommand("set " + "trigger_type" + " " + com.rusefi.enums.trigger_type_e.TT_FORD_ASPIRE.ordinal()); chart = nextChart(); - assertTrue(chart.get(EngineChart.TRIGGER_2) != null); + assertNotNull(chart.get(EngineChart.TRIGGER_2)); } @Test @@ -475,7 +474,7 @@ public class CommonFunctionalTest extends RusefiTestBase { } private static void assertWaveNotNull(String msg, EngineChart chart, String key) { - assertTrue(msg, chart.get(key) != null); + assertNotNull(msg, chart.get(key)); } private static void assertWaveNotNull(EngineChart chart, String... keys) { 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 7613cd7014..d756981035 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 @@ -141,7 +141,7 @@ public class IniFileReaderTest { byte[] expected = {'k', 0, 0, 0, 0, 0, 0}; - assertTrue(Arrays.equals(expected, ProtocolCommand.parse(crcProtocol).getBytes())); + assertArrayEquals(expected, ProtocolCommand.parse(crcProtocol).getBytes()); } @Test @@ -177,9 +177,9 @@ public class IniFileReaderTest { assertEquals(0, EnumIniField.getBitRange(4, 0, 2)); assertEquals(3, EnumIniField.getBitRange(7, 0, 2)); - assertEquals(true, EnumIniField.getBit(0xff, 0)); + assertTrue(EnumIniField.getBit(0xff, 0)); - assertEquals(true, EnumIniField.getBit(0xf0, 4)); + assertTrue(EnumIniField.getBit(0xf0, 4)); assertEquals(2, EnumIniField.getBitRange(0xf0, 3, 2)); } diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java index baf456510a..8247f3cc01 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java @@ -5,8 +5,7 @@ import org.junit.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * Andrey Belomutskiy, (c) 2013-2020 @@ -30,7 +29,6 @@ public class CRCTest { byte[] command = {'S'}; byte[] expected = {0, 1, 0x53, 0x20, 0x60, -17, -61}; byte[] actual = IoHelper.makeCrc32Packet(command); - assertTrue(Arrays.toString(expected) + " vs " + Arrays.toString(actual), - Arrays.equals(expected, actual)); + assertArrayEquals(Arrays.toString(expected) + " vs " + Arrays.toString(actual), expected, actual); } } diff --git a/java_console/models/src/test/java/com/rusefi/test/TimeBasedBufferTest.java b/java_console/models/src/test/java/com/rusefi/test/TimeBasedBufferTest.java index 03661daca2..1bb4d848a7 100644 --- a/java_console/models/src/test/java/com/rusefi/test/TimeBasedBufferTest.java +++ b/java_console/models/src/test/java/com/rusefi/test/TimeBasedBufferTest.java @@ -7,8 +7,7 @@ import org.junit.Test; import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TimeBasedBufferTest { @Test @@ -41,7 +40,7 @@ public class TimeBasedBufferTest { b.add(3); assertEquals(2, b.getSize()); // value for same timestamp is overriden double[] v = b.getValues(); - assertTrue(Arrays.equals(new double[]{2, 3}, v)); + assertArrayEquals(new double[]{2, 3}, v, 0.0); assertEquals(0.707106, DataBuffer.getStandardDeviation(b.getValues()), 0.001); diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/newParse/ParseDefinitionsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/newParse/ParseDefinitionsTest.java index c3e2de2cf7..7c15d04873 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/newParse/ParseDefinitionsTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/newParse/ParseDefinitionsTest.java @@ -110,7 +110,7 @@ public class ParseDefinitionsTest { // Should get back the new definition, not the old one Definition def2 = state.findDefinition("val"); - Assert.assertTrue(def != def2); + Assert.assertNotSame(def, def2); Assert.assertEquals(40, def2.asDouble(), 1e-5); } diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index ffdc77c9db..6a91136e05 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -336,7 +336,7 @@ public class VariableRegistry { } @Nullable - public String get(Object key) { + public String get(String key) { return data.get(key); } }