Use latches to wait for server setup

Author: marci4

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

@@ -40,7 +40,6 @@
 import org.java_websocket.util.SocketUtil;
 import org.junit.jupiter.api.*;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class OpeningHandshakeRejectionTest {
@@ -49,28 +48,27 @@ public class OpeningHandshakeRejectionTest {
     private Thread thread;
     private ServerSocket serverSocket;
 
-    private boolean beforeeach_called;
+    private final CountDownLatch serverStartCountDownLatch = new CountDownLatch(1);
 
     private static final String additionalHandshake = "Upgrade: websocket\r\nConnection: Upgrade\r\n\r\n";
 
     @BeforeEach
-    public void startServer() {
-
-        try {
-            port = SocketUtil.getAvailablePort();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        thread = new Thread(
+    public void startServer() throws InterruptedException {
+        this.port = SocketUtil.getAvailablePort();
+        this.thread = new Thread(
                 () -> {
                     try {
                         serverSocket = new ServerSocket(port);
                         serverSocket.setReuseAddress(true);
+                        serverStartCountDownLatch.countDown();
                         while (true) {
                             Socket client = null;
                             try {
                                 client = serverSocket.accept();
                                 Scanner in = new Scanner(client.getInputStream());
+                                if (!in.hasNextLine()) {
+                                    continue;
+                                }
                                 String input = in.nextLine();
                                 String testCase = input.split(" ")[1];
                                 OutputStream os = client.getOutputStream();
@@ -142,8 +140,7 @@ public void startServer() {
                         fail("There should not be an exception: " + e.getMessage() + " Port: " + port);
                     }
                 });
-        thread.start();
-        beforeeach_called = true;
+        this.thread.start();
     }
 
     @AfterEach
@@ -223,13 +220,12 @@ public void testHandshakeRejectionTestCase10() throws Exception {
     public void testHandshakeRejectionTestCase11() throws Exception {
         testHandshakeRejection(11);
     }
-
     private void testHandshakeRejection(int i) throws Exception {
-        assertTrue(beforeeach_called, "BeforeEach is called");
+        this.serverStartCountDownLatch.await();
         final int finalI = i;
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         WebSocketClient webSocketClient = new WebSocketClient(
-                new URI("ws://localhost:" + port + "/" + finalI)) {
+                new URI("ws://localhost:" + this.port + "/" + finalI)) {
             @Override
             public void onOpen(ServerHandshake handshakedata) {
                 fail("There should not be a connection!");

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

@@ -54,26 +54,27 @@ 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;
 
     @BeforeEach
-    public void startServer()  {
-        try {
-            port = SocketUtil.getAvailablePort();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+    public void startServer() throws InterruptedException {
+        port = SocketUtil.getAvailablePort();
         thread = new Thread(
                 () -> {
                     try {
                         serverSocket = new ServerSocket(port);
                         serverSocket.setReuseAddress(true);
+                        serverStartCountDownLatch.countDown();
                         while (true) {
                             Socket client = null;
                             try {
                                 client = serverSocket.accept();
                                 Scanner in = new Scanner(client.getInputStream());
+                                if (!in.hasNextLine()) {
+                                    continue;
+                                }
                                 String input = in.nextLine();
                                 String testCase = input.split(" ")[1];
                                 String seckey = "";
@@ -490,6 +491,7 @@ public void testHandshakeRejectionTestCase29() throws Exception {
     }
 
     private void testProtocolRejection(int i, Draft_6455 draft) throws Exception {
+        serverStartCountDownLatch.await();
         final int finalI = i;
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         final WebSocketClient webSocketClient = new WebSocketClient(