msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

fix : Modify the logic waiting for the server to start in the test

Browse Source
pull/973/head
pizihao 3 years ago
parent 8f2d9f94d1
commit 7ef52d3cef
6 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
Unescape View File

@ -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) {

14
hippo4j-rpc/src/test/java/cn/hippo4j/rpc/client/RPCClientTest.java
Unescape View File

@ -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());

8
hippo4j-rpc/src/test/java/cn/hippo4j/rpc/handler/ConnectHandlerTest.java
Unescape View File

@ -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());

14
hippo4j-rpc/src/test/java/cn/hippo4j/rpc/server/RPCServerTest.java
Unescape View File

@ -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);

20
hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyConnectPoolTest.java
Unescape View File

@ -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());

8
hippo4j-rpc/src/test/java/cn/hippo4j/rpc/support/NettyServerSupportTest.java
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save