From 845327dd3cd14a66d7503ff28836fd0f13cd7ef5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 14 Feb 2024 10:45:40 -0500 Subject: [PATCH] only: reducing junit4 --- .../java/com/rusefi/pinout/PinoutLogicHellen112_17_Test.java | 4 ++-- .../java/com/rusefi/pinout/PinoutLogicIntegratedTest.java | 2 +- .../src/test/java/com/rusefi/pinout/PinoutLogicTest.java | 2 +- .../src/test/java/com/rusefi/test/BitParsingTest.java | 2 +- .../java/com/rusefi/test/ConfigDefinitionOutputTest.java | 2 +- .../src/test/java/com/rusefi/test/ConfigDefinitionTest.java | 4 ++-- .../java/com/rusefi/test/ConfigFieldParserIssue1057Test.java | 2 +- .../src/test/java/com/rusefi/test/EnumAsTsVariable.java | 4 ++-- .../java/com/rusefi/test/FragmentDialogConsumerTest.java | 2 +- .../java/com/rusefi/test/GetConfigValueConsumerTest.java | 5 ++--- .../java/com/rusefi/test/GetOutputValueConsumerTest.java | 2 +- .../src/test/java/com/rusefi/test/HashTest.java | 2 +- .../test/java/com/rusefi/test/JavaSensorsConsumerTest.java | 2 +- .../src/test/java/com/rusefi/test/OutputsTest.java | 5 ++--- .../test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java | 2 +- .../src/test/java/com/rusefi/test/TSProjectConsumerTest.java | 2 +- .../src/test/java/com/rusefi/test/VariableRegistryTest.java | 2 +- .../src/test/java/com/rusefi/test/output_pin_e_enumTest.java | 2 +- 18 files changed, 23 insertions(+), 25 deletions(-) diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicHellen112_17_Test.java b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicHellen112_17_Test.java index 6197ab5af6..e8246e7689 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicHellen112_17_Test.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicHellen112_17_Test.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import java.io.*; import static com.rusefi.test.ConfigDefinitionTest.FIRMWARE; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertFalse; +import static com.rusefi.AssertCompatibility.assertEquals; +import static com.rusefi.AssertCompatibility.assertFalse; public class PinoutLogicHellen112_17_Test { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java index f14f41024f..d4b099ffd3 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java @@ -11,7 +11,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class PinoutLogicIntegratedTest { diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicTest.java index ab8c648cea..3a6152a27f 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicTest.java @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.Map; import java.util.TreeMap; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class PinoutLogicTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java index 699eb8094c..ccfc9cb3a7 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/BitParsingTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import java.io.*; -import static org.junit.Assert.assertTrue; +import static com.rusefi.AssertCompatibility.assertTrue; public class BitParsingTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java index ce2435bba4..f2c00c30ea 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionOutputTest.java @@ -3,7 +3,7 @@ package com.rusefi.test; import com.rusefi.output.BaseCHeaderConsumer; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class ConfigDefinitionOutputTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java index d57daf4a14..bfb27852b8 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java @@ -9,8 +9,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static com.rusefi.AssertCompatibility.assertNotNull; +import static com.rusefi.AssertCompatibility.assertTrue; public class ConfigDefinitionTest { public static final String FIRMWARE = "../../firmware"; diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java index 28ca476afa..bf47df4b6b 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java @@ -4,7 +4,7 @@ import com.rusefi.ReaderStateImpl; import com.rusefi.output.JavaFieldsConsumer; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class ConfigFieldParserIssue1057Test { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java index bd4561ce04..4828662fa4 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/EnumAsTsVariable.java @@ -8,8 +8,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static com.rusefi.AssertCompatibility.assertEquals; +import static com.rusefi.AssertCompatibility.assertNotNull; public class EnumAsTsVariable { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java index 897e40eb4e..f1ec6faae3 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java @@ -4,7 +4,7 @@ import com.rusefi.ReaderStateImpl; import com.rusefi.output.FragmentDialogConsumer; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class FragmentDialogConsumerTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java index 14a474fe52..28eae4a15c 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java @@ -3,11 +3,10 @@ package com.rusefi.test; import com.rusefi.MaybeSemicolonWasMissedException; import com.rusefi.ReaderStateImpl; import com.rusefi.output.GetConfigValueConsumer; -import org.junit.function.ThrowingRunnable; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static com.rusefi.AssertCompatibility.assertEquals; +import static com.rusefi.AssertCompatibility.assertThrows; public class GetConfigValueConsumerTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetOutputValueConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetOutputValueConsumerTest.java index bc707408c8..568e39fc18 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetOutputValueConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetOutputValueConsumerTest.java @@ -5,7 +5,7 @@ import com.rusefi.output.GetOutputValueConsumer; import com.rusefi.util.LazyFile; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class GetOutputValueConsumerTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/HashTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/HashTest.java index cef3cc4c37..a070de8f0a 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/HashTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/HashTest.java @@ -3,7 +3,7 @@ package com.rusefi.test; import com.rusefi.output.HashUtil; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class HashTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java index 1c8e30537b..efe9000338 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/JavaSensorsConsumerTest.java @@ -4,7 +4,7 @@ import com.rusefi.ReaderStateImpl; import com.rusefi.output.JavaSensorsConsumer; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class JavaSensorsConsumerTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java index cf8d14997a..af8e53b978 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java @@ -7,11 +7,10 @@ import com.rusefi.output.DataLogConsumer; import com.rusefi.output.GaugeConsumer; import com.rusefi.output.OutputsSectionConsumer; import org.jetbrains.annotations.NotNull; -import org.junit.function.ThrowingRunnable; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static com.rusefi.AssertCompatibility.assertEquals; +import static com.rusefi.AssertCompatibility.assertThrows; public class OutputsTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java index 867f7d589b..2dfa9b6714 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/SdCardFieldsGeneratorTest.java @@ -1,6 +1,6 @@ package com.rusefi.test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; import com.rusefi.ReaderStateImpl; 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 d6572a3bfe..5c0052e715 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 @@ -6,7 +6,7 @@ import com.rusefi.output.JavaFieldsConsumer; import com.rusefi.output.TSProjectConsumer; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class TSProjectConsumerTest { @Test diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java index e4d01f6b9a..0b55af9190 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/VariableRegistryTest.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; import static com.rusefi.VariableRegistry.*; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; /** * 3/30/2015 diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/output_pin_e_enumTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/output_pin_e_enumTest.java index 2e828b7796..40b5370241 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/output_pin_e_enumTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/output_pin_e_enumTest.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.util.Arrays; import static com.rusefi.VariableRegistry.unquote; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class output_pin_e_enumTest { @Test