From b7df0ed4cb21c1893bd43064a2a69dccaa2be2c0 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 14 Feb 2024 10:43:05 -0500 Subject: [PATCH] only: reducing junit4 --- .../rusefi/ldmp/LiveDataProcessorTest.java | 2 +- .../ldmp/StateDictionaryGeneratorTest.java | 2 +- .../java/com/rusefi/AssertCompatibility.java | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java index 11bfb5d19c..d8ab8ceefa 100644 --- a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java +++ b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/LiveDataProcessorTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import java.io.*; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class LiveDataProcessorTest { @Test diff --git a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java index 28d33d9749..7ca6843feb 100644 --- a/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java +++ b/java_tools/configuration_definition_base/src/test/java/com/rusefi/ldmp/StateDictionaryGeneratorTest.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.StringReader; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static com.rusefi.AssertCompatibility.assertEquals; public class StateDictionaryGeneratorTest { @Test diff --git a/java_tools/configuration_definition_base/src/testFixtures/java/com/rusefi/AssertCompatibility.java b/java_tools/configuration_definition_base/src/testFixtures/java/com/rusefi/AssertCompatibility.java index ac1e516611..9f9b4dca70 100644 --- a/java_tools/configuration_definition_base/src/testFixtures/java/com/rusefi/AssertCompatibility.java +++ b/java_tools/configuration_definition_base/src/testFixtures/java/com/rusefi/AssertCompatibility.java @@ -2,6 +2,7 @@ package com.rusefi; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.function.Executable; public class AssertCompatibility { // FACEPALM: between junit4 and junit4 they have changed order of arguments @@ -9,7 +10,31 @@ public class AssertCompatibility { Assertions.assertNotNull(actual, message); } + public static void assertNotNull(Object actual) { + Assertions.assertNotNull(actual); + } + public static void assertEquals(Object expected, Object actual) { Assertions.assertEquals(expected, actual); } + + public static void assertEquals(String message, int expected, int actual) { + Assertions.assertEquals(expected, actual, message); + } + + public static void assertTrue(boolean condition) { + Assertions.assertTrue(condition); + } + + public static void assertFalse(boolean condition) { + Assertions.assertFalse(condition); + } + + public static T assertThrows(Class expectedThrowable, Executable executable) { + return Assertions.assertThrows(expectedThrowable, executable); + } + + public static void assertTrue(String message, boolean condition) { + Assertions.assertTrue(condition, message); + } }