Use CountDownLatch

Author: marci4

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

@@ -31,6 +31,8 @@
 import java.net.Socket;
 import java.net.URI;
 import java.util.Scanner;
+import java.util.concurrent.CountDownLatch;
+
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.handshake.ServerHandshake;
@@ -46,7 +48,6 @@
 public class OpeningHandshakeRejectionTest {
 
   private static final String additionalHandshake = "Upgrade: websocket\r\nConnection: Upgrade\r\n\r\n";
-  private static int counter = 0;
   private static Thread thread;
   private static ServerSocket serverSocket;
 
@@ -144,12 +145,9 @@ public void run() {
   }
 
   @AfterAll
-  public static void successTests() throws InterruptedException, IOException {
+  public static void successTests() throws  IOException {
     serverSocket.close();
     thread.interrupt();
-    if (debugPrintouts) {
-      System.out.println(counter + " successful tests");
-    }
   }
 
   @Test()
@@ -226,7 +224,7 @@ public void testHandshakeRejectionTestCase11() throws Exception {
 
   private void testHandshakeRejection(int i) throws Exception {
     final int finalI = i;
-    final boolean[] threadReturned = {false};
+    final CountDownLatch countDownLatch = new CountDownLatch(1);
     WebSocketClient webSocketClient = new WebSocketClient(
         new URI("ws://localhost:" + port + "/" + finalI)) {
       @Override
@@ -249,8 +247,7 @@ public void onClose(int code, String reason, boolean remote) {
             if (debugPrintouts) {
               System.out.println("Protocol error for test case: " + finalI);
             }
-            threadReturned[0] = true;
-            counter++;
+            countDownLatch.countDown();
           } else {
             fail("The reason should be included!");
           }
@@ -262,8 +259,7 @@ public void onClose(int code, String reason, boolean remote) {
             if (debugPrintouts) {
               System.out.println("Refuses handshake error for test case: " + finalI);
             }
-            counter++;
-            threadReturned[0] = true;
+            countDownLatch.countDown();
           }
         }
       }
@@ -276,9 +272,6 @@ public void onError(Exception ex) {
     Thread finalThread = new Thread(webSocketClient);
     finalThread.start();
     finalThread.join();
-
-    if (!threadReturned[0]) {
-      fail("Error. Thread did not yet return");
-    }
+    countDownLatch.await();
   }
 }

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

@@ -35,6 +35,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Scanner;
+import java.util.concurrent.CountDownLatch;
+
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.extensions.IExtension;
@@ -490,7 +492,7 @@ public void testHandshakeRejectionTestCase29() throws Exception {
 
   private void testProtocolRejection(int i, Draft_6455 draft) throws Exception {
     final int finalI = i;
-    final boolean[] threadReturned = {false};
+    final CountDownLatch countDownLatch = new CountDownLatch(1);
     final WebSocketClient webSocketClient = new WebSocketClient(
         new URI("ws://localhost:" + port + "/" + finalI), draft) {
       @Override
@@ -516,7 +518,7 @@ public void onOpen(ServerHandshake handshakedata) {
           case 24:
           case 25:
           case 26:
-            threadReturned[0] = true;
+            countDownLatch.countDown();
             closeConnection(CloseFrame.ABNORMAL_CLOSE, "Bye");
             break;
           default:
@@ -605,7 +607,7 @@ public void onClose(int code, String reason, boolean remote) {
         if (code != CloseFrame.PROTOCOL_ERROR) {
           fail("There should be a protocol error! " + finalI + " " + code);
         } else if (reason.endsWith("refuses handshake")) {
-          threadReturned[0] = true;
+          countDownLatch.countDown();
         } else {
           fail("The reason should be included!");
         }
@@ -635,9 +637,7 @@ public void run() {
       throw exc[0];
     }
 
-    if (!threadReturned[0]) {
-      fail("Error");
-    }
+    countDownLatch.await();
 
   }