Make tests compile

Author: GoeLin

test/jdk/java/net/httpclient/http2/ConnectionFlowControlTest.java

@@ -123,7 +123,8 @@ void test(String uri) throws Exception {
         System.out.printf("connection window: %s, stream window: %s, will make %s requests%n",
                 connectionWindowSize, windowSize, max);
 
-        try (HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build()) {
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        {
             String label = null;
 
             Throwable t = null;
@@ -153,7 +154,8 @@ void test(String uri) throws Exception {
                     } catch (AssertionError ass) {
                         // since we won't pull all responses, the client
                         // will not exit unless we ask it to shutdown now.
-                        client.shutdownNow();
+                        // HttpClient does not implement shutdownNow in 17.
+                        //client.shutdownNow();
                         throw ass;
                     }
                 }
@@ -181,7 +183,8 @@ void test(String uri) throws Exception {
                     } catch (AssertionError t1) {
                         // since we won't pull all responses, the client
                         // will not exit unless we ask it to shutdown now.
-                        client.shutdownNow();
+                        // HttpClient does not implement shutdownNow in 17.
+                        //client.shutdownNow();
                         throw t1;
                     } catch (Throwable t0) {
                         System.out.println("Got EXPECTED: " + t0);
@@ -194,7 +197,8 @@ void test(String uri) throws Exception {
                         } catch (AssertionError e) {
                             // since we won't pull all responses, the client
                             // will not exit unless we ask it to shutdown now.
-                            client.shutdownNow();
+                            // HttpClient does not implement shutdownNow in 17.
+                            //client.shutdownNow();
                             throw e;
                         }
                     }

test/jdk/java/net/httpclient/http2/StreamFlowControlTest.java

@@ -26,6 +26,7 @@
  * @bug 8342075
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.TestServerConfigurator
  * @run testng/othervm  -Djdk.internal.httpclient.debug=true
  *                      -Djdk.httpclient.connectionWindowSize=65535
  *                      -Djdk.httpclient.windowsize=16384
@@ -142,13 +143,15 @@ void test(String uri,
                     assertDetailMessage(ioe, i);
                 } finally {
                     if (!sameClient && client != null) {
-                        client.close();
+                        // HttpClient does not implement close in 17.
+                        //client.close();
                         client = null;
                     }
                 }
             }
         } finally {
-            if (sameClient && client != null) client.close();
+            // HttpClient does not implement close in 17.
+            //if (sameClient && client != null) client.close();
         }
 
     }
@@ -203,14 +206,16 @@ void testAsync(String uri,
                     t = t0;
                 } finally {
                     if (!sameClient && client != null) {
-                        client.close();
+                        // HttpClient does not implement close in 17.
+                        //client.close();
                         client = null;
                     }
                 }
                 assertDetailMessage(t, i);
             }
         } finally {
-            if (sameClient && client != null) client.close();
+            // HttpClient does not implement close in 17.
+            //if (sameClient && client != null) client.close();
         }
     }