From 312c126ba93f55b358fbd67ac0d646c929865dd0 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 8 Aug 2020 19:55:32 -0400 Subject: [PATCH] more better test termination --- java_console/ui/src/test/java/com/rusefi/FullServerTest.java | 5 +++-- .../src/test/java/com/rusefi/proxy/NetworkConnectorTest.java | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/java_console/ui/src/test/java/com/rusefi/FullServerTest.java b/java_console/ui/src/test/java/com/rusefi/FullServerTest.java index 6dd7ee64bb..4cd5fa6440 100644 --- a/java_console/ui/src/test/java/com/rusefi/FullServerTest.java +++ b/java_console/ui/src/test/java/com/rusefi/FullServerTest.java @@ -80,7 +80,8 @@ public class FullServerTest { super.close(applicationConnectionState); applicationClosed.countDown(); } - }; LinkManager clientManager = new LinkManager().setNeedPullData(false)) { + }; LinkManager clientManager = new LinkManager().setNeedPullData(false); + NetworkConnector networkConnector = new NetworkConnector()) { int serverPortForControllers = 7001; @@ -101,7 +102,7 @@ public class FullServerTest { }; // start "rusEFI network connector" to connect controller with backend since in real life controller has only local serial port it does not have network - NetworkConnector.NetworkConnectorResult networkConnectorResult = new NetworkConnector().start(TestHelper.TEST_TOKEN_1, TestHelper.LOCALHOST + ":" + controllerPort, networkConnectorContext, NetworkConnector.ReconnectListener.VOID); + NetworkConnector.NetworkConnectorResult networkConnectorResult = networkConnector.start(TestHelper.TEST_TOKEN_1, TestHelper.LOCALHOST + ":" + controllerPort, networkConnectorContext, NetworkConnector.ReconnectListener.VOID); ControllerInfo controllerInfo = networkConnectorResult.getControllerInfo(); TestHelper.assertLatch("controllerRegistered", controllerRegistered); diff --git a/java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java b/java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java index 19ab1938e0..3555bf8dd0 100644 --- a/java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java +++ b/java_console/ui/src/test/java/com/rusefi/proxy/NetworkConnectorTest.java @@ -75,7 +75,8 @@ public class NetworkConnectorTest { reconnectCounter.countDown(); } }; - new NetworkConnector().start(TestHelper.TEST_TOKEN_1, TestHelper.LOCALHOST + ":" + controllerPort, connectorContext, reconnectListener); + NetworkConnector networkConnector = new NetworkConnector(); + networkConnector.start(TestHelper.TEST_TOKEN_1, TestHelper.LOCALHOST + ":" + controllerPort, connectorContext, reconnectListener); assertLatch(reconnectCounter); @@ -89,6 +90,7 @@ public class NetworkConnectorTest { // now let's do this again with a new backend instance log.info("Second backend instance"); assertWouldConnect(serverPortForControllers, httpPort); + networkConnector.close(); } private void assertWouldConnect(int serverPortForControllers, int httpPort) throws InterruptedException {