test/java/net/httpclient/APIErrors.java

*** 24,33 ****
--- 24,34 ----
  /**
   * @test
   * @bug 8087112
   * @library /lib/testlibrary/
   * @build jdk.testlibrary.SimpleSSLContext ProxyServer
+  * @build TestKit
   * @compile ../../../com/sun/net/httpserver/LogFilter.java
   * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
   * @run main/othervm APIErrors
   */
  //package javaapplication16;
*** 71,100 ****
              for (HttpClient client : clients)
                  client.executorService().shutdownNow();
          }
      }
  
-     static void reject(Runnable r, Class<? extends Exception> extype) {
-         try {
-             r.run();
-             throw new RuntimeException("Expected: " + extype);
-         } catch (Throwable t) {
-             if (!extype.isAssignableFrom(t.getClass())) {
-                 throw new RuntimeException("Wrong exception type: " + extype + " / "
-                     +t.getClass());
-             }
-         }
-     }
- 
-     static void accept(Runnable r) {
-         try {
-             r.run();
-         } catch (Throwable t) {
-             throw new RuntimeException("Unexpected exception: " + t);
-         }
-     }
- 
      static void checkNonNull(Supplier<?> r) {
          if (r.get() == null)
              throw new RuntimeException("Unexpected null return:");
      }
  
--- 72,81 ----
*** 106,121 ****
      // HttpClient.Builder
      static void test1() throws Exception {
          System.out.println("Test 1");
          HttpClient.Builder cb = HttpClient.create();
          InetSocketAddress addr = new InetSocketAddress("127.0.0.1", 5000);
!         reject(() -> { cb.priority(-1);}, IllegalArgumentException.class);
!         reject(() -> { cb.priority(500);}, IllegalArgumentException.class);
!         accept(() -> { cb.priority(1);});
!         accept(() -> { cb.priority(255);});
! 
!         accept(() -> {clients.add(cb.build()); clients.add(cb.build());});
      }
  
      static void test2() throws Exception {
          System.out.println("Test 2");
          HttpClient.Builder cb = HttpClient.create();
--- 87,104 ----
      // HttpClient.Builder
      static void test1() throws Exception {
          System.out.println("Test 1");
          HttpClient.Builder cb = HttpClient.create();
          InetSocketAddress addr = new InetSocketAddress("127.0.0.1", 5000);
!         TestKit.assertThrows(IllegalArgumentException.class, () -> cb.priority(-1));
!         TestKit.assertThrows(IllegalArgumentException.class, () -> cb.priority(500));
!         TestKit.assertNotThrows(() -> cb.priority(1));
!         TestKit.assertNotThrows(() -> cb.priority(255));
!         TestKit.assertNotThrows(() -> {
!             clients.add(cb.build());
!             clients.add(cb.build());
!         });
      }
  
      static void test2() throws Exception {
          System.out.println("Test 2");
          HttpClient.Builder cb = HttpClient.create();
*** 137,174 ****
                  .GET();
      }
  
      static void test3() throws Exception {
          System.out.println("Test 3");
!         reject(()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp = r1.response();
                  HttpResponse resp1 = r1.response();
              } catch (IOException |InterruptedException e) {
                  throw new RuntimeException(e);
              }
!         }, IllegalStateException.class);
  
!         reject(()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp = r1.response();
                  HttpResponse resp1 = r1.responseAsync().get();
              } catch (IOException |InterruptedException | ExecutionException e) {
                  throw new RuntimeException(e);
              }
!         }, IllegalStateException.class);
!         reject(()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp1 = r1.responseAsync().get();
                  HttpResponse resp = r1.response();
              } catch (IOException |InterruptedException | ExecutionException e) {
                  throw new RuntimeException(e);
              }
!         }, IllegalStateException.class);
      }
  
      static class Auth extends java.net.Authenticator {
          int count = 0;
          @Override
--- 120,157 ----
                  .GET();
      }
  
      static void test3() throws Exception {
          System.out.println("Test 3");
!         TestKit.assertThrows(IllegalStateException.class, ()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp = r1.response();
                  HttpResponse resp1 = r1.response();
              } catch (IOException |InterruptedException e) {
                  throw new RuntimeException(e);
              }
!         });
  
!         TestKit.assertThrows(IllegalStateException.class, ()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp = r1.response();
                  HttpResponse resp1 = r1.responseAsync().get();
              } catch (IOException |InterruptedException | ExecutionException e) {
                  throw new RuntimeException(e);
              }
!         });
!         TestKit.assertThrows(IllegalStateException.class, ()-> {
              try {
                  HttpRequest r1 = request();
                  HttpResponse resp1 = r1.responseAsync().get();
                  HttpResponse resp = r1.response();
              } catch (IOException |InterruptedException | ExecutionException e) {
                  throw new RuntimeException(e);
              }
!         });
      }
  
      static class Auth extends java.net.Authenticator {
          int count = 0;
          @Override