Check for server status

Author: marci4

src/test/java/org/java_websocket/misc/OpeningHandshakeRejectionTest.java

@@ -41,15 +41,14 @@
 import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class OpeningHandshakeRejectionTest {
 
     private int port = -1;
     private Thread thread;
     private ServerSocket serverSocket;
 
-    private final CountDownLatch serverStartCountDownLatch = new CountDownLatch(1);
-
     private static final String additionalHandshake = "Upgrade: websocket\r\nConnection: Upgrade\r\n\r\n";
 
     public void startServer() throws InterruptedException {
@@ -59,7 +58,6 @@ public void startServer() throws InterruptedException {
                     try {
                         serverSocket = new ServerSocket(port);
                         serverSocket.setReuseAddress(true);
-                        serverStartCountDownLatch.countDown();
                         while (true) {
                             Socket client = null;
                             try {
@@ -144,8 +142,12 @@ public void startServer() throws InterruptedException {
 
     @AfterEach
     public void cleanUp() throws IOException {
-        serverSocket.close();
-        thread.interrupt();
+        if (serverSocket != null) {
+            serverSocket.close();
+        }
+        if (thread != null) {
+            thread.interrupt();
+        }
     }
 
     @Test()
@@ -219,9 +221,10 @@ public void testHandshakeRejectionTestCase10() throws Exception {
     public void testHandshakeRejectionTestCase11() throws Exception {
         testHandshakeRejection(11);
     }
+
     private void testHandshakeRejection(int i) throws Exception {
         startServer();
-        this.serverStartCountDownLatch.await();
+        assumeTrue(SocketUtil.waitForServerToStart(this.port));
         final int finalI = i;
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         WebSocketClient webSocketClient = new WebSocketClient(

src/test/java/org/java_websocket/protocols/ProtocolHandshakeRejectionTest.java

@@ -48,13 +48,13 @@
 import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class ProtocolHandshakeRejectionTest {
 
     private static final String additionalHandshake = "HTTP/1.1 101 Websocket Connection Upgrade\r\nUpgrade: websocket\r\nConnection: Upgrade\r\n";
     private Thread thread;
     private ServerSocket serverSocket;
-    private final CountDownLatch serverStartCountDownLatch = new CountDownLatch(1);
 
     private int port = -1;
 
@@ -65,7 +65,6 @@ public void startServer() throws InterruptedException {
                     try {
                         serverSocket = new ServerSocket(port);
                         serverSocket.setReuseAddress(true);
-                        serverStartCountDownLatch.countDown();
                         while (true) {
                             Socket client = null;
                             try {
@@ -268,8 +267,12 @@ private static String getSecKey(String seckey) {
 
     @AfterEach
     public void successTests() throws IOException {
-        serverSocket.close();
-        thread.interrupt();
+        if (serverSocket != null) {
+            serverSocket.close();
+        }
+        if (thread != null) {
+            thread.interrupt();
+        }
     }
 
     @Test()
@@ -491,7 +494,7 @@ public void testHandshakeRejectionTestCase29() throws Exception {
 
     private void testProtocolRejection(int i, Draft_6455 draft) throws Exception {
         startServer();
-        serverStartCountDownLatch.await();
+        assumeTrue(SocketUtil.waitForServerToStart(this.port));
         final int finalI = i;
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         final WebSocketClient webSocketClient = new WebSocketClient(

src/test/java/org/java_websocket/util/SocketUtil.java

@@ -27,6 +27,7 @@
 
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.net.Socket;
 
 public class SocketUtil {
 
@@ -37,6 +38,29 @@ public static int getAvailablePort() throws InterruptedException {
             } catch (IOException e) {
                 // Retry
             }
+            Thread.sleep(5);
         }
     }
+    public static boolean waitForServerToStart(int port) throws InterruptedException {
+        Socket socket = null;
+        for (int i = 0; i < 10; i++) {
+            try {
+                socket = new Socket("localhost", port);
+                if (socket.isConnected()) {
+                    return true;
+                }
+            } catch (IOException ignore) {
+                // Ignore
+            } finally {
+                if (socket != null) {
+                    try {
+                        socket.close();
+                    } catch (IOException ignore) {
+                    }
+                }
+            }
+            Thread.sleep(10);
+        }
+        return false;
+    }
 }