--- a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java Mon May 28 17:22:37 2018 +0100
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java Fri May 25 16:13:11 2018 +0100
@@ -40,7 +40,6 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.lang.StackWalker.StackFrame;
-import jdk.internal.net.http.common.HttpHeadersImpl;
import jdk.testlibrary.SimpleSSLContext;
import org.testng.annotations.AfterTest;
import org.testng.annotations.AfterClass;
@@ -79,6 +78,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiPredicate;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -690,8 +690,13 @@
https2TestServer.stop();
}
- private static void pushPromiseFor(HttpTestExchange t, URI requestURI, String pushPath, boolean fixed)
- throws IOException
+ static final BiPredicate<String,String> ACCEPT_ALL = (x, y) -> true;
+
+ private static void pushPromiseFor(HttpTestExchange t,
+ URI requestURI,
+ String pushPath,
+ boolean fixed)
+ throws IOException
{
try {
URI promise = new URI(requestURI.getScheme(),
@@ -700,9 +705,13 @@
byte[] promiseBytes = promise.toASCIIString().getBytes(UTF_8);
out.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
err.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
- HttpTestHeaders headers = HttpTestHeaders.of(new HttpHeadersImpl());
+ HttpHeaders headers;
if (fixed) {
- headers.addHeader("Content-length", String.valueOf(promiseBytes.length));
+ String length = String.valueOf(promiseBytes.length);
+ headers = HttpHeaders.of(Map.of("Content-Length", List.of(length)),
+ ACCEPT_ALL);
+ } else {
+ headers = HttpHeaders.of(Map.of(), ACCEPT_ALL); // empty
}
t.serverPush(promise, headers, promiseBytes);
} catch (URISyntaxException x) {