Adjust logging

TooTallNate · Dec 31, 2024 · c949bdd · c949bdd
1 parent 8a8bacd
commit c949bdd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/test/java/org/java_websocket/misc/OpeningHandshakeRejectionTest.java b/src/test/java/org/java_websocket/misc/OpeningHandshakeRejectionTest.java
@@ -266,12 +266,28 @@ public void onClose(int code, String reason, boolean remote) {
 
       @Override
       public void onError(Exception ex) {
-        fail("There should not be an exception");
+        fail("There should not be an exception: " + ex.getMessage());
       }
     };
-    Thread finalThread = new Thread(webSocketClient);
+    final AssertionError[] exc = new AssertionError[1];
+    exc[0] = null;
+    Thread finalThread = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          webSocketClient.run();
+        }catch(AssertionError e){
+          exc[0] = e;
+          countDownLatch.countDown();
+        }
+      }
+
+    });
     finalThread.start();
     finalThread.join();
+    if (exc[0] != null) {
+      throw exc[0];
+    }
     countDownLatch.await();
   }
 }
diff --git a/src/test/java/org/java_websocket/protocols/ProtocolHandshakeRejectionTest.java b/src/test/java/org/java_websocket/protocols/ProtocolHandshakeRejectionTest.java
@@ -615,7 +615,7 @@ public void onClose(int code, String reason, boolean remote) {
 
       @Override
       public void onError(Exception ex) {
-        fail("There should not be an exception");
+        fail("There should not be an exception: " + ex.getMessage());
       }
     };
     final AssertionError[] exc = new AssertionError[1];
@@ -627,6 +627,7 @@ public void run() {
           webSocketClient.run();
         }catch(AssertionError e){
           exc[0] = e;
+          countDownLatch.countDown();
         }
       }