Skip to content

8352706: httpclient HeadTest does not run on HTTP2 #24191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
djelinski wants to merge 1 commit into from
Closed

8352706: httpclient HeadTest does not run on HTTP2 #24191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions test/jdk/java/net/httpclient/HeadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,21 @@ public class HeadTest implements HttpServerAdapters {
@DataProvider(name = "positive")
public Object[][] positive() {
return new Object[][] {
// HTTP/1.1
{ httpURI, "GET", HTTP_NOT_MODIFIED, HTTP_1_1 },
{ httpsURI, "GET", HTTP_NOT_MODIFIED, HTTP_1_1 },
{ httpURI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ httpsURI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ httpURI, "HEAD", HTTP_OK, HTTP_1_1 },
{ httpsURI, "HEAD", HTTP_OK, HTTP_1_1 },
{ httpURI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 },
{ httpsURI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 },
{ httpURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HTTP_1_1 },
{ httpsURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HTTP_1_1 },
{ httpURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ httpsURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ httpURI + "transfer/", "HEAD", HTTP_OK, HTTP_1_1 },
{ httpsURI + "transfer/", "HEAD", HTTP_OK, HTTP_1_1 },
{ httpURI + "transfer/", "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 },
{ httpsURI + "transfer/", "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 }
// HTTP/2
{ http2URI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ https2URI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2 },
{ http2URI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 },
{ https2URI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2 },
// HTTP2 forbids transfer-encoding
};
}

Expand All @@ -112,17 +111,13 @@ void test(String uriString, String method,
URI uri = URI.create(uriString);
HttpRequest.Builder requestBuilder = HttpRequest
.newBuilder(uri)
.version(version)
.method(method, HttpRequest.BodyPublishers.noBody());
if (version != null) {
requestBuilder.version(version);
}
doTest(requestBuilder.build(), expResp);
// repeat the test this time by building the request using convenience
// GET and HEAD methods
requestBuilder = HttpRequest.newBuilder(uri);
if (version != null) {
requestBuilder.version(version);
}
requestBuilder = HttpRequest.newBuilder(uri)
.version(version);
switch (method) {
case "GET" -> requestBuilder.GET();
case "HEAD" -> requestBuilder.HEAD();
Expand All @@ -146,6 +141,7 @@ private void doTest(HttpRequest request, int expResp) throws Exception {
assertEquals(response.statusCode(), expResp);
assertEquals(response.body(), "");
assertEquals(response.headers().firstValue("Content-length").get(), CONTENT_LEN);
assertEquals(response.version(), request.version().get());
}

// -- Infrastructure
Expand All @@ -168,7 +164,7 @@ public void setup() throws Exception {
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(new HeadHandler(), "/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/";
https2TestServer = HttpTestServer.create(HTTP_2, SSLContext.getDefault());
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(new HeadHandler(), "/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/";

Expand Down