Better exception message for ShutdownNow

dfuch · Aug 22, 2024 · da64bb8 · da64bb8
1 parent 0436091
commit da64bb8
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/test/jdk/java/net/httpclient/ShutdownNow.java b/test/jdk/java/net/httpclient/ShutdownNow.java
@@ -210,15 +210,16 @@ void testConcurrent(String uriString) throws Exception {
             }
             CompletableFuture.allOf(responses.toArray(new CompletableFuture<?>[0])).get();
         } finally {
-            if (client.awaitTermination(Duration.ofMillis(2000))) {
+            if (client.awaitTermination(Duration.ofMillis(2500))) {
                 out.println("Client terminated within expected delay");
+                assertTrue(client.isTerminated());
             } else {
-                System.out.println(TRACKER.diagnose(client));
-                if (client.awaitTermination(Duration.ofMillis(500))) {
-                    throw new AssertionError("client still running: " + TRACKER.diagnose(client));
-                }
+                client = null;
+                var error = TRACKER.check(500);
+                if (error != null) throw error;
+                throw new AssertionError("client was still running, but exited after further delay: "
+                        + "timeout should be adjusted");
             }
-            assertTrue(client.isTerminated());
         }
     }
 
@@ -275,15 +276,16 @@ void testSequential(String uriString) throws Exception {
                 }).thenCompose((c) -> c).get();
             }
        } finally {
-            if (client.awaitTermination(Duration.ofMillis(2000))) {
+            if (client.awaitTermination(Duration.ofMillis(2500))) {
                 out.println("Client terminated within expected delay");
+                assertTrue(client.isTerminated());
             } else {
-                System.out.println(TRACKER.diagnose(client));
-                if (client.awaitTermination(Duration.ofMillis(500))) {
-                    throw new AssertionError("client still running: " + TRACKER.diagnose(client));
-                }
+                client = null;
+                var error = TRACKER.check(500);
+                if (error != null) throw error;
+                throw new AssertionError("client was still running, but exited after further delay: "
+                        + "timeout should be adjusted");
             }
-            assertTrue(client.isTerminated());
         }
     }