test/java/net/httpclient/SmokeTest.java

*** 22,40 ****
   */
  
  /**
   * @test
   * @bug 8087112
!  * @library /lib/testlibrary/
!  * @build jdk.testlibrary.SimpleSSLContext ProxyServer
   * @compile ../../../com/sun/net/httpserver/LogFilter.java
   * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
   * @run main/othervm SmokeTest
   */
  
- //package javaapplication16;
- 
  import com.sun.net.httpserver.*;
  import java.net.*;
  import java.net.http.*;
  import java.io.*;
  import java.util.concurrent.*;
--- 22,38 ----
   */
  
  /**
   * @test
   * @bug 8087112
!  * @library /lib/testlibrary/ /
!  * @build jdk.testlibrary.SimpleSSLContext ProxyServer EchoHandler
   * @compile ../../../com/sun/net/httpserver/LogFilter.java
   * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
   * @run main/othervm SmokeTest
   */
  
  import com.sun.net.httpserver.*;
  import java.net.*;
  import java.net.http.*;
  import java.io.*;
  import java.util.concurrent.*;
*** 67,76 ****
--- 65,75 ----
   * Uses a FileServerHandler serving a couple of known files
   * in docs directory.
   */
  public class SmokeTest {
      static SSLContext ctx;
+     static SSLParameters sslparams;
      static HttpServer s1 ;
      static HttpsServer s2;
      static ExecutorService executor;
      static int port;
      static int httpsport;
*** 105,114 ****
--- 104,114 ----
          midSizedFile = Paths.get(fileroot + midSizedFilename);
          smallFile = Paths.get(fileroot + smallFilename);
  
          client = HttpClient.create()
                             .sslContext(ctx)
+                            .sslParameters(sslparams)
                             .followRedirects(HttpClient.Redirect.ALWAYS)
                             .executorService(Executors.newCachedThreadPool())
                             .build();
  
          try {
*** 283,292 ****
--- 283,293 ----
          String filename = fileroot + uri.getPath();
  
          HttpClient cl = HttpClient.create()
                                    .proxy(ProxySelector.of(proxyAddr))
                                    .sslContext(ctx)
+                                   .sslParameters(sslparams)
                                    .build();
  
          CompletableFuture<String> fut = cl.request(uri)
                                            .body(noBody())
                                            .GET()
*** 670,680 ****
  
          executor = Executors.newCachedThreadPool();
          s1.setExecutor(executor);
          s2.setExecutor(executor);
          ctx = new SimpleSSLContext().get();
!         s2.setHttpsConfigurator(new HttpsConfigurator(ctx));
          s1.start();
          s2.start();
  
          port = s1.getAddress().getPort();
          System.out.println("HTTP server port = " + port);
--- 671,682 ----
  
          executor = Executors.newCachedThreadPool();
          s1.setExecutor(executor);
          s2.setExecutor(executor);
          ctx = new SimpleSSLContext().get();
!         sslparams = ctx.getSupportedSSLParameters();
!         s2.setHttpsConfigurator(new Configurator(ctx));
          s1.start();
          s2.start();
  
          port = s1.getAddress().getPort();
          System.out.println("HTTP server port = " + port);
*** 687,696 ****
--- 689,708 ----
          proxyPort = proxy.getPort();
          System.out.println("Proxy port = " + proxyPort);
      }
  }
  
+ class Configurator extends HttpsConfigurator {
+     public Configurator(SSLContext ctx) {
+         super(ctx);
+     }
+ 
+     public void configure (HttpsParameters params) {
+         params.setSSLParameters (getSSLContext().getSupportedSSLParameters());
+     }
+ }
+ 
  class UploadServer extends Thread {
      int statusCode;
      ServerSocket ss;
      int port;
      int size;