From 7ef52d3cefa8e4ddbe71ca728ae0dbc874781f6d Mon Sep 17 00:00:00 2001 From: pizihao <2335715300@qq.com> Date: Fri, 11 Nov 2022 21:05:41 +0800 Subject: [PATCH] fix : Modify the logic waiting for the server to start in the test --- .../rpc/support/NettyClientSupport.java | 2 +- .../cn/hippo4j/rpc/client/RPCClientTest.java | 14 +++++-------- .../rpc/handler/ConnectHandlerTest.java | 8 +++----- .../cn/hippo4j/rpc/server/RPCServerTest.java | 14 +++++-------- .../rpc/support/NettyConnectPoolTest.java | 20 +++++++------------ .../rpc/support/NettyServerSupportTest.java | 8 +++----- 6 files changed, 24 insertions(+), 42 deletions(-) diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java index f83e0bb7..d11530f4 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java @@ -98,7 +98,7 @@ public final class NettyClientSupport { public static void closeClient(InetSocketAddress address) { Client client = clientMap.remove(address); try { - if (client != null){ + if (client != null) { client.close(); } } catch (IOException e) { diff --git a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/client/RPCClientTest.java b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/client/RPCClientTest.java index 867a3826..b2002f04 100644 --- a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/client/RPCClientTest.java +++ b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/client/RPCClientTest.java @@ -17,6 +17,7 @@ package cn.hippo4j.rpc.client; +import cn.hippo4j.common.toolkit.ThreadUtil; import cn.hippo4j.rpc.discovery.ClassRegistry; import cn.hippo4j.rpc.discovery.DefaultInstance; import cn.hippo4j.rpc.discovery.Instance; @@ -36,7 +37,6 @@ import org.junit.Test; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; public class RPCClientTest { @@ -58,10 +58,8 @@ public class RPCClientTest { ServerConnection connection = new NettyServerConnection(handler); RPCServer rpcServer = new RPCServer(connection, portTest); rpcServer.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved(host, portTest.getPort()); ChannelPoolHandler channelPoolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); @@ -93,10 +91,8 @@ public class RPCClientTest { ServerConnection connection = new NettyServerConnection(handler); RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved(host, port.getPort()); ChannelPoolHandler channelPoolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); diff --git a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/handler/ConnectHandlerTest.java b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/handler/ConnectHandlerTest.java index 1d4ef3b8..1b40366a 100644 --- a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/handler/ConnectHandlerTest.java +++ b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/handler/ConnectHandlerTest.java @@ -17,6 +17,7 @@ package cn.hippo4j.rpc.handler; +import cn.hippo4j.common.toolkit.ThreadUtil; import cn.hippo4j.rpc.client.NettyClientConnection; import cn.hippo4j.rpc.client.RPCClient; import cn.hippo4j.rpc.discovery.*; @@ -29,7 +30,6 @@ import org.junit.Test; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; public class ConnectHandlerTest { @@ -44,10 +44,8 @@ public class ConnectHandlerTest { NettyServerConnection connection = new NettyServerConnection(serverHandler); RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved("localhost", port.getPort()); ChannelPoolHandler channelPoolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); diff --git a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/server/RPCServerTest.java b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/server/RPCServerTest.java index e2f76240..4b82de8b 100644 --- a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/server/RPCServerTest.java +++ b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/server/RPCServerTest.java @@ -17,6 +17,7 @@ package cn.hippo4j.rpc.server; +import cn.hippo4j.common.toolkit.ThreadUtil; import cn.hippo4j.rpc.discovery.DefaultInstance; import cn.hippo4j.rpc.discovery.Instance; import cn.hippo4j.rpc.discovery.ServerPort; @@ -27,7 +28,6 @@ import org.junit.Assert; import org.junit.Test; import java.io.IOException; -import java.util.concurrent.TimeUnit; public class RPCServerTest { @@ -41,10 +41,8 @@ public class RPCServerTest { ServerConnection connection = new NettyServerConnection(handler); RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } boolean active = rpcServer.isActive(); Assert.assertTrue(active); @@ -62,10 +60,8 @@ public class RPCServerTest { ServerConnection connection = new NettyServerConnection(leader, worker, handler); RPCServer rpcServer = new RPCServer(connection, portTest); rpcServer.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } boolean active = rpcServer.isActive(); Assert.assertTrue(active); diff --git a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyConnectPoolTest.java b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyConnectPoolTest.java index 2806e40a..b9a0685f 100644 --- a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyConnectPoolTest.java +++ b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyConnectPoolTest.java @@ -17,6 +17,7 @@ package cn.hippo4j.rpc.support; +import cn.hippo4j.common.toolkit.ThreadUtil; import cn.hippo4j.rpc.discovery.DefaultInstance; import cn.hippo4j.rpc.discovery.Instance; import cn.hippo4j.rpc.discovery.ServerPort; @@ -36,7 +37,6 @@ import org.junit.Test; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.concurrent.TimeUnit; public class NettyConnectPoolTest { @@ -56,10 +56,8 @@ public class NettyConnectPoolTest { RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); // Given the delay in starting the server, wait here - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved(host, port.getPort()); NettyClientPoolHandler poolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); @@ -79,10 +77,8 @@ public class NettyConnectPoolTest { RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); // Given the delay in starting the server, wait here - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved(host, port.getPort()); NettyClientPoolHandler poolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); @@ -101,10 +97,8 @@ public class NettyConnectPoolTest { RPCServer rpcServer = new RPCServer(connection, port); rpcServer.bind(); // Given the delay in starting the server, wait here - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!rpcServer.isActive()) { + ThreadUtil.sleep(100L); } InetSocketAddress address = InetSocketAddress.createUnresolved(host, port.getPort()); NettyClientPoolHandler poolHandler = new NettyClientPoolHandler(new NettyClientTakeHandler()); diff --git a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyServerSupportTest.java b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyServerSupportTest.java index 5f66f865..32dc81d8 100644 --- a/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyServerSupportTest.java +++ b/hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyServerSupportTest.java @@ -17,12 +17,12 @@ package cn.hippo4j.rpc.support; +import cn.hippo4j.common.toolkit.ThreadUtil; import cn.hippo4j.rpc.discovery.InstanceServerLoader; import org.junit.Assert; import org.junit.Test; import java.io.IOException; -import java.util.concurrent.TimeUnit; public class NettyServerSupportTest { @@ -30,10 +30,8 @@ public class NettyServerSupportTest { public void bind() throws IOException { NettyServerSupport support = new NettyServerSupport(() -> 8891, InstanceServerLoader.class); support.bind(); - try { - TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - throw new RuntimeException(e); + while (!support.isActive()) { + ThreadUtil.sleep(100L); } Assert.assertTrue(support.isActive()); support.close();