Make Issue825Test more stable (TooTallNate#894)

marci4 · web-flow · commit f3d299f80152 · 2019-06-11T07:51:51.000+02:00
Make Issue825Test more stable
diff --git a/src/test/java/org/java_websocket/issues/Issue825Test.java b/src/test/java/org/java_websocket/issues/Issue825Test.java
@@ -49,15 +49,18 @@
 import java.util.concurrent.CountDownLatch;
 
 public class Issue825Test{
- private CountDownLatch countClientDownLatch = new CountDownLatch(3);
- private CountDownLatch countServerDownLatch = new CountDownLatch(1);
+
 
 @Test(timeout = 15000)
 public void testIssue() throws IOException, URISyntaxException, KeyStoreException, NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, CertificateException, InterruptedException{
+ final CountDownLatch countClientOpenLatch = new CountDownLatch(3);
+ final CountDownLatch countClientMessageLatch = new CountDownLatch(3);
+ final CountDownLatch countServerDownLatch = new CountDownLatch(1);
 int port = SocketUtil.getAvailablePort();
 final WebSocketClient webSocket = new WebSocketClient(new URI("wss://localhost:" + port)){
 @Override
 public void onOpen(ServerHandshake handshakedata){
+ countClientOpenLatch.countDown();
 }
 
 @Override
@@ -72,7 +75,7 @@ public void onClose(int code, String reason, boolean remote){
 public void onError(Exception ex){
 }
 };
- WebSocketServer server = new MyWebSocketServer(port, countServerDownLatch, countClientDownLatch);
+ WebSocketServer server = new MyWebSocketServer(port, countServerDownLatch, countClientMessageLatch);
 
 // load up the key store
 String STORETYPE = "JKS";
@@ -109,23 +112,23 @@ public void onError(Exception ex){
 webSocket.closeBlocking();
 //Disconnect manually and reconnect
 webSocket.reconnect();
- Thread.sleep( 100 );
+ countClientOpenLatch.await();
 webSocket.send( "me" );
 Thread.sleep( 100 );
 webSocket.closeBlocking();
- countClientDownLatch.await();
+ countClientMessageLatch.await();
 }
 
 
 private static class MyWebSocketServer extends WebSocketServer{
- private final CountDownLatch countServerDownLatch;
- private final CountDownLatch countClientDownLatch;
+ private final CountDownLatch countServerLatch;
+ private final CountDownLatch countClientMessageLatch;
 
 
- public MyWebSocketServer(int port, CountDownLatch serverDownLatch, CountDownLatch countClientDownLatch){
+ public MyWebSocketServer(int port, CountDownLatch serverDownLatch, CountDownLatch countClientMessageLatch){
 super(new InetSocketAddress(port));
- this.countServerDownLatch = serverDownLatch;
- this.countClientDownLatch = countClientDownLatch;
+ this.countServerLatch = serverDownLatch;
+ this.countClientMessageLatch = countClientMessageLatch;
 }
 
 @Override
@@ -138,7 +141,7 @@ public void onClose(WebSocket conn, int code, String reason, boolean remote){
 
 @Override
 public void onMessage(WebSocket conn, String message){
- countClientDownLatch.countDown();
+ countClientMessageLatch.countDown();
 }
 
 @Override
@@ -148,7 +151,7 @@ public void onError(WebSocket conn, Exception ex){
 
 @Override
 public void onStart(){
- countServerDownLatch.countDown();
+ countServerLatch.countDown();
 }
 }
 }

-Original file line number
+Diff line change
 importjava.util.concurrent.CountDownLatch;
 publicclassIssue825Test{
 -privateCountDownLatchcountClientDownLatch = newCountDownLatch(3);
 -privateCountDownLatchcountServerDownLatch = newCountDownLatch(1);
++
 @Test(timeout = 15000)
 publicvoidtestIssue() throwsIOException, URISyntaxException, KeyStoreException, NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, CertificateException, InterruptedException{
 +finalCountDownLatchcountClientOpenLatch = newCountDownLatch(3);
 +finalCountDownLatchcountClientMessageLatch = newCountDownLatch(3);
 +finalCountDownLatchcountServerDownLatch = newCountDownLatch(1);
 intport = SocketUtil.getAvailablePort();
 finalWebSocketClientwebSocket = newWebSocketClient(newURI("wss://localhost:" + port)){
 @Override
 publicvoidonOpen(ServerHandshakehandshakedata){
 +countClientOpenLatch.countDown();
+ }
 @Override
 publicvoidonError(Exceptionex){
+ }
  };
 -WebSocketServerserver = newMyWebSocketServer(port, countServerDownLatch, countClientDownLatch);
 +WebSocketServerserver = newMyWebSocketServer(port, countServerDownLatch, countClientMessageLatch);
 // load up the key store
 StringSTORETYPE = "JKS";
 webSocket.closeBlocking();
 //Disconnect manually and reconnect
 webSocket.reconnect();
 -Thread.sleep( 100);
 +countClientOpenLatch.await();
 webSocket.send( "me" );
 Thread.sleep( 100 );
 webSocket.closeBlocking();
 -countClientDownLatch.await();
 +countClientMessageLatch.await();
+ }
 privatestaticclassMyWebSocketServerextendsWebSocketServer{
 -privatefinalCountDownLatchcountServerDownLatch;
 -privatefinalCountDownLatchcountClientDownLatch;
 +privatefinalCountDownLatchcountServerLatch;
 +privatefinalCountDownLatchcountClientMessageLatch;
 -publicMyWebSocketServer(intport, CountDownLatchserverDownLatch, CountDownLatchcountClientDownLatch){
 +publicMyWebSocketServer(intport, CountDownLatchserverDownLatch, CountDownLatchcountClientMessageLatch){
 super(newInetSocketAddress(port));
 -this.countServerDownLatch = serverDownLatch;
 -this.countClientDownLatch = countClientDownLatch;
 +this.countServerLatch = serverDownLatch;
 +this.countClientMessageLatch = countClientMessageLatch;
+ }
 @Override
 @Override
 publicvoidonMessage(WebSocketconn, Stringmessage){
 -countClientDownLatch.countDown();
 +countClientMessageLatch.countDown();
+ }
 @Override
 @Override
 publicvoidonStart(){
 -countServerDownLatch.countDown();
 +countServerLatch.countDown();
+ }
+ }
+}