Try to stabilize SocketUtil

Author: marci4

src/test/java/org/java_websocket/client/ConnectBlockingTest.java

@@ -34,6 +34,7 @@ public void test_ConnectBlockingCleanup() throws Throwable {
             public void run() {
                 try {
                     ServerSocket serverSocket = new ServerSocket(port);
+                    serverSocket.setReuseAddress(true);
                     ready.countDown();
                     Socket clientSocket = serverSocket.accept();
                     accepted.countDown();

src/test/java/org/java_websocket/issues/Issue713Test.java

@@ -50,7 +50,7 @@ public class Issue713Test {
   CountDownLatch countDownLatchBytebuffer = new CountDownLatch(10);
 
   @Test
-  public void testIllegalArgument() throws IOException {
+  public void testIllegalArgument() throws  InterruptedException {
     WebSocketServer server = new WebSocketServer(
         new InetSocketAddress(SocketUtil.getAvailablePort())) {
       @Override

src/test/java/org/java_websocket/issues/Issue834Test.java

@@ -17,7 +17,7 @@ public class Issue834Test {
 
   @Test()
   @Timeout(1000)
-  public void testNoNewThreads() throws IOException {
+  public void testNoNewThreads() throws InterruptedException {
 
     Set<Thread> threadSet1 = Thread.getAllStackTraces().keySet();
 

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

@@ -51,7 +51,7 @@ public class OpeningHandshakeRejectionTest {
   private static final String additionalHandshake = "Upgrade: websocket\r\nConnection: Upgrade\r\n\r\n";
 
   @BeforeEach
-  public void startServer() throws IOException {
+  public void startServer() throws IOException, InterruptedException {
     port = SocketUtil.getAvailablePort();
     thread = new Thread(
         new Runnable() {
@@ -218,6 +218,9 @@ public void testHandshakeRejectionTestCase11() throws Exception {
   }
 
   private void testHandshakeRejection(int i) throws Exception {
+    do {
+      Thread.sleep(100);
+    }  while(serverSocket == null || !serverSocket.isBound());
     final int finalI = i;
     final CountDownLatch countDownLatch = new CountDownLatch(1);
     WebSocketClient webSocketClient = new WebSocketClient(

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

@@ -58,7 +58,7 @@ public class ProtocolHandshakeRejectionTest {
   private int port;
 
   @BeforeEach
-  public void startServer() {
+  public void startServer() throws InterruptedException {
     port = SocketUtil.getAvailablePort();
     thread = new Thread(
         new Runnable() {
@@ -489,7 +489,7 @@ public void testHandshakeRejectionTestCase29() throws Exception {
 
   private void testProtocolRejection(int i, Draft_6455 draft) throws Exception {
     do {
-      Thread.sleep(10);
+      Thread.sleep(100);
     }  while(serverSocket == null || !serverSocket.isBound());
     final int finalI = i;
     final CountDownLatch countDownLatch = new CountDownLatch(1);

src/test/java/org/java_websocket/server/DaemonThreadTest.java

@@ -17,7 +17,7 @@ public class DaemonThreadTest {
 
   @Test()
   @Timeout(1000)
-  public void test_AllCreatedThreadsAreDaemon() throws Throwable {
+  public void test_AllCreatedThreadsAreDaemon() throws InterruptedException {
 
     Set<Thread> threadSet1 = Thread.getAllStackTraces().keySet();
     final CountDownLatch ready = new CountDownLatch(1);

src/test/java/org/java_websocket/server/WebSocketServerTest.java

@@ -110,7 +110,7 @@ public void testConstructor() {
 
 
   @Test
-  public void testGetAddress() throws IOException {
+  public void testGetAddress() throws  InterruptedException {
     int port = SocketUtil.getAvailablePort();
     InetSocketAddress inetSocketAddress = new InetSocketAddress(port);
     MyWebSocketServer server = new MyWebSocketServer(port);

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

@@ -30,12 +30,13 @@
 
 public class SocketUtil {
 
-    public static int getAvailablePort() {
+    public static int getAvailablePort() throws InterruptedException {
         while (true) {
             try (ServerSocket srv = new ServerSocket(0)) {
                 return srv.getLocalPort();
             } catch (IOException e) {
-                // Ignore
+                // Retry
+                Thread.sleep(50);
             }
         }
     }