--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java Tue Apr 17 15:39:20 2018 +0200
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java Tue Apr 17 08:54:17 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
* @test
* @summary Checks correct handling of Publishers that call onComplete without demand
* @modules java.base/sun.net.www.http
- * jdk.incubator.httpclient/jdk.incubator.http.internal.common
- * jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * java.net.http/jdk.internal.net.http.common
+ * java.net.http/jdk.internal.net.http.frame
+ * java.net.http/jdk.internal.net.http.hpack
* java.logging
* jdk.httpserver
* @library /lib/testlibrary http2/server
@@ -44,10 +44,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Flow;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,19 +58,23 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.net.ssl.SSLContext;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import javax.net.ssl.SSLSession;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
import jdk.testlibrary.SimpleSSLContext;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static java.lang.System.out;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
public class CustomRequestPublisher {
@@ -110,6 +116,28 @@
static final int ITERATION_COUNT = 10;
+ /** Asserts HTTP Version, and SSLSession presence when applicable. */
+ static void assertVersionAndSession(HttpResponse response, String uri) {
+ if (uri.contains("http2") || uri.contains("https2"))
+ assertEquals(response.version(), HTTP_2);
+ else if (uri.contains("http1") || uri.contains("https1"))
+ assertEquals(response.version(), HTTP_1_1);
+ else
+ fail("Unknown HTTP version in test for: " + uri);
+
+ Optional<SSLSession> ssl = response.sslSession();
+ if (uri.contains("https")) {
+ assertTrue(ssl.isPresent(),
+ "Expected optional containing SSLSession but got:" + ssl);
+ try {
+ ssl.get().invalidate();
+ fail("SSLSession is not immutable: " + ssl.get());
+ } catch (UnsupportedOperationException expected) { }
+ } else {
+ assertTrue(!ssl.isPresent(), "UNEXPECTED non-empty optional:" + ssl);
+ }
+ }
+
@Test(dataProvider = "variants")
void test(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
throws Exception
@@ -124,13 +152,15 @@
.POST(bodyPublisher)
.build();
- HttpResponse<String> resp = client.send(request, asString());
+ HttpResponse<String> resp = client.send(request, ofString());
out.println("Got response: " + resp);
out.println("Got body: " + resp.body());
assertTrue(resp.statusCode() == 200,
"Expected 200, got:" + resp.statusCode());
assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+ assertVersionAndSession(resp, uri);
}
}
@@ -148,7 +178,7 @@
.POST(bodyPublisher)
.build();
- CompletableFuture<HttpResponse<String>> cf = client.sendAsync(request, asString());
+ CompletableFuture<HttpResponse<String>> cf = client.sendAsync(request, ofString());
HttpResponse<String> resp = cf.get();
out.println("Got response: " + resp);
@@ -156,6 +186,8 @@
assertTrue(resp.statusCode() == 200,
"Expected 200, got:" + resp.statusCode());
assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+ assertVersionAndSession(resp, uri);
}
}
@@ -283,31 +315,34 @@
}
}
+ static String serverAuthority(HttpServer server) {
+ return InetAddress.getLoopbackAddress().getHostName() + ":"
+ + server.getAddress().getPort();
+ }
+
@BeforeTest
public void setup() throws Exception {
sslContext = new SimpleSSLContext().get();
if (sslContext == null)
throw new AssertionError("Unexpected null sslContext");
- InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+ InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
httpTestServer = HttpServer.create(sa, 0);
httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
- httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+ httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/echo";
httpsTestServer = HttpsServer.create(sa, 0);
httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
- httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+ httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/echo";
- http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+ http2TestServer = new Http2TestServer("localhost", false, 0);
http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
- int port = http2TestServer.getAddress().getPort();
- http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+ http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo";
- https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+ https2TestServer = new Http2TestServer("localhost", true, 0);
https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
- port = https2TestServer.getAddress().getPort();
- https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+ https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo";
httpTestServer.start();
httpsTestServer.start();