From a191d583d20860d97c3bbb05fbf0a6c22a2eeccc Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 15 Oct 2022 15:48:14 -0400 Subject: [PATCH] let's separate Android from not Android --- .../{test => testFixtures}/java/com/rusefi/TestHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename java_console/io/src/{test => testFixtures}/java/com/rusefi/TestHelper.java (96%) diff --git a/java_console/io/src/test/java/com/rusefi/TestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java similarity index 96% rename from java_console/io/src/test/java/com/rusefi/TestHelper.java rename to java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java index 34cc9d67c2..f562e3209a 100644 --- a/java_console/io/src/test/java/com/rusefi/TestHelper.java +++ b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java @@ -31,6 +31,7 @@ import static com.rusefi.Timeouts.READ_IMAGE_TIMEOUT; import static com.rusefi.config.generated.Fields.TS_FILE_VERSION; import static com.rusefi.config.generated.Fields.TS_FILE_VERSION_OFFSET; import static com.rusefi.io.tcp.TcpConnector.LOCALHOST; +import org.junit.Assert; import static org.junit.Assert.assertTrue; public class TestHelper extends MockitoTestHelper { @@ -114,13 +115,13 @@ public class TestHelper extends MockitoTestHelper { } public static void assertLatch(String message, CountDownLatch reconnectCounter, int timeout) throws InterruptedException { - assertTrue(message, reconnectCounter.await(timeout, TimeUnit.MILLISECONDS)); + Assert.assertTrue(message, reconnectCounter.await(timeout, TimeUnit.MILLISECONDS)); log.info("*******************"); log.info(message + " is good"); log.info("*******************"); } public static void assertLatch(CountDownLatch reconnectCounter) throws InterruptedException { - assertTrue(reconnectCounter.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS)); + Assert.assertTrue(reconnectCounter.await(READ_IMAGE_TIMEOUT, TimeUnit.MILLISECONDS)); } }