You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2022/10/22 12:35:08 UTC
[httpcomponents-core] branch broken_junit5 updated (09fab87e7 -> 9b01e37be)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch broken_junit5
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
discard 09fab87e7 Fixed integration tests broken by JUnit 5 upgrade
new 9b01e37be Fixed integration tests broken by JUnit 5 upgrade
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (09fab87e7)
\
N -- N -- N refs/heads/broken_junit5 (9b01e37be)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...est.java => ClassicHttp1CoreTransportTest.java} | 52 ++---
...Test.java => ClassicHttpCoreTransportTest.java} | 57 +-----
.../testing/classic/ClassicIntegrationTests.java | 12 +-
.../hc/core5/testing/nio/H2CoreTransportTest.java | 81 ++++++++
.../testing/nio/H2ServerAndRequesterTest.java | 228 ---------------------
...pgradeTest.java => Http1CoreTransportTest.java} | 113 ++++++----
...questerTest.java => HttpCoreTransportTest.java} | 86 ++------
.../hc/core5/testing/nio/HttpIntegrationTests.java | 36 ++--
8 files changed, 219 insertions(+), 446 deletions(-)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/{ClassicServerBootstrapFilterTest.java => ClassicHttp1CoreTransportTest.java} (64%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/{ClassicServerAndRequesterTest.java => ClassicHttpCoreTransportTest.java} (69%)
create mode 100644 httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
delete mode 100644 httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/{TLSUpgradeTest.java => Http1CoreTransportTest.java} (56%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/{Http1ServerAndRequesterTest.java => HttpCoreTransportTest.java} (79%)
[httpcomponents-core] 01/01: Fixed integration tests broken by JUnit 5 upgrade
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch broken_junit5
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 9b01e37be240e80d5156d5c62f4859e14e074698
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Wed Oct 19 22:53:03 2022 +0200
Fixed integration tests broken by JUnit 5 upgrade
---
httpcore5-testing/pom.xml | 5 -
.../testing/classic/ClassicAuthenticationTest.java | 195 +++++--------
.../classic/ClassicHttp1CoreTransportTest.java | 99 +++++++
...Test.java => ClassicHttpCoreTransportTest.java} | 129 +--------
.../testing/classic/ClassicIntegrationTest.java | 268 ++++++++----------
.../testing/classic/ClassicIntegrationTests.java | 106 +++++++
.../ClassicProtocolTests.java} | 45 ++-
.../classic/ClassicServerBootstrapFilterTest.java | 141 ++++------
.../testing/classic/ClassicTLSIntegrationTest.java | 21 +-
...gResponseOutOfOrderStrategyIntegrationTest.java | 140 +++-------
.../classic/extension/ClassicTestResources.java | 99 +++++++
.../classic/extension/HttpRequesterResource.java | 86 ++++++
.../classic/extension/HttpServerResource.java | 90 ++++++
.../nio/AsyncServerBootstrapFilterTest.java | 148 +++-------
.../apache/hc/core5/testing/nio/H2AlpnTest.java | 129 +++------
...sProxyIntegrationTest.java => H2AlpnTests.java} | 56 ++--
.../hc/core5/testing/nio/H2CoreTransportTest.java | 81 ++++++
.../hc/core5/testing/nio/H2IntegrationTest.java | 119 ++++----
.../testing/nio/H2ProtocolNegotiationTest.java | 125 +++------
.../nio/H2ServerAndMultiplexingRequesterTest.java | 134 +++------
.../testing/nio/H2ServerAndRequesterTest.java | 304 ---------------------
.../testing/nio/H2ServerBootstrapFiltersTest.java | 154 ++++-------
.../core5/testing/nio/Http1AuthenticationTest.java | 202 +++++---------
.../core5/testing/nio/Http1CoreTransportTest.java | 173 ++++++++++++
.../hc/core5/testing/nio/Http1IntegrationTest.java | 176 ++++++++----
...questerTest.java => HttpCoreTransportTest.java} | 161 ++---------
.../hc/core5/testing/nio/HttpIntegrationTests.java | 136 +++++++++
...IntegrationTest.java => HttpProtocolTests.java} | 57 ++--
.../testing/nio/InternalH2ServerTestBase.java | 76 ------
.../testing/nio/InternalHttp1ServerTestBase.java | 80 ------
.../testing/nio/JSSEProviderIntegrationTest.java | 97 +++----
...Test.java => JSSEProviderIntegrationTests.java} | 50 ++--
.../hc/core5/testing/nio/TLSIntegrationTest.java | 22 +-
.../hc/core5/testing/nio/TLSUpgradeTest.java | 105 ++-----
.../nio/extension/H2AsyncRequesterResource.java | 94 +++++++
.../nio/extension/H2AsyncServerResource.java | 94 +++++++
.../extension/H2MultiplexingRequesterResource.java | 90 ++++++
.../testing/nio/extension/H2TestResources.java | 99 +++++++
.../testing/nio/extension/Http1TestResources.java | 99 +++++++
.../nio/extension/HttpAsyncRequesterResource.java | 92 +++++++
.../nio/extension/HttpAsyncServerResource.java | 92 +++++++
.../IntegrationTests.java} | 47 ++--
.../core5/testing/reactive/ReactiveClientTest.java | 153 +++--------
pom.xml | 6 -
44 files changed, 2523 insertions(+), 2352 deletions(-)
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index f5ad690a4..638bccdbe 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -100,11 +100,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 220aee72d..a752b607e 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -30,8 +30,6 @@ package org.apache.hc.core5.testing.classic;
import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Random;
import org.apache.hc.core5.http.ClassicHttpRequest;
@@ -45,10 +43,9 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Method;
+import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
@@ -58,142 +55,74 @@ import org.apache.hc.core5.http.io.support.AbstractHttpServerAuthFilter;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.net.URIAuthority;
+import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
+import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-@RunWith(Parameterized.class)
-public class ClassicAuthenticationTest {
-
- @Parameterized.Parameters(name = "respond immediately on auth failure: {0}")
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- { Boolean.FALSE },
- { Boolean.TRUE }
- });
- }
+public abstract class ClassicAuthenticationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- private final boolean respondImmediately;
- private HttpServer server;
+ @RegisterExtension
+ private HttpServerResource serverResource;
+ @RegisterExtension
+ private HttpRequesterResource clientResource;
public ClassicAuthenticationTest(final Boolean respondImmediately) {
- this.respondImmediately = respondImmediately;
+ this.serverResource = new HttpServerResource(URIScheme.HTTP, bootstrap -> bootstrap
+ .setSocketConfig(
+ SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .register("*", new EchoHandler())
+ .replaceFilter(StandardFilter.EXPECT_CONTINUE.name(), new AbstractHttpServerAuthFilter<String>(respondImmediately) {
+
+ @Override
+ protected String parseChallengeResponse(
+ final String challenge, final HttpContext context) throws HttpException {
+ return challenge;
+ }
+
+ @Override
+ protected boolean authenticate(
+ final String challengeResponse,
+ final URIAuthority authority,
+ final String requestUri,
+ final HttpContext context) {
+ return challengeResponse != null && challengeResponse.equals("let me pass");
+ }
+
+ @Override
+ protected String generateChallenge(
+ final String challengeResponse,
+ final URIAuthority authority,
+ final String requestUri,
+ final HttpContext context) {
+ return "who goes there?";
+ }
+
+ @Override
+ protected HttpEntity generateResponseContent(final HttpResponse unauthorized) {
+ return new StringEntity("You shall not pass!!!");
+ }
+ })
+ );
+ this.clientResource = new HttpRequesterResource(bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
}
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = ServerBootstrap.bootstrap()
- .setSocketConfig(
- SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", new EchoHandler())
- .replaceFilter(StandardFilter.EXPECT_CONTINUE.name(), new AbstractHttpServerAuthFilter<String>(respondImmediately) {
-
- @Override
- protected String parseChallengeResponse(
- final String challenge, final HttpContext context) throws HttpException {
- return challenge;
- }
-
- @Override
- protected boolean authenticate(
- final String challengeResponse,
- final URIAuthority authority,
- final String requestUri,
- final HttpContext context) {
- return challengeResponse != null && challengeResponse.equals("let me pass");
- }
-
- @Override
- protected String generateChallenge(
- final String challengeResponse,
- final URIAuthority authority,
- final String requestUri,
- final HttpContext context) {
- return "who goes there?";
- }
-
- @Override
- protected HttpEntity generateResponseContent(final HttpResponse unauthorized) {
- return new StringEntity("You shall not pass!!!");
- }
- })
- .setConnectionFactory(LoggingBHttpServerConnectionFactory.INSTANCE)
- .setExceptionListener(LoggingExceptionListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- try {
- server.close(CloseMode.IMMEDIATE);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
- private HttpRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = RequesterBootstrap.bootstrap()
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setMaxTotal(2)
- .setDefaultMaxPerRoute(2)
- .setConnectionFactory(LoggingBHttpClientConnectionFactory.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- try {
- requester.close(CloseMode.GRACEFUL);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
@Test
public void testGetRequestAuthentication() throws Exception {
- server.start();
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
+
final HttpHost target = new HttpHost("localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.GET, "/stuff");
@@ -213,13 +142,15 @@ public class ClassicAuthenticationTest {
@Test
public void testPostRequestAuthentication() throws Exception {
- server.start();
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
+
final HttpHost target = new HttpHost("localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final Random rnd = new Random();
final byte[] stuff = new byte[10240];
for (int i = 0; i < stuff.length; i++) {
- stuff[i] = (byte)('a' + rnd.nextInt(10));
+ stuff[i] = (byte) ('a' + rnd.nextInt(10));
}
final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new ByteArrayEntity(stuff, ContentType.TEXT_PLAIN));
@@ -240,13 +171,15 @@ public class ClassicAuthenticationTest {
@Test
public void testPostRequestAuthenticationNoExpectContinue() throws Exception {
- server.start();
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
+
final HttpHost target = new HttpHost("localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final Random rnd = new Random();
final byte[] stuff = new byte[10240];
for (int i = 0; i < stuff.length; i++) {
- stuff[i] = (byte)('a' + rnd.nextInt(10));
+ stuff[i] = (byte) ('a' + rnd.nextInt(10));
}
final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setVersion(HttpVersion.HTTP_1_0);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java
new file mode 100644
index 000000000..c8a12f373
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java
@@ -0,0 +1,99 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.classic;
+
+import java.io.IOException;
+
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
+import org.apache.hc.core5.http.io.HttpFilterChain;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
+import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class ClassicHttp1CoreTransportTest extends ClassicHttpCoreTransportTest {
+
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+
+ @RegisterExtension
+ private final HttpServerResource serverResource;
+
+ @RegisterExtension
+ private final HttpRequesterResource clientResource;
+
+ public ClassicHttp1CoreTransportTest(final URIScheme scheme) {
+ super(scheme);
+ this.serverResource = new HttpServerResource(scheme, bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .register("*", new EchoHandler())
+ .addFilterBefore(StandardFilter.MAIN_HANDLER.name(), "no-keep-alive", (request, responseTrigger, context, chain) ->
+ chain.proceed(request, new HttpFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final ClassicHttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final ClassicHttpResponse response) throws HttpException, IOException {
+ if (request.getPath().startsWith("/no-keep-alive")) {
+ response.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
+ }
+ responseTrigger.submitResponse(response);
+ }
+
+ }, context)));
+ this.clientResource = new HttpRequesterResource(bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build()));
+ }
+
+ @Override
+ HttpServer serverStart() throws IOException {
+ return serverResource.start();
+ }
+
+ @Override
+ HttpRequester clientStart() throws IOException {
+ return clientResource.start();
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttpCoreTransportTest.java
similarity index 55%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttpCoreTransportTest.java
index c74677d57..8d3dd0cbd 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttpCoreTransportTest.java
@@ -30,152 +30,43 @@ package org.apache.hc.core5.testing.classic;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.HeaderElements;
-import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
-import org.apache.hc.core5.http.io.HttpFilterChain;
-import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.Test;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-@RunWith(Parameterized.class)
-public class ClassicServerAndRequesterTest {
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
+public abstract class ClassicHttpCoreTransportTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private final URIScheme scheme;
- private HttpServer server;
- public ClassicServerAndRequesterTest(final URIScheme scheme) {
+ public ClassicHttpCoreTransportTest(final URIScheme scheme) {
this.scheme = scheme;
}
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = ServerBootstrap.bootstrap()
- .setSslContext(scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null)
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", new EchoHandler())
- .addFilterBefore(StandardFilter.MAIN_HANDLER.name(), "no-keep-alive", (request, responseTrigger, context, chain) -> chain.proceed(request, new HttpFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final ClassicHttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final ClassicHttpResponse response) throws HttpException, IOException {
- if (request.getPath().startsWith("/no-keep-alive")) {
- response.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
- }
- responseTrigger.submitResponse(response);
- }
-
- }, context))
- .setExceptionListener(LoggingExceptionListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- try {
- server.close(CloseMode.IMMEDIATE);
- } catch (final Exception ignore) {
- }
- }
- }
+ abstract HttpServer serverStart() throws IOException;
- };
-
- private HttpRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = RequesterBootstrap.bootstrap()
- .setSslContext(scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null)
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setMaxTotal(2)
- .setDefaultMaxPerRoute(2)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- try {
- requester.close(CloseMode.GRACEFUL);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
+ abstract HttpRequester clientStart() throws IOException;
@Test
public void testSequentialRequests() throws Exception {
- server.start();
+ final HttpServer server = serverStart();
+ final HttpRequester requester = clientStart();
+
final HttpHost target = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
@@ -203,7 +94,9 @@ public class ClassicServerAndRequesterTest {
@Test
public void testSequentialRequestsNonPersistentConnection() throws Exception {
- server.start();
+ final HttpServer server = serverStart();
+ final HttpRequester requester = clientStart();
+
final HttpHost target = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/no-keep-alive/stuff");
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
index 1e720e4e3..f9a77dfa0 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
@@ -35,11 +35,8 @@ import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.Random;
-import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -54,7 +51,6 @@ import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.config.Http1Config;
-import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
@@ -70,94 +66,32 @@ import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestExpectContinue;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.hc.core5.testing.classic.extension.ClassicTestResources;
+import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class ClassicIntegrationTest {
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class ClassicIntegrationTest {
+
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
- private ClassicTestServer server;
+ @RegisterExtension
+ private final ClassicTestResources testResources;
public ClassicIntegrationTest(final URIScheme scheme) {
this.scheme = scheme;
+ this.testResources = new ClassicTestResources(scheme, TIMEOUT);
}
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- server = new ClassicTestServer(
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null,
- SocketConfig.custom()
- .setSoTimeout(5, TimeUnit.SECONDS)
- .build());
- }
-
- @Override
- protected void after() {
- if (server != null) {
- try {
- server.shutdown(CloseMode.IMMEDIATE);
- server = null;
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
- private ClassicTestClient client;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- client = new ClassicTestClient(
- scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null,
- SocketConfig.custom()
- .setSoTimeout(5, TimeUnit.SECONDS)
- .build());
- }
-
- @Override
- protected void after() {
- if (client != null) {
- try {
- client.shutdown(CloseMode.IMMEDIATE);
- client = null;
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
/**
* This test case executes a series of simple GET requests
*/
@Test
public void testSimpleBasicHttpRequests() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
@@ -172,8 +106,9 @@ public class ClassicIntegrationTest {
testData.add(data);
}
+
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
String s = request.getPath();
if (s.startsWith("/?")) {
@@ -185,15 +120,15 @@ public class ClassicIntegrationTest {
response.setEntity(entity);
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Method.GET, "/?" + r);
- try (final ClassicHttpResponse response = this.client.execute(host, get, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, get, context)) {
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -211,6 +146,8 @@ public class ClassicIntegrationTest {
*/
@Test
public void testSimpleHttpPostsWithContentLength() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
@@ -226,7 +163,7 @@ public class ClassicIntegrationTest {
}
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -235,18 +172,18 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -264,6 +201,8 @@ public class ClassicIntegrationTest {
*/
@Test
public void testSimpleHttpPostsChunked() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
@@ -279,7 +218,7 @@ public class ClassicIntegrationTest {
}
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -288,18 +227,18 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null, true));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -316,6 +255,8 @@ public class ClassicIntegrationTest {
*/
@Test
public void testSimpleHttpPostsHTTP10() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
@@ -331,7 +272,7 @@ public class ClassicIntegrationTest {
}
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -343,11 +284,11 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
// Set protocol level to HTTP/1.0
@@ -356,7 +297,7 @@ public class ClassicIntegrationTest {
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
Assertions.assertEquals(HttpVersion.HTTP_1_1, response.getVersion());
final Header h1 = response.getFirstHeader("Version");
Assertions.assertNotNull(h1);
@@ -378,6 +319,8 @@ public class ClassicIntegrationTest {
*/
@Test
public void testHttpPostsWithExpectContinue() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
@@ -393,7 +336,7 @@ public class ClassicIntegrationTest {
}
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -402,18 +345,18 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null, true));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -431,13 +374,15 @@ public class ClassicIntegrationTest {
*/
@Test
public void testHttpPostsWithExpectationVerification() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("No content")));
+ server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("No content")));
- this.server.start(null, null, handler -> new BasicHttpServerExpectationDecorator(handler) {
+ server.start(null, null, handler -> new BasicHttpServerExpectationDecorator(handler) {
@Override
protected ClassicHttpResponse verify(final ClassicHttpRequest request, final HttpContext context) {
@@ -461,10 +406,10 @@ public class ClassicIntegrationTest {
}
});
- this.client.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
@@ -476,7 +421,7 @@ public class ClassicIntegrationTest {
}
post.setEntity(new ByteArrayEntity(b, ContentType.TEXT_PLAIN));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
final HttpEntity responseEntity = response.getEntity();
Assertions.assertNotNull(responseEntity);
EntityUtils.consume(responseEntity);
@@ -540,6 +485,8 @@ public class ClassicIntegrationTest {
@Test
public void testHttpContent() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final String[] patterns = {
@@ -562,7 +509,7 @@ public class ClassicIntegrationTest {
};
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> {
+ server.registerHandler("*", (request, response, context) -> {
int n = 1;
String s = request.getPath();
@@ -589,11 +536,11 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (final String pattern : patterns) {
for (int n = 1000; n < 1020; n++) {
@@ -601,7 +548,7 @@ public class ClassicIntegrationTest {
Method.POST.name(), "/?n=" + n);
post.setEntity(new StringEntity(pattern, ContentType.TEXT_PLAIN, n % 2 == 0));
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
final HttpEntity entity = response.getEntity();
Assertions.assertNotNull(entity);
final InputStream inStream = entity.getContent();
@@ -624,7 +571,10 @@ public class ClassicIntegrationTest {
@Test
public void testHttpPostNoEntity() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
+
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -633,16 +583,16 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
Assertions.assertEquals(HttpStatus.SC_OK, response.getCode());
final byte[] received = EntityUtils.toByteArray(response.getEntity());
Assertions.assertEquals(0, received.length);
@@ -651,7 +601,10 @@ public class ClassicIntegrationTest {
@Test
public void testHttpPostNoContentLength() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
+
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -660,20 +613,20 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start(new DefaultHttpProcessor(
+ server.start();
+ client.start(new DefaultHttpProcessor(
RequestTargetHost.INSTANCE,
RequestConnControl.INSTANCE,
RequestUserAgent.INSTANCE,
RequestExpectContinue.INSTANCE));
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
Assertions.assertEquals(HttpStatus.SC_OK, response.getCode());
final byte[] received = EntityUtils.toByteArray(response.getEntity());
Assertions.assertEquals(0, received.length);
@@ -682,7 +635,10 @@ public class ClassicIntegrationTest {
@Test
public void testHttpPostIdentity() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
+
+ server.registerHandler("*", (request, response, context) -> {
final HttpEntity entity = request.getEntity();
if (entity != null) {
@@ -691,8 +647,8 @@ public class ClassicIntegrationTest {
}
});
- this.server.start();
- this.client.start(new DefaultHttpProcessor(
+ server.start();
+ client.start(new DefaultHttpProcessor(
(request, entity, context) -> request.addHeader(HttpHeaders.TRANSFER_ENCODING, "identity"),
RequestTargetHost.INSTANCE,
RequestConnControl.INSTANCE,
@@ -700,33 +656,35 @@ public class ClassicIntegrationTest {
RequestExpectContinue.INSTANCE));
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
- try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, post, context)) {
Assertions.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
}
}
@Test
public void testNoContentResponse() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
final int reqNo = 20;
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> response.setCode(HttpStatus.SC_NO_CONTENT));
+ server.registerHandler("*", (request, response, context) -> response.setCode(HttpStatus.SC_NO_CONTENT));
- this.server.start();
- this.client.start();
+ server.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
for (int r = 0; r < reqNo; r++) {
final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Method.GET, "/?" + r);
- try (final ClassicHttpResponse response = this.client.execute(host, get, context)) {
+ try (final ClassicHttpResponse response = client.execute(host, get, context)) {
Assertions.assertNull(response.getEntity());
}
}
@@ -734,25 +692,27 @@ public class ClassicIntegrationTest {
@Test
public void testAbsentHostHeader() throws Exception {
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
// Initialize the server-side request handler
- this.server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
+ server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
- this.server.start();
- this.client.start(new DefaultHttpProcessor(RequestContent.INSTANCE, new RequestConnControl()));
+ server.start();
+ client.start(new DefaultHttpProcessor(RequestContent.INSTANCE, new RequestConnControl()));
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final BasicClassicHttpRequest get1 = new BasicClassicHttpRequest(Method.GET, "/");
get1.setVersion(HttpVersion.HTTP_1_0);
- try (final ClassicHttpResponse response1 = this.client.execute(host, get1, context)) {
+ try (final ClassicHttpResponse response1 = client.execute(host, get1, context)) {
Assertions.assertEquals(200, response1.getCode());
EntityUtils.consume(response1.getEntity());
}
final BasicClassicHttpRequest get2 = new BasicClassicHttpRequest(Method.GET, "/");
- try (final ClassicHttpResponse response2 = this.client.execute(host, get2, context)) {
+ try (final ClassicHttpResponse response2 = client.execute(host, get2, context)) {
Assertions.assertEquals(400, response2.getCode());
EntityUtils.consume(response2.getEntity());
}
@@ -760,23 +720,27 @@ public class ClassicIntegrationTest {
@Test
public void testHeaderTooLarge() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
- this.server.start(
+ server.registerHandler("*", (request, response, context) ->
+ response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
+
+ server.start(
Http1Config.custom()
.setMaxLineLength(100)
.build(),
null,
null);
- this.client.start();
+ client.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final BasicClassicHttpRequest get1 = new BasicClassicHttpRequest(Method.GET, "/");
get1.setHeader("big-f-header", "1234567890123456789012345678901234567890123456789012345678901234567890" +
"1234567890123456789012345678901234567890");
- try (final ClassicHttpResponse response1 = this.client.execute(host, get1, context)) {
+ try (final ClassicHttpResponse response1 = client.execute(host, get1, context)) {
Assertions.assertEquals(431, response1.getCode());
EntityUtils.consume(response1.getEntity());
}
@@ -784,19 +748,23 @@ public class ClassicIntegrationTest {
@Test
public void testHeaderTooLargePost() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
+ final ClassicTestServer server = testResources.server();
+ final ClassicTestClient client = testResources.client();
+
+ server.registerHandler("*", (request, response, context) ->
+ response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII)));
- this.server.start(
+ server.start(
Http1Config.custom()
.setMaxLineLength(100)
.build(),
null,
null);
- this.client.start(
+ client.start(
new DefaultHttpProcessor(RequestContent.INSTANCE, RequestTargetHost.INSTANCE, RequestConnControl.INSTANCE));
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getPort());
final ClassicHttpRequest post1 = new BasicClassicHttpRequest(Method.POST, "/");
post1.setHeader("big-f-header", "1234567890123456789012345678901234567890123456789012345678901234567890" +
@@ -807,7 +775,7 @@ public class ClassicIntegrationTest {
}
post1.setEntity(new ByteArrayEntity(b, ContentType.TEXT_PLAIN));
- try (final ClassicHttpResponse response1 = this.client.execute(host, post1, context)) {
+ try (final ClassicHttpResponse response1 = client.execute(host, post1, context)) {
Assertions.assertEquals(431, response1.getCode());
EntityUtils.consume(response1.getEntity());
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTests.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTests.java
new file mode 100644
index 000000000..07a191d04
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTests.java
@@ -0,0 +1,106 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.classic;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+
+public class ClassicIntegrationTests {
+
+ @Nested
+ @DisplayName("Core transport")
+ public class CoreTransport extends ClassicHttp1CoreTransportTest {
+
+ public CoreTransport() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (TLS)")
+ public class CoreTransportTls extends ClassicHttp1CoreTransportTest {
+
+ public CoreTransportTls() {
+ super(URIScheme.HTTPS);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Authentication")
+ public class Authentication extends ClassicAuthenticationTest {
+
+ public Authentication() {
+ super(false);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Authentication (immediate response)")
+ public class AuthenticationImmediateResponse extends ClassicAuthenticationTest {
+
+ public AuthenticationImmediateResponse() {
+ super(true);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Out-of-order response monitoring")
+ public class MonitoringResponseOutOfOrderStrategy extends MonitoringResponseOutOfOrderStrategyIntegrationTest {
+
+ public MonitoringResponseOutOfOrderStrategy() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Out-of-order response monitoring (TLS)")
+ public class MonitoringResponseOutOfOrderStrategyTls extends MonitoringResponseOutOfOrderStrategyIntegrationTest {
+
+ public MonitoringResponseOutOfOrderStrategyTls() {
+ super(URIScheme.HTTPS);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Server filters")
+ public class HttpFilters extends ClassicServerBootstrapFilterTest {
+
+ public HttpFilters() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicProtocolTests.java
similarity index 55%
copy from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
copy to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicProtocolTests.java
index 338c411f9..c3f5eaac1 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicProtocolTests.java
@@ -25,43 +25,32 @@
*
*/
-package org.apache.hc.core5.testing.nio;
+package org.apache.hc.core5.testing.classic;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SocksProxy;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
-public class H2SocksProxyIntegrationTest extends H2IntegrationTest {
+public class ClassicProtocolTests {
- protected static SocksProxy PROXY;
+ @Nested
+ @DisplayName("Classic HTTP/1.1 (plain)")
+ public class Http1 extends ClassicIntegrationTest {
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
- }
-
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ public Http1() {
+ super(URIScheme.HTTP);
}
- }
- public H2SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("Classic HTTP/1.1 (TLS)")
+ public class Http1Tls extends ClassicIntegrationTest {
+
+ public Http1Tls() {
+ super(URIScheme.HTTPS);
+ }
+
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
index 35ef2c132..16fac4a84 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
@@ -39,118 +39,71 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Method;
+import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
-import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpFilterChain;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
+import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class ClassicServerBootstrapFilterTest {
+public abstract class ClassicServerBootstrapFilterTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- private HttpServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = ServerBootstrap.bootstrap()
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", new EchoHandler())
- .addFilterLast("test-filter", (request, responseTrigger, context, chain) ->
- chain.proceed(request, new HttpFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final ClassicHttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final ClassicHttpResponse response) throws HttpException, IOException {
- response.setHeader("X-Test-Filter", "active");
- responseTrigger.submitResponse(response);
- }
-
- }, context))
- .setExceptionListener(LoggingExceptionListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- try {
- server.close(CloseMode.IMMEDIATE);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
- private HttpRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = RequesterBootstrap.bootstrap()
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setMaxTotal(2)
- .setDefaultMaxPerRoute(2)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- try {
- requester.close(CloseMode.GRACEFUL);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
+ private final URIScheme scheme;
+
+ @RegisterExtension
+ private final HttpServerResource serverResource;
+
+ @RegisterExtension
+ private final HttpRequesterResource clientResource;
+
+ public ClassicServerBootstrapFilterTest(final URIScheme scheme) {
+ this.scheme = scheme;
+ this.serverResource = new HttpServerResource(scheme, bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .register("*", new EchoHandler())
+ .addFilterLast("test-filter", (request, responseTrigger, context, chain) ->
+ chain.proceed(request, new HttpFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final ClassicHttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final ClassicHttpResponse response) throws HttpException, IOException {
+ response.setHeader("X-Test-Filter", "active");
+ responseTrigger.submitResponse(response);
+ }
+
+ }, context)));
+
+ this.clientResource = new HttpRequesterResource(bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build()));
+ }
@Test
public void testFilters() throws Exception {
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
+
server.start();
- final HttpHost target = new HttpHost("http", "localhost", server.getLocalPort());
+ final HttpHost target = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/filters");
request.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
index 80966a149..474ede338 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
@@ -57,26 +57,23 @@ import org.apache.hc.core5.ssl.SSLContexts;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class ClassicTLSIntegrationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private HttpServer server;
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
+ @RegisterExtension
+ public final AfterEachCallback serverCleanup = new AfterEachCallback() {
@Override
- protected void after() {
+ public void afterEach(final ExtensionContext context) throws Exception {
if (server != null) {
try {
server.close(CloseMode.IMMEDIATE);
@@ -89,11 +86,11 @@ public class ClassicTLSIntegrationTest {
private HttpRequester requester;
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
+ @RegisterExtension
+ public final AfterEachCallback clientCleanup = new AfterEachCallback() {
@Override
- protected void after() {
+ public void afterEach(final ExtensionContext context) throws Exception {
if (requester != null) {
try {
requester.close(CloseMode.GRACEFUL);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
index bf2f405bb..38ce0cca8 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
@@ -30,8 +30,7 @@ package org.apache.hc.core5.testing.classic;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -40,7 +39,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
-import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnectionFactory;
import org.apache.hc.core5.http.impl.io.MonitoringResponseOutOfOrderStrategy;
import org.apache.hc.core5.http.io.SocketConfig;
@@ -48,117 +47,62 @@ import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
+import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
-import org.junit.Rule;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-@RunWith(Parameterized.class)
-public class MonitoringResponseOutOfOrderStrategyIntegrationTest {
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class MonitoringResponseOutOfOrderStrategyIntegrationTest {
// Use a 16k buffer for consistent results across systems
private static final int BUFFER_SIZE = 16 * 1024;
private static final Timeout TIMEOUT = Timeout.ofSeconds(3);
- @ParameterizedTest(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
-
private final URIScheme scheme;
- private ClassicTestServer server;
- private HttpRequester requester;
-
- public MonitoringResponseOutOfOrderStrategyIntegrationTest(final URIScheme scheme) {
- this.scheme = scheme;
- }
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
+ @RegisterExtension
+ private final HttpServerResource serverResource;
- @Override
- protected void before() throws Throwable {
- server = new ClassicTestServer(
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null,
- SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .setSndBufSize(BUFFER_SIZE)
- .setRcvBufSize(BUFFER_SIZE)
- .setSoKeepAlive(false)
- .build());
- }
-
- @Override
- protected void after() {
- if (server != null) {
- try {
- server.shutdown(CloseMode.IMMEDIATE);
- server = null;
- } catch (final Exception ignore) {
- }
- }
- }
+ @RegisterExtension
+ private final HttpRequesterResource clientResource;
- };
-
- @Rule
- public ExternalResource requesterResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- requester = RequesterBootstrap.bootstrap()
- .setSslContext(scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null)
- .setSocketConfig(SocketConfig.custom()
- .setSoTimeout(TIMEOUT)
- .setRcvBufSize(BUFFER_SIZE)
- .setSndBufSize(BUFFER_SIZE)
- .setSoKeepAlive(false)
- .build())
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setConnectionFactory(DefaultBHttpClientConnectionFactory.builder()
- .responseOutOfOrderStrategy(MonitoringResponseOutOfOrderStrategy.INSTANCE)
- .build())
- .create();
- }
-
- @Override
- protected void after() {
- if (requester != null) {
- try {
- requester.close(CloseMode.IMMEDIATE);
- requester = null;
- } catch (final Exception ignore) {
- }
- }
- }
+ public MonitoringResponseOutOfOrderStrategyIntegrationTest(final URIScheme scheme) {
+ this.scheme = scheme;
- };
+ this.serverResource = new HttpServerResource(scheme, bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .setSndBufSize(BUFFER_SIZE)
+ .setRcvBufSize(BUFFER_SIZE)
+ .setSoKeepAlive(false)
+ .build())
+ .register("*", (request, response, context) -> {
+ response.setCode(400);
+ response.setEntity(new AllOnesHttpEntity(200000));
+ }));
+
+ this.clientResource = new HttpRequesterResource(bootstrap -> bootstrap
+ .setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .setRcvBufSize(BUFFER_SIZE)
+ .setSndBufSize(BUFFER_SIZE)
+ .setSoKeepAlive(false)
+ .build())
+ .setConnectionFactory(DefaultBHttpClientConnectionFactory.builder()
+ .responseOutOfOrderStrategy(MonitoringResponseOutOfOrderStrategy.INSTANCE)
+ .build()));
+ }
- @Test(timeout = 5000) // Failures may hang
+ @Test
+ @org.junit.jupiter.api.Timeout(value = 1, unit = TimeUnit.MINUTES)// Failures may hang
public void testResponseOutOfOrderWithDefaultStrategy() throws Exception {
- this.server.registerHandler("*", (request, response, context) -> {
- response.setCode(400);
- response.setEntity(new AllOnesHttpEntity(200000));
- });
-
- this.server.start(null, null, null);
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
final HttpCoreContext context = HttpCoreContext.create();
- final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
+ final HttpHost host = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final ClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(new AllOnesHttpEntity(200000));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java
new file mode 100644
index 000000000..6acbc769c
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java
@@ -0,0 +1,99 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.classic.extension;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.ClassicTestClient;
+import org.apache.hc.core5.testing.classic.ClassicTestServer;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClassicTestResources implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ClassicTestResources.class);
+
+ private final URIScheme scheme;
+ private final Timeout socketTimeout;
+
+ private ClassicTestServer server;
+ private ClassicTestClient client;
+
+ public ClassicTestResources(final URIScheme scheme, final Timeout socketTimeout) {
+ this.scheme = scheme;
+ this.socketTimeout = socketTimeout;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+ server = new ClassicTestServer(
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null,
+ SocketConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build());
+
+ LOG.debug("Starting up test client");
+ client = new ClassicTestClient(
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null,
+ SocketConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build());
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (client != null) {
+ client.shutdown(CloseMode.IMMEDIATE);
+ }
+
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ server.shutdown(CloseMode.IMMEDIATE);
+ }
+ }
+
+ public ClassicTestClient client() {
+ Assertions.assertNotNull(client);
+ return client;
+ }
+
+ public ClassicTestServer server() {
+ Assertions.assertNotNull(server);
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpRequesterResource.java
new file mode 100644
index 000000000..e9185815e
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpRequesterResource.java
@@ -0,0 +1,86 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.classic.extension;
+
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
+import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.classic.LoggingHttp1StreamListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpRequesterResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(HttpRequesterResource.class);
+
+ private final Consumer<RequesterBootstrap> bootstrapCustomizer;
+
+ private HttpRequester requester;
+
+ public HttpRequesterResource(final Consumer<RequesterBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final RequesterBootstrap bootstrap = RequesterBootstrap.bootstrap()
+ .setSslContext(SSLTestContexts.createClientSSLContext())
+ .setMaxTotal(2)
+ .setDefaultMaxPerRoute(2)
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE)
+ .setConnPoolListener(LoggingConnPoolListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ requester = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (requester != null) {
+ try {
+ requester.close(CloseMode.GRACEFUL);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpRequester start() {
+ Assertions.assertNotNull(requester);
+ return requester;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpServerResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpServerResource.java
new file mode 100644
index 000000000..3c6d04690
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpServerResource.java
@@ -0,0 +1,90 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.classic.extension;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.LoggingExceptionListener;
+import org.apache.hc.core5.testing.classic.LoggingHttp1StreamListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpServerResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(HttpServerResource.class);
+
+ private final URIScheme scheme;
+ private final Consumer<ServerBootstrap> bootstrapCustomizer;
+
+ private HttpServer server;
+
+ public HttpServerResource(final URIScheme scheme, final Consumer<ServerBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+
+ final ServerBootstrap bootstrap = ServerBootstrap.bootstrap()
+ .setSslContext(scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null)
+ .setExceptionListener(LoggingExceptionListener.INSTANCE)
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ server = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ try {
+ server.close(CloseMode.IMMEDIATE);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpServer start() throws IOException {
+ Assertions.assertNotNull(server);
+ server.start();
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
index 4b56116a8..f43161c42 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
@@ -43,8 +43,6 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncEntityProducer;
@@ -52,128 +50,70 @@ import org.apache.hc.core5.http.nio.AsyncFilterChain;
import org.apache.hc.core5.http.nio.AsyncPushProducer;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
-import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class AsyncServerBootstrapFilterTest {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
+public abstract class AsyncServerBootstrapFilterTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = AsyncServerBootstrap.bootstrap()
- .setLookupRegistry(new UriPatternMatcher<>())
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", () -> new EchoHandler(2048))
- .addFilterLast("test-filter", (request, entityDetails, context, responseTrigger, chain) ->
- chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final HttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final HttpResponse response,
- final AsyncEntityProducer entityProducer) throws HttpException, IOException {
- response.setHeader("X-Test-Filter", "active");
- responseTrigger.submitResponse(response, entityProducer);
- }
-
- @Override
- public void pushPromise(
- final HttpRequest promise,
- final AsyncPushProducer responseProducer) throws HttpException, IOException {
- responseTrigger.pushPromise(promise, responseProducer);
- }
-
- }))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = AsyncRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
+ @RegisterExtension
+ private final HttpAsyncServerResource serverResource = new HttpAsyncServerResource(bootstrap -> bootstrap
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
.setSoTimeout(TIMEOUT)
.build())
- .setTlsStrategy(new BasicClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ .addFilterLast("test-filter", (request, entityDetails, context, responseTrigger, chain) ->
+ chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final HttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final HttpResponse response,
+ final AsyncEntityProducer entityProducer) throws HttpException, IOException {
+ response.setHeader("X-Test-Filter", "active");
+ responseTrigger.submitResponse(response, entityProducer);
+ }
+
+ @Override
+ public void pushPromise(
+ final HttpRequest promise,
+ final AsyncPushProducer responseProducer) throws HttpException, IOException {
+ responseTrigger.pushPromise(promise, responseProducer);
+ }
+
+ })));
+
+ @RegisterExtension
+ private final HttpAsyncRequesterResource clientResource = new HttpAsyncRequesterResource((bootstrap) -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build()));
+
@Test
public void testFilters() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTP);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost("http", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture = requester.execute(
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index 138f1a395..ba08f8645 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -33,7 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.InetSocketAddress;
-import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -53,124 +52,65 @@ import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http2.impl.nio.ProtocolNegotiationException;
import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequester;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.nio.extension.H2MultiplexingRequesterResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-@RunWith(Parameterized.class)
-public class H2AlpnTest {
- private final Logger log = LoggerFactory.getLogger(getClass());
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
- private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+public abstract class H2AlpnTest {
- @Parameterized.Parameters(name = "strict h2 ALPN: {0}, h2 allowed: {1}")
- public static Iterable<Object[]> parameters() {
- return Arrays.asList(new Object[][] {
- { true, true },
- { true, false },
- { false, true }
- });
- }
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final boolean strictALPN;
private final boolean h2Allowed;
- public H2AlpnTest(final boolean strictALPN, final boolean h2Allowed) {
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2MultiplexingRequesterResource clientResource;
+
+ public H2AlpnTest(final boolean strictALPN, final boolean h2Allowed) throws Exception {
this.strictALPN = strictALPN;
this.h2Allowed = h2Allowed;
- }
-
- private HttpAsyncServer server;
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- final TlsStrategy tlsStrategy = h2Allowed ?
+ final TlsStrategy serverTlsStrategy = h2Allowed ?
new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()) :
new BasicServerTlsStrategy(SSLTestContexts.createServerSSLContext());
- server = H2ServerBootstrap.bootstrap()
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(tlsStrategy)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .register("*", () -> new EchoHandler(2048))
- .create();
- }
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private H2MultiplexingRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2MultiplexingRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStrictALPNHandshake(strictALPN)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ this.serverResource = new H2AsyncServerResource(bootstrap -> bootstrap
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setTlsStrategy(serverTlsStrategy)
+ .register("*", () -> new EchoHandler(2048))
+ );
+
+ final TlsStrategy clientTlsStrategy = new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext());
+
+ this.clientResource = new H2MultiplexingRequesterResource(bootstrap -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setTlsStrategy(clientTlsStrategy)
+ .setStrictALPNHandshake(strictALPN)
+ );
+ }
@Test
public void testALPN() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTPS);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final H2MultiplexingRequester requester = clientResource.start();
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -196,4 +136,5 @@ public class H2AlpnTest {
final String body1 = message1.getBody();
assertThat(body1, CoreMatchers.equalTo("some stuff"));
}
+
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTests.java
similarity index 50%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyIntegrationTest.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTests.java
index dc264acbc..c1c891436 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTests.java
@@ -27,44 +27,38 @@
package org.apache.hc.core5.testing.nio;
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SocksProxy;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class Http1SocksProxyIntegrationTest extends Http1IntegrationTest {
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
- protected static SocksProxy PROXY;
+public class H2AlpnTests {
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
- }
+ @Nested
+ @DisplayName("Strict h2 ALPN, h2 allowed")
+ public class StrictH2AlpnH2Allowed extends H2AlpnTest {
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ public StrictH2AlpnH2Allowed() throws Exception {
+ super(true, true);
}
- }
- public Http1SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("Strict h2 ALPN, h2 disallowed")
+ public class StrictH2AlpnH2Disllowed extends H2AlpnTest {
+
+ public StrictH2AlpnH2Disllowed() throws Exception {
+ super(true, false);
+ }
+
}
+ @Nested
+ @DisplayName("Non-strict h2 ALPN, h2 allowed")
+ public class NonStrictH2AlpnH2Disllowed extends H2AlpnTest {
+
+ public NonStrictH2AlpnH2Disllowed() throws Exception {
+ super(false, true);
+ }
+
+ }
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
new file mode 100644
index 000000000..d0fa4f269
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
@@ -0,0 +1,81 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio;
+
+import java.io.IOException;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
+import org.apache.hc.core5.http.protocol.UriPatternMatcher;
+import org.apache.hc.core5.http2.HttpVersionPolicy;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class H2CoreTransportTest extends HttpCoreTransportTest {
+
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource;
+
+ public H2CoreTransportTest(final URIScheme scheme) {
+ super(scheme);
+ this.serverResource = new H2AsyncServerResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ );
+ this.clientResource = new H2AsyncRequesterResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
+ }
+
+ @Override
+ HttpAsyncServer serverStart() throws IOException {
+ return serverResource.start();
+ }
+
+ @Override
+ HttpAsyncRequester clientStart() {
+ return clientResource.start();
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
index 173798c51..a593551f3 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
@@ -43,8 +43,6 @@ import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -115,72 +113,33 @@ import org.apache.hc.core5.http2.protocol.H2RequestConnControl;
import org.apache.hc.core5.http2.protocol.H2RequestContent;
import org.apache.hc.core5.http2.protocol.H2RequestTargetHost;
import org.apache.hc.core5.reactor.Command;
-import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.IOSession;
-import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.extension.H2TestResources;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Test;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-;
-
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class H2IntegrationTest extends InternalH2ServerTestBase {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
- public H2IntegrationTest(final URIScheme scheme) {
- super(scheme);
- }
+public abstract class H2IntegrationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
+ private static final Timeout LONG_TIMEOUT = Timeout.ofMinutes(2);
- private H2TestClient client;
+ private final URIScheme scheme;
- @BeforeEach
- public void setup() throws Exception {
- log.debug("Starting up test client");
- client = new H2TestClient(buildReactorConfig(),
- scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
- }
-
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.DEFAULT;
- }
+ @RegisterExtension
+ private final H2TestResources resources;
- @AfterEach
- public void cleanup() throws Exception {
- log.debug("Shutting down test client");
- if (client != null) {
- client.shutdown(TimeValue.ofSeconds(5));
- }
+ public H2IntegrationTest(final URIScheme scheme) {
+ this.scheme = scheme;
+ this.resources = new H2TestResources(scheme, TIMEOUT);
}
private URI createRequestURI(final InetSocketAddress serverEndpoint, final String path) {
try {
- return new URI("http", null, "localhost", serverEndpoint.getPort(), path, null, null);
+ return new URI(scheme.id, null, "localhost", serverEndpoint.getPort(), path, null, null);
} catch (final URISyntaxException e) {
throw new IllegalStateException();
}
@@ -188,6 +147,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testSimpleGet() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -217,6 +179,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testSimpleHead() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -240,6 +205,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testLargeGet() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcdef", 5000));
final InetSocketAddress serverEndpoint = server.start();
@@ -283,6 +251,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testBasicPost() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -313,6 +284,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testLargePost() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("*", () -> new EchoHandler(2048));
final InetSocketAddress serverEndpoint = server.start();
@@ -340,6 +314,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testSlowResponseConsumer() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcd", 3));
final InetSocketAddress serverEndpoint = server.start();
@@ -389,6 +366,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testSlowRequestProducer() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("*", () -> new EchoHandler(2048));
final InetSocketAddress serverEndpoint = server.start();
@@ -435,6 +415,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testSlowResponseProducer() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("*", () -> new AbstractClassicServerExchangeHandler(2048, Executors.newSingleThreadExecutor()) {
@Override
@@ -511,6 +494,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testPush() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
final InetSocketAddress serverEndpoint = server.start();
server.register("/hello", () -> new MessageExchangeHandler<Void>(new DiscardingEntityConsumer<>()) {
@@ -579,6 +565,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testPushRefused() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
final BlockingQueue<Exception> pushResultQueue = new LinkedBlockingDeque<>();
final InetSocketAddress serverEndpoint = server.start();
server.register("/hello", new Supplier<AsyncServerExchangeHandler>() {
@@ -654,6 +643,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testExcessOfConcurrentStreams() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcdef", 2000));
final InetSocketAddress serverEndpoint = server.start(H2Config.custom().setMaxConcurrentStreams(20).build());
@@ -683,6 +675,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testExpectationFailed() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("*", () -> new MessageExchangeHandler<String>(new StringAsyncEntityConsumer()) {
@Override
@@ -738,6 +733,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testPrematureResponse() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("*", new Supplier<AsyncServerExchangeHandler>() {
@Override
@@ -820,6 +818,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testMessageWithTrailers() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new AbstractServerExchangeHandler<Message<HttpRequest, String>>() {
@Override
@@ -875,6 +876,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testConnectionPing() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -904,6 +908,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testRequestWithInvalidConnectionHeader() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -930,6 +937,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testHeaderTooLarge() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start(H2Config.custom()
.setMaxHeaderListSize(100)
@@ -956,6 +966,9 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
@Test
public void testHeaderTooLargePost() throws Exception {
+ final H2TestServer server = resources.server();
+ final H2TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start(H2Config.custom()
.setMaxHeaderListSize(100)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
index 37fc4e608..4fdcdfaeb 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
@@ -40,6 +40,7 @@ import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Message;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -47,110 +48,48 @@ import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2AsyncRequester;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
-import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
-import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
+import org.junit.jupiter.api.extension.RegisterExtension;
+
public class H2ProtocolNegotiationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = H2ServerBootstrap.bootstrap()
- .setTlsStrategy(new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()))
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()))
- .register("*", () -> new EchoHandler(2048))
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private H2AsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2RequesterBootstrap.bootstrap()
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource;
+
+ public H2ProtocolNegotiationTest() {
+ this.serverResource = new H2AsyncServerResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .register("*", () -> new EchoHandler(2048))
+ );
+ this.clientResource = new H2AsyncRequesterResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
+ }
@Test
public void testForceHttp1() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTPS);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> connectFuture = requester.connect(target, TIMEOUT, HttpVersionPolicy.FORCE_HTTP_1, null);
@@ -169,11 +108,11 @@ public class H2ProtocolNegotiationTest {
@Test
public void testForceHttp2() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTPS);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> connectFuture = requester.connect(target, TIMEOUT, HttpVersionPolicy.FORCE_HTTP_2, null);
@@ -192,11 +131,11 @@ public class H2ProtocolNegotiationTest {
@Test
public void testNegotiateProtocol() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTPS);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> connectFuture = requester.connect(target, TIMEOUT, HttpVersionPolicy.NEGOTIATE, null);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
index 0040076df..20c6e1a01 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
@@ -30,8 +30,6 @@ package org.apache.hc.core5.testing.nio;
import static org.hamcrest.MatcherAssert.assertThat;
import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.Queue;
import java.util.Random;
@@ -54,120 +52,54 @@ import org.apache.hc.core5.http.nio.support.BasicClientExchangeHandler;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.UriPatternMatcher;
+import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequester;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
-import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
-import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.nio.extension.H2MultiplexingRequesterResource;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class H2ServerAndMultiplexingRequesterTest {
+public abstract class H2ServerAndMultiplexingRequesterTest {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2MultiplexingRequesterResource clientResource;
public H2ServerAndMultiplexingRequesterTest(final URIScheme scheme) {
this.scheme = scheme;
+ this.serverResource = new H2AsyncServerResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_2)
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ );
+ this.clientResource = new H2MultiplexingRequesterResource(bootstrap -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
}
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = H2ServerBootstrap.bootstrap()
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(scheme == URIScheme.HTTPS ?
- new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()) : null)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .register("*", () -> new EchoHandler(2048))
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private H2MultiplexingRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2MultiplexingRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
@Test
public void testSequentialRequests() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final H2MultiplexingRequester requester = clientResource.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -206,11 +138,11 @@ public class H2ServerAndMultiplexingRequesterTest {
@Test
public void testMultiplexedRequests() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final H2MultiplexingRequester requester = clientResource.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
@@ -241,11 +173,11 @@ public class H2ServerAndMultiplexingRequesterTest {
@Test
public void testValidityCheck() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final H2MultiplexingRequester requester = clientResource.start();
requester.setValidateAfterInactivity(TimeValue.ofMilliseconds(10));
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
@@ -289,11 +221,11 @@ public class H2ServerAndMultiplexingRequesterTest {
@Test
public void testMultiplexedRequestCancellation() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final H2MultiplexingRequester requester = clientResource.start();
final int reqNo = 20;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
deleted file mode 100644
index 81c3657ee..000000000
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.hc.core5.testing.nio;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.Future;
-
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Method;
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
-import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
-import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
-import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
-import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
-import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
-import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
-import org.apache.hc.core5.http.protocol.UriPatternMatcher;
-import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
-import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
-import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
-import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
-import org.apache.hc.core5.util.Timeout;
-import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class H2ServerAndRequesterTest {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
- private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
-
- private final URIScheme scheme;
-
- public H2ServerAndRequesterTest(final URIScheme scheme) {
- this.scheme = scheme;
- }
-
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = H2ServerBootstrap.bootstrap()
- .setLookupRegistry(new UriPatternMatcher<>())
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(scheme == URIScheme.HTTPS ?
- new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()) : null)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .register("*", () -> new EchoHandler(2048))
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2RequesterBootstrap.bootstrap()
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- @Test
- public void testSequentialRequests() throws Exception {
- server.start();
- final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
- final ListenerEndpoint listener = future.get();
- final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
-
- final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
- final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Method.POST, target, "/stuff",
- new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
- final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message1, CoreMatchers.notNullValue());
- final HttpResponse response1 = message1.getHead();
- assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body1 = message1.getBody();
- assertThat(body1, CoreMatchers.equalTo("some stuff"));
-
- final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Method.POST, target, "/other-stuff",
- new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
- final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message2, CoreMatchers.notNullValue());
- final HttpResponse response2 = message2.getHead();
- assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body2 = message2.getBody();
- assertThat(body2, CoreMatchers.equalTo("some other stuff"));
-
- final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Method.POST, target, "/more-stuff",
- new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
- final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message3, CoreMatchers.notNullValue());
- final HttpResponse response3 = message3.getHead();
- assertThat(response3.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body3 = message3.getBody();
- assertThat(body3, CoreMatchers.equalTo("some more stuff"));
- }
-
- @Test
- public void testSequentialRequestsSameEndpoint() throws Exception {
- server.start();
- final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
- final ListenerEndpoint listener = future.get();
- final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
-
- final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
- final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
- final AsyncClientEndpoint endpoint = endpointFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- try {
-
- final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/stuff",
- new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
- final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message1, CoreMatchers.notNullValue());
- final HttpResponse response1 = message1.getHead();
- assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body1 = message1.getBody();
- assertThat(body1, CoreMatchers.equalTo("some stuff"));
-
- final Future<Message<HttpResponse, String>> resultFuture2 = endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/other-stuff",
- new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
- final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message2, CoreMatchers.notNullValue());
- final HttpResponse response2 = message2.getHead();
- assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body2 = message2.getBody();
- assertThat(body2, CoreMatchers.equalTo("some other stuff"));
-
- final Future<Message<HttpResponse, String>> resultFuture3 = endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/more-stuff",
- new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
- final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message3, CoreMatchers.notNullValue());
- final HttpResponse response3 = message3.getHead();
- assertThat(response3.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body3 = message3.getBody();
- assertThat(body3, CoreMatchers.equalTo("some more stuff"));
-
- } finally {
- endpoint.releaseAndReuse();
- }
- }
-
- @Test
- public void testPipelinedRequests() throws Exception {
- server.start();
- final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
- final ListenerEndpoint listener = future.get();
- final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
-
- final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
- final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
- final AsyncClientEndpoint endpoint = endpointFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- try {
-
- final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
-
- queue.add(endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/stuff",
- new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
- queue.add(endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/other-stuff",
- new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
- queue.add(endpoint.execute(
- new BasicRequestProducer(Method.POST, target, "/more-stuff",
- new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
- new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
-
- while (!queue.isEmpty()) {
- final Future<Message<HttpResponse, String>> resultFuture = queue.remove();
- final Message<HttpResponse, String> message = resultFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
- assertThat(message, CoreMatchers.notNullValue());
- final HttpResponse response = message.getHead();
- assertThat(response.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
- final String body = message.getBody();
- assertThat(body, CoreMatchers.containsString("stuff"));
- }
-
- } finally {
- endpoint.releaseAndReuse();
- }
- }
-
-}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
index 690b21acc..a1ce86105 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java
@@ -54,131 +54,69 @@ import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
-import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class H2ServerBootstrapFiltersTest {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
+public abstract class H2ServerBootstrapFiltersTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = H2ServerBootstrap.bootstrap()
- .setLookupRegistry(new UriPatternMatcher<>())
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .register("*", () -> new EchoHandler(2048))
- .addFilterLast("test-filter", (request, entityDetails, context, responseTrigger, chain) ->
- chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final HttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final HttpResponse response,
- final AsyncEntityProducer entityProducer) throws HttpException, IOException {
- response.setHeader("X-Test-Filter", "active");
- responseTrigger.submitResponse(response, entityProducer);
- }
-
- @Override
- public void pushPromise(
- final HttpRequest promise,
- final AsyncPushProducer responseProducer) throws HttpException, IOException {
- responseTrigger.pushPromise(promise, responseProducer);
- }
-
- }))
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2RequesterBootstrap.bootstrap()
- .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
- .setIOReactorConfig(IOReactorConfig.custom()
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource = new H2AsyncServerResource((bootstrap) -> bootstrap
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
.setSoTimeout(TIMEOUT)
.build())
- .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ .register("*", () -> new EchoHandler(2048))
+ .addFilterLast("test-filter", (request, entityDetails, context, responseTrigger, chain) ->
+ chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final HttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final HttpResponse response,
+ final AsyncEntityProducer entityProducer) throws HttpException, IOException {
+ response.setHeader("X-Test-Filter", "active");
+ responseTrigger.submitResponse(response, entityProducer);
+ }
+
+ @Override
+ public void pushPromise(
+ final HttpRequest promise,
+ final AsyncPushProducer responseProducer) throws HttpException, IOException {
+ responseTrigger.pushPromise(promise, responseProducer);
+ }
+
+ })));
+
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource = new H2AsyncRequesterResource(bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build()));
@Test
public void testSequentialRequests() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
+
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTP);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost("http", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture = requester.execute(
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index 5178e6b47..b2b499d72 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -31,8 +31,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Random;
import java.util.concurrent.Future;
@@ -47,8 +45,6 @@ import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Message;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
@@ -60,151 +56,79 @@ import org.apache.hc.core5.http.nio.support.AbstractAsyncServerAuthFilter;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class Http1AuthenticationTest {
-
- @Parameterized.Parameters(name = "respond immediately on auth failure: {0}")
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- { Boolean.FALSE },
- { Boolean.TRUE }
- });
- }
+public abstract class Http1AuthenticationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- private final boolean respondImmediately;
- private HttpAsyncServer server;
-
- public Http1AuthenticationTest(final Boolean respondImmediately) {
- this.respondImmediately = respondImmediately;
+ @RegisterExtension
+ private final HttpAsyncServerResource serverResource;
+ @RegisterExtension
+ private final HttpAsyncRequesterResource clientResource;
+
+ public Http1AuthenticationTest(final boolean respondImmediately) {
+ this.serverResource = new HttpAsyncServerResource(bootstrap -> bootstrap
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(null) // same as the default
+ .register("*", () -> new EchoHandler(2048))
+ .replaceFilter(StandardFilter.EXPECT_CONTINUE.name(), new AbstractAsyncServerAuthFilter<String>(respondImmediately) {
+
+ @Override
+ protected String parseChallengeResponse(
+ final String challenge, final HttpContext context) throws HttpException {
+ return challenge;
+ }
+
+ @Override
+ protected boolean authenticate(
+ final String challengeResponse,
+ final URIAuthority authority,
+ final String requestUri,
+ final HttpContext context) {
+ return challengeResponse != null && challengeResponse.equals("let me pass");
+ }
+
+ @Override
+ protected String generateChallenge(
+ final String challengeResponse,
+ final URIAuthority authority,
+ final String requestUri,
+ final HttpContext context) {
+ return "who goes there?";
+ }
+
+ @Override
+ protected AsyncEntityProducer generateResponseContent(final HttpResponse unauthorized) {
+ return AsyncEntityProducers.create("You shall not pass!!!");
+ }
+ })
+ );
+ this.clientResource = new HttpAsyncRequesterResource(bootstrap -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
}
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = AsyncServerBootstrap.bootstrap()
- .setLookupRegistry(null) // same as the default
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", () -> new EchoHandler(2048))
- .replaceFilter(StandardFilter.EXPECT_CONTINUE.name(), new AbstractAsyncServerAuthFilter<String>(respondImmediately) {
-
- @Override
- protected String parseChallengeResponse(
- final String challenge, final HttpContext context) throws HttpException {
- return challenge;
- }
-
- @Override
- protected boolean authenticate(
- final String challengeResponse,
- final URIAuthority authority,
- final String requestUri,
- final HttpContext context) {
- return challengeResponse != null && challengeResponse.equals("let me pass");
- }
-
- @Override
- protected String generateChallenge(
- final String challengeResponse,
- final URIAuthority authority,
- final String requestUri,
- final HttpContext context) {
- return "who goes there?";
- }
-
- @Override
- protected AsyncEntityProducer generateResponseContent(final HttpResponse unauthorized) {
- return AsyncEntityProducers.create("You shall not pass!!!");
- }
- })
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- try {
- server.close(CloseMode.IMMEDIATE);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = AsyncRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setMaxTotal(2)
- .setDefaultMaxPerRoute(2)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- try {
- requester.close(CloseMode.GRACEFUL);
- } catch (final Exception ignore) {
- }
- }
- }
-
- };
-
@Test
public void testGetRequestAuthentication() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTP);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost("localhost", address.getPort());
@@ -234,17 +158,17 @@ public class Http1AuthenticationTest {
@Test
public void testPostRequestAuthentication() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTP);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost("localhost", address.getPort());
final Random rnd = new Random();
final byte[] stuff = new byte[10240];
for (int i = 0; i < stuff.length; i++) {
- stuff[i] = (byte)('a' + rnd.nextInt(10));
+ stuff[i] = (byte) ('a' + rnd.nextInt(10));
}
final HttpRequest request1 = new BasicHttpRequest(Method.POST, target, "/stuff");
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -272,17 +196,17 @@ public class Http1AuthenticationTest {
@Test
public void testPostRequestAuthenticationNoExpectContinue() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTP);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost("localhost", address.getPort());
final Random rnd = new Random();
final byte[] stuff = new byte[10240];
for (int i = 0; i < stuff.length; i++) {
- stuff[i] = (byte)('a' + rnd.nextInt(10));
+ stuff[i] = (byte) ('a' + rnd.nextInt(10));
}
final HttpRequest request1 = new BasicHttpRequest(Method.POST, target, "/stuff");
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java
new file mode 100644
index 000000000..647696402
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java
@@ -0,0 +1,173 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.Future;
+
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Message;
+import org.apache.hc.core5.http.Method;
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
+import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
+import org.apache.hc.core5.http.nio.AsyncEntityProducer;
+import org.apache.hc.core5.http.nio.AsyncFilterChain;
+import org.apache.hc.core5.http.nio.AsyncPushProducer;
+import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
+import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
+import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
+import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
+import org.apache.hc.core5.http.protocol.UriPatternMatcher;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.util.Timeout;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class Http1CoreTransportTest extends HttpCoreTransportTest {
+
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+
+ @RegisterExtension
+ private final HttpAsyncServerResource serverResource;
+ @RegisterExtension
+ private final HttpAsyncRequesterResource clientResource;
+
+ public Http1CoreTransportTest(final URIScheme scheme) {
+ super(scheme);
+ this.serverResource = new HttpAsyncServerResource(bootstrap -> bootstrap
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ .addFilterBefore(StandardFilter.MAIN_HANDLER.name(), "no-keepalive", (request, entityDetails, context, responseTrigger, chain) ->
+ chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final HttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final HttpResponse response,
+ final AsyncEntityProducer entityProducer) throws HttpException, IOException {
+ if (request.getPath().startsWith("/no-keep-alive")) {
+ response.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
+ }
+ responseTrigger.submitResponse(response, entityProducer);
+ }
+
+ @Override
+ public void pushPromise(
+ final HttpRequest promise,
+ final AsyncPushProducer responseProducer) throws HttpException, IOException {
+ responseTrigger.pushPromise(promise, responseProducer);
+ }
+
+ }))
+ );
+ this.clientResource = new HttpAsyncRequesterResource(bootstrap -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
+ }
+
+ @Override
+ HttpAsyncServer serverStart() throws IOException {
+ return serverResource.start();
+ }
+
+ @Override
+ HttpAsyncRequester clientStart() {
+ return clientResource.start();
+ }
+
+ @Test
+ public void testSequentialRequestsNonPersistentConnection() throws Exception {
+ final HttpAsyncServer server = serverResource.start();
+ final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
+ final ListenerEndpoint listener = future.get();
+ final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
+ final HttpAsyncRequester requester = clientResource.start();
+
+ final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
+ final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/stuff",
+ new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
+ final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+ assertThat(message1, CoreMatchers.notNullValue());
+ final HttpResponse response1 = message1.getHead();
+ assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
+ final String body1 = message1.getBody();
+ assertThat(body1, CoreMatchers.equalTo("some stuff"));
+
+ final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/other-stuff",
+ new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
+ final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+ assertThat(message2, CoreMatchers.notNullValue());
+ final HttpResponse response2 = message2.getHead();
+ assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
+ final String body2 = message2.getBody();
+ assertThat(body2, CoreMatchers.equalTo("some other stuff"));
+
+ final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/more-stuff",
+ new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
+ final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+ assertThat(message3, CoreMatchers.notNullValue());
+ final HttpResponse response3 = message3.getHead();
+ assertThat(response3.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
+ final String body3 = message3.getBody();
+ assertThat(body3, CoreMatchers.equalTo("some more stuff"));
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 664a05906..acd650326 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -44,8 +44,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -124,70 +122,32 @@ import org.apache.hc.core5.http.protocol.RequestConnControl;
import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.http.protocol.RequestValidateHost;
-import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.reactor.ProtocolIOSession;
import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.extension.Http1TestResources;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Test;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-;
-
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-@RunWith(Parameterized.class)
-public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
- public Http1IntegrationTest(final URIScheme scheme) {
- super(scheme);
- }
+public abstract class Http1IntegrationTest {
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private static final Timeout LONG_TIMEOUT = Timeout.ofSeconds(60);
-
- private Http1TestClient client;
+ private static final Timeout LONG_TIMEOUT = Timeout.ofMinutes(2);
- @BeforeEach
- public void setup() throws Exception {
- log.debug("Starting up test client");
- client = new Http1TestClient(
- buildReactorConfig(),
- scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
- }
+ private final URIScheme scheme;
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.DEFAULT;
- }
+ @RegisterExtension
+ private final Http1TestResources resources;
- @AfterEach
- public void cleanup() throws Exception {
- log.debug("Shutting down test client");
- if (client != null) {
- client.shutdown(TimeValue.ofSeconds(5));
- }
+ public Http1IntegrationTest(final URIScheme scheme) {
+ this.scheme = scheme;
+ this.resources = new Http1TestResources(scheme, TIMEOUT);
}
private URI createRequestURI(final InetSocketAddress serverEndpoint, final String path) {
@@ -200,6 +160,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleGet() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -224,6 +187,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleGetConnectionClose() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -251,6 +217,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleGetIdentityTransfer() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final HttpProcessor httpProcessor = new DefaultHttpProcessor(new RequestValidateHost());
final InetSocketAddress serverEndpoint = server.start(httpProcessor, Http1Config.DEFAULT);
@@ -282,6 +251,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPostIdentityTransfer() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final HttpProcessor httpProcessor = new DefaultHttpProcessor(new RequestValidateHost());
final InetSocketAddress serverEndpoint = server.start(httpProcessor, Http1Config.DEFAULT);
@@ -314,6 +286,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPostIdentityTransferOutOfSequenceResponse() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new ImmediateResponseExchangeHandler(500, "Go away"));
final HttpProcessor httpProcessor = new DefaultHttpProcessor(new RequestValidateHost());
final InetSocketAddress serverEndpoint = server.start(httpProcessor, Http1Config.DEFAULT);
@@ -346,6 +321,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleGetsPipelined() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -374,6 +352,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testLargeGet() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcdef", 5000));
final InetSocketAddress serverEndpoint = server.start();
@@ -417,6 +398,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testLargeGetsPipelined() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcdef", 2000));
final InetSocketAddress serverEndpoint = server.start();
@@ -449,6 +433,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testBasicPost() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -474,6 +461,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testBasicPostPipelined() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -503,6 +493,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testHttp10Post() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -529,6 +522,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testNoEntityPost() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -554,6 +550,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testLargePost() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new EchoHandler(2048));
final InetSocketAddress serverEndpoint = server.start();
@@ -583,6 +582,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPostsPipelinedLargeResponse() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcdef", 2000));
final InetSocketAddress serverEndpoint = server.start();
@@ -615,8 +617,11 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
}
- @Test
+ @Test @Disabled("Fails intermittently on GitLab. Under investigation")
public void testLargePostsPipelined() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new EchoHandler(2048));
final InetSocketAddress serverEndpoint = server.start();
@@ -650,6 +655,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleHead() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -673,6 +681,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSimpleHeadConnectionClose() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -699,6 +710,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testHeadPipelined() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -724,8 +738,11 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
}
}
- @Test
+ @Test @Disabled("Fails intermittently on GitLab. Under investigation")
public void testExpectationFailed() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new MessageExchangeHandler<String>(new StringAsyncEntityConsumer()) {
@Override
@@ -813,6 +830,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testExpectationFailedCloseConnection() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new MessageExchangeHandler<String>(new StringAsyncEntityConsumer()) {
@Override
@@ -864,6 +884,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testDelayedExpectationVerification() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new AsyncServerExchangeHandler() {
private final Random random = new Random(System.currentTimeMillis());
@@ -960,6 +983,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPrematureResponse() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new AsyncServerExchangeHandler() {
private final AtomicReference<AsyncResponseProducer> responseProducer = new AtomicReference<>();
@@ -1052,6 +1078,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSlowResponseConsumer() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/", () -> new MultiLineResponseHandler("0123456789abcd", 100));
final InetSocketAddress serverEndpoint = server.start();
@@ -1103,6 +1132,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSlowRequestProducer() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new EchoHandler(2048));
final InetSocketAddress serverEndpoint = server.start();
@@ -1149,6 +1181,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testSlowResponseProducer() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("*", () -> new AbstractClassicServerExchangeHandler(2048, Executors.newSingleThreadExecutor()) {
@Override
@@ -1223,6 +1258,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPipelinedConnectionClose() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello*", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -1281,6 +1319,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testPipelinedInvalidRequest() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello*", () -> new SingleLineResponseHandler("Hi back"));
final InetSocketAddress serverEndpoint = server.start();
@@ -1375,6 +1416,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testTruncatedChunk() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
final InetSocketAddress serverEndpoint = server.start(new InternalServerHttp1EventHandlerFactory(
HttpProcessors.server(),
(request, context) -> new MessageExchangeHandler<String>(new StringAsyncEntityConsumer()) {
@@ -1457,6 +1501,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testExceptionInHandler() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there") {
@Override
@@ -1488,6 +1535,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testNoServiceHandler() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
final InetSocketAddress serverEndpoint = server.start();
client.start();
@@ -1509,6 +1559,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testResponseNoContent() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there") {
@Override
@@ -1540,6 +1593,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testAbsentHostHeader() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start();
@@ -1576,6 +1632,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testMessageWithTrailers() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new AbstractServerExchangeHandler<Message<HttpRequest, String>>() {
@Override
@@ -1631,6 +1690,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testProtocolException() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/boom", () -> new AsyncServerExchangeHandler() {
private final StringAsyncEntityProducer entityProducer = new StringAsyncEntityProducer("Everyting is OK");
@@ -1704,6 +1766,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testHeaderTooLarge() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start(null, Http1Config.custom()
.setMaxLineLength(100)
@@ -1730,6 +1795,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
public void testHeaderTooLargePost() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
server.register("/hello", () -> new SingleLineResponseHandler("Hi there"));
final InetSocketAddress serverEndpoint = server.start(null, Http1Config.custom()
.setMaxLineLength(100)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpCoreTransportTest.java
similarity index 70%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpCoreTransportTest.java
index 8ceb54d20..594b991b2 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpCoreTransportTest.java
@@ -31,16 +31,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.Future;
import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.HeaderElements;
-import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
@@ -48,160 +43,40 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
-import org.apache.hc.core5.http.impl.bootstrap.StandardFilter;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
-import org.apache.hc.core5.http.nio.AsyncEntityProducer;
-import org.apache.hc.core5.http.nio.AsyncFilterChain;
-import org.apache.hc.core5.http.nio.AsyncPushProducer;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
-import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
-import org.apache.hc.core5.http.nio.ssl.BasicServerTlsStrategy;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
-import org.apache.hc.core5.http.protocol.UriPatternMatcher;
-import org.apache.hc.core5.io.CloseMode;
-import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class Http1ServerAndRequesterTest {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { URIScheme.HTTP },
- { URIScheme.HTTPS }
- });
- }
+import org.junit.jupiter.api.Test;
+
+public abstract class HttpCoreTransportTest {
+
private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
- private final URIScheme scheme;
+ final URIScheme scheme;
- public Http1ServerAndRequesterTest(final URIScheme scheme) {
+ HttpCoreTransportTest(final URIScheme scheme) {
this.scheme = scheme;
}
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = AsyncServerBootstrap.bootstrap()
- .setLookupRegistry(new UriPatternMatcher<>())
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", () -> new EchoHandler(2048))
- .addFilterBefore(StandardFilter.MAIN_HANDLER.name(), "no-keepalive", (request, entityDetails, context, responseTrigger, chain) -> chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final HttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final HttpResponse response,
- final AsyncEntityProducer entityProducer) throws HttpException, IOException {
- if (request.getPath().startsWith("/no-keep-alive")) {
- response.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
- }
- responseTrigger.submitResponse(response, entityProducer);
- }
-
- @Override
- public void pushPromise(
- final HttpRequest promise,
- final AsyncPushProducer responseProducer) throws HttpException, IOException {
- responseTrigger.pushPromise(promise, responseProducer);
- }
-
- }))
- .setTlsStrategy(scheme == URIScheme.HTTPS ?
- new BasicServerTlsStrategy(SSLTestContexts.createServerSSLContext()) : null)
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = AsyncRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new BasicClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
+ abstract HttpAsyncServer serverStart() throws IOException;
- };
+ abstract HttpAsyncRequester clientStart() throws IOException;
@Test
public void testSequentialRequests() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverStart();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientStart();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -240,11 +115,11 @@ public class Http1ServerAndRequesterTest {
@Test
public void testSequentialRequestsNonPersistentConnection() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverStart();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientStart();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -283,11 +158,11 @@ public class Http1ServerAndRequesterTest {
@Test
public void testSequentialRequestsSameEndpoint() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverStart();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientStart();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
@@ -334,11 +209,11 @@ public class Http1ServerAndRequesterTest {
@Test
public void testPipelinedRequests() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverStart();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientStart();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
@@ -377,11 +252,11 @@ public class Http1ServerAndRequesterTest {
@Test
public void testNonPersistentHeads() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverStart();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), scheme);
final ListenerEndpoint listener = future.get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientStart();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpIntegrationTests.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpIntegrationTests.java
new file mode 100644
index 000000000..ae838703a
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpIntegrationTests.java
@@ -0,0 +1,136 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+
+public class HttpIntegrationTests {
+
+ @Nested
+ @DisplayName("Core transport (HTTP/1.1)")
+ public class CoreTransport extends Http1CoreTransportTest {
+
+ public CoreTransport() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (HTTP/1.1, TLS)")
+ public class CoreTransportTls extends Http1CoreTransportTest {
+
+ public CoreTransportTls() {
+ super(URIScheme.HTTPS);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (H2)")
+ public class CoreTransportH2 extends H2CoreTransportTest {
+
+ public CoreTransportH2() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (H2, TLS)")
+ public class CoreTransportH2Tls extends H2CoreTransportTest {
+
+ public CoreTransportH2Tls() {
+ super(URIScheme.HTTPS);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (H2, multiplexing)")
+ public class CoreTransportH2Multiplexing extends H2ServerAndMultiplexingRequesterTest {
+
+ public CoreTransportH2Multiplexing() {
+ super(URIScheme.HTTP);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Core transport (H2, multiplexing, TLS)")
+ public class CoreTransportH2MultiplexingTls extends H2ServerAndMultiplexingRequesterTest {
+
+ public CoreTransportH2MultiplexingTls() {
+ super(URIScheme.HTTPS);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Server filters")
+ public class HttpFilters extends AsyncServerBootstrapFilterTest {
+
+ public HttpFilters() {
+ super();
+ }
+
+ }
+
+ @Nested
+ @DisplayName("H2 Server filters")
+ public class H2Filters extends H2ServerBootstrapFiltersTest {
+
+ public H2Filters() {
+ super();
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Authentication")
+ public class Authentication extends Http1AuthenticationTest {
+
+ public Authentication() {
+ super(false);
+ }
+
+ }
+
+ @Nested
+ @DisplayName("Authentication (immediate response)")
+ public class AuthenticationImmediateResponse extends Http1AuthenticationTest {
+
+ public AuthenticationImmediateResponse() {
+ super(true);
+ }
+
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpProtocolTests.java
similarity index 58%
copy from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
copy to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpProtocolTests.java
index 338c411f9..7f4a481ba 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/HttpProtocolTests.java
@@ -28,40 +28,49 @@
package org.apache.hc.core5.testing.nio;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SocksProxy;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
-public class H2SocksProxyIntegrationTest extends H2IntegrationTest {
+public class HttpProtocolTests {
- protected static SocksProxy PROXY;
+ @Nested
+ @DisplayName("HTTP/1.1 (plain)")
+ public class Http1 extends Http1IntegrationTest {
+
+ public Http1() {
+ super(URIScheme.HTTP);
+ }
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
}
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ @Nested
+ @DisplayName("HTTP/1.1 (TLS)")
+ public class Http1Tls extends Http1IntegrationTest {
+
+ public Http1Tls() {
+ super(URIScheme.HTTPS);
}
+
}
- public H2SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
+ @Nested
+ @DisplayName("HTTP/2 (plain)")
+ public class H2 extends H2IntegrationTest {
+
+ public H2() {
+ super(URIScheme.HTTP);
+ }
+
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("HTTP/2 (TLS)")
+ public class H2Tls extends H2IntegrationTest {
+
+ public H2Tls() {
+ super(URIScheme.HTTPS);
+ }
+
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalH2ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalH2ServerTestBase.java
deleted file mode 100644
index fae7f2405..000000000
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalH2ServerTestBase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.hc.core5.testing.nio;
-
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@ExtendWith({InternalH2ServerTestBase.serverResource.class})
-public abstract class InternalH2ServerTestBase {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- protected final URIScheme scheme;
-
- public InternalH2ServerTestBase(final URIScheme scheme) {
- this.scheme = scheme;
- }
-
- public InternalH2ServerTestBase() {
- this(URIScheme.HTTP);
- }
-
- protected H2TestServer server;
-
- class serverResource implements AfterEachCallback, BeforeEachCallback {
-
- @Override
- public void beforeEach(final ExtensionContext context) throws Exception {
- log.debug("Starting up test server");
- server = new H2TestServer(IOReactorConfig.DEFAULT,
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
- }
-
- @Override
- public void afterEach(final ExtensionContext context) throws Exception {
- log.debug("Shutting down test server");
- if (server != null) {
- server.shutdown(TimeValue.ofSeconds(5));
- }
- }
- }
-
-}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
deleted file mode 100644
index 3fe9df974..000000000
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.hc.core5.testing.nio;
-
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.Rule;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public abstract class InternalHttp1ServerTestBase {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- protected final URIScheme scheme;
-
- public InternalHttp1ServerTestBase(final URIScheme scheme) {
- this.scheme = scheme;
- }
-
- public InternalHttp1ServerTestBase() {
- this(URIScheme.HTTP);
- }
-
- protected Http1TestServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = new Http1TestServer(
- IOReactorConfig.DEFAULT,
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.shutdown(TimeValue.ofSeconds(5));
- }
- }
-
- };
-
-}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 57f984139..61a690330 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -34,8 +34,6 @@ import java.net.URL;
import java.security.Provider;
import java.security.SecureRandom;
import java.security.Security;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.concurrent.Future;
import org.apache.hc.core5.http.HttpHeaders;
@@ -55,34 +53,26 @@ import org.apache.hc.core5.ssl.SSLContextBuilder;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.conscrypt.Conscrypt;
-import org.junit.Rule;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class JSSEProviderIntegrationTest {
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0} {1}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- {"Oracle", null},
- {"Conscrypt", "TLSv1.2"},
- {"Conscrypt", "TLSv1.3"},
- });
- }
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+
+// @Parameterized.Parameters(name = "{0} {1}")
+// public static Collection<Object[]> protocols() {
+// return Arrays.asList(new Object[][]{
+// {"Oracle", null},
+// {"Conscrypt", "TLSv1.2"},
+// {"Conscrypt", "TLSv1.3"},
+// });
+// }
+
+
+public abstract class JSSEProviderIntegrationTest {
private final String securityProviderName;
private final String protocolVersion;
@@ -97,14 +87,11 @@ public class JSSEProviderIntegrationTest {
private static final int REQ_NUM = 25;
private Provider securityProvider;
- private Http1TestServer server;
- private Http1TestClient client;
- @Rule
- public TestRule resourceRules = RuleChain.outerRule(new ExternalResource() {
+ class SecurityProviderResource implements BeforeEachCallback, AfterEachCallback {
@Override
- protected void before() throws Throwable {
+ public void beforeEach(final ExtensionContext context) throws Exception {
if ("Conscrypt".equalsIgnoreCase(securityProviderName)) {
try {
securityProvider = Conscrypt.newProviderBuilder().provideTrustManager(true).build();
@@ -120,19 +107,25 @@ public class JSSEProviderIntegrationTest {
}
@Override
- protected void after() {
+ public void afterEach(final ExtensionContext context) throws Exception {
if (securityProvider != null) {
Security.removeProvider(securityProvider.getName());
securityProvider = null;
}
}
- }).around(new ExternalResource() {
+ }
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
+ @RegisterExtension
+ @Order(1)
+ private final SecurityProviderResource securityProviderResource = new SecurityProviderResource();
+
+ private Http1TestServer server;
+ class ServerResource implements BeforeEachCallback, AfterEachCallback {
+
+ @Override
+ public void beforeEach(final ExtensionContext context) throws Exception {
final URL keyStoreURL = getClass().getResource("/test-server.p12");
final String storePassword = "nopassword";
@@ -156,19 +149,24 @@ public class JSSEProviderIntegrationTest {
}
@Override
- protected void after() {
- log.debug("Shutting down test server");
+ public void afterEach(final ExtensionContext context) throws Exception {
if (server != null) {
server.shutdown(TimeValue.ofSeconds(5));
}
}
- }).around(new ExternalResource() {
+ }
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
+ @RegisterExtension
+ @Order(2)
+ private final ServerResource serverResource = new ServerResource();
+
+ private Http1TestClient client;
+
+ class ClientResource implements BeforeEachCallback, AfterEachCallback {
+ @Override
+ public void beforeEach(final ExtensionContext context) throws Exception {
final URL keyStoreURL = getClass().getResource("/test-client.p12");
final String storePassword = "nopassword";
@@ -191,14 +189,17 @@ public class JSSEProviderIntegrationTest {
}
@Override
- protected void after() {
- log.debug("Shutting down test client");
+ public void afterEach(final ExtensionContext context) throws Exception {
if (client != null) {
client.shutdown(TimeValue.ofSeconds(5));
}
}
- });
+ }
+
+ @RegisterExtension
+ @Order(3)
+ private final ClientResource clientResource = new ClientResource();
private URI createRequestURI(final InetSocketAddress serverEndpoint, final String path) {
try {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
similarity index 56%
copy from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
copy to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
index 338c411f9..36ecda68a 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTests.java
@@ -27,41 +27,39 @@
package org.apache.hc.core5.testing.nio;
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SocksProxy;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
-public class H2SocksProxyIntegrationTest extends H2IntegrationTest {
+public class JSSEProviderIntegrationTests {
- protected static SocksProxy PROXY;
+ @Nested
+ @DisplayName("Oracle (default)")
+ public class Oracle extends JSSEProviderIntegrationTest {
+
+ public Oracle() {
+ super("Oracle", null);
+ }
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
}
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ @Nested
+ @DisplayName("Conscrypt (TLSv1.2)")
+ public class ConscryptTlsV1_2 extends JSSEProviderIntegrationTest {
+
+ public ConscryptTlsV1_2() {
+ super("Conscrypt", "TLSv1.2");
}
- }
- public H2SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("Conscrypt (TLSv1.3)")
+ public class ConscryptTlsV1_3 extends JSSEProviderIntegrationTest {
+
+ public ConscryptTlsV1_3() {
+ super("Conscrypt", "TLSv1.3");
+ }
+
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSIntegrationTest.java
index cef309fe2..5bf8064bc 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSIntegrationTest.java
@@ -82,32 +82,28 @@ import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
-import org.junit.Rule;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.rules.ExternalResource;
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
public class TLSIntegrationTest {
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
private HttpAsyncServer server;
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
+ @RegisterExtension
+ public final AfterEachCallback serverCleanup = new AfterEachCallback() {
@Override
- protected void after() {
+ public void afterEach(final ExtensionContext context) throws Exception {
if (server != null) {
try {
server.close(CloseMode.IMMEDIATE);
@@ -120,14 +116,14 @@ public class TLSIntegrationTest {
private HttpAsyncRequester client;
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
+ @RegisterExtension
+ public final AfterEachCallback clientCleanup = new AfterEachCallback() {
@Override
- protected void after() {
+ public void afterEach(final ExtensionContext context) throws Exception {
if (client != null) {
try {
- client.close(CloseMode.IMMEDIATE);
+ client.close(CloseMode.GRACEFUL);
} catch (final Exception ignore) {
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
index 242218f00..d3ac4796d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
@@ -41,112 +41,59 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
-import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityProducer;
-import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
-import org.apache.hc.core5.http.nio.ssl.BasicServerTlsStrategy;
import org.apache.hc.core5.http.nio.ssl.TlsUpgradeCapable;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.reactor.ProtocolIOSession;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
-import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TLSUpgradeTest {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = AsyncServerBootstrap.bootstrap()
- .setLookupRegistry(new UriPatternMatcher<>())
- .setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .register("*", () -> new EchoHandler(2048))
- .setTlsStrategy(new BasicServerTlsStrategy(SSLTestContexts.createServerSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = AsyncRequesterBootstrap.bootstrap()
- .setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(TIMEOUT)
- .build())
- .setTlsStrategy(new BasicClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ @RegisterExtension
+ private final HttpAsyncServerResource serverResource;
+ @RegisterExtension
+ private final HttpAsyncRequesterResource clientResource;
+
+ public TLSUpgradeTest() {
+ this.serverResource = new HttpAsyncServerResource(bootstrap -> bootstrap
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ );
+ this.clientResource = new HttpAsyncRequesterResource(bootstrap -> bootstrap
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ );
+ }
@Test
public void testTLSUpgrade() throws Exception {
- server.start();
+ final HttpAsyncServer server = serverResource.start();
final Future<ListenerEndpoint> future = server.listen(new InetSocketAddress(0), URIScheme.HTTPS);
final ListenerEndpoint listener = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
+ final HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java
new file mode 100644
index 000000000..c4a36a98c
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java
@@ -0,0 +1,94 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
+import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
+import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
+import org.apache.hc.core5.testing.nio.LoggingH2StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class H2AsyncRequesterResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(H2AsyncRequesterResource.class);
+
+ private final Consumer<H2RequesterBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncRequester requester;
+
+ public H2AsyncRequesterResource(final Consumer<H2RequesterBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final H2RequesterBootstrap bootstrap = H2RequesterBootstrap.bootstrap()
+ .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
+ .setStreamListener(LoggingH2StreamListener.INSTANCE)
+ .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
+ .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ requester = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (requester != null) {
+ try {
+ requester.close(CloseMode.GRACEFUL);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpAsyncRequester start() {
+ Assertions.assertNotNull(requester);
+ requester.start();
+ return requester;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncServerResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncServerResource.java
new file mode 100644
index 000000000..9f87d05f1
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncServerResource.java
@@ -0,0 +1,94 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
+import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
+import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
+import org.apache.hc.core5.testing.nio.LoggingH2StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class H2AsyncServerResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(H2AsyncServerResource.class);
+
+ private final Consumer<H2ServerBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncServer server;
+
+ public H2AsyncServerResource(final Consumer<H2ServerBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+
+ final H2ServerBootstrap bootstrap = H2ServerBootstrap.bootstrap()
+ .setTlsStrategy(new H2ServerTlsStrategy(SSLTestContexts.createServerSSLContext()))
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
+ .setStreamListener(LoggingH2StreamListener.INSTANCE)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
+ .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ server = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ try {
+ server.close(CloseMode.IMMEDIATE);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpAsyncServer start() throws IOException {
+ Assertions.assertNotNull(server);
+ server.start();
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java
new file mode 100644
index 000000000..8b9ad8e9c
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java
@@ -0,0 +1,90 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequester;
+import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequesterBootstrap;
+import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
+import org.apache.hc.core5.testing.nio.LoggingH2StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class H2MultiplexingRequesterResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(H2MultiplexingRequesterResource.class);
+
+ private final Consumer<H2MultiplexingRequesterBootstrap> bootstrapCustomizer;
+
+ private H2MultiplexingRequester requester;
+
+ public H2MultiplexingRequesterResource(final Consumer<H2MultiplexingRequesterBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final H2MultiplexingRequesterBootstrap bootstrap = H2MultiplexingRequesterBootstrap.bootstrap()
+ .setTlsStrategy(new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
+ .setStreamListener(LoggingH2StreamListener.INSTANCE)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
+ .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ requester = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (requester != null) {
+ try {
+ requester.close(CloseMode.GRACEFUL);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public H2MultiplexingRequester start() {
+ Assertions.assertNotNull(requester);
+ requester.start();
+ return requester;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
new file mode 100644
index 000000000..113ca3006
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
@@ -0,0 +1,99 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.H2TestClient;
+import org.apache.hc.core5.testing.nio.H2TestServer;
+import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class H2TestResources implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(H2TestResources.class);
+
+ private final URIScheme scheme;
+ private final Timeout socketTimeout;
+
+ private H2TestServer server;
+ private H2TestClient client;
+
+ public H2TestResources(final URIScheme scheme, final Timeout socketTimeout) {
+ this.scheme = scheme;
+ this.socketTimeout = socketTimeout;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+ server = new H2TestServer(
+ IOReactorConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build(),
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
+
+ LOG.debug("Starting up test client");
+ client = new H2TestClient(
+ IOReactorConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build(),
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (client != null) {
+ client.shutdown(TimeValue.ofSeconds(5));
+ }
+
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ server.shutdown(TimeValue.ofSeconds(5));
+ }
+ }
+
+ public H2TestClient client() {
+ Assertions.assertNotNull(client);
+ return client;
+ }
+
+ public H2TestServer server() {
+ Assertions.assertNotNull(server);
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
new file mode 100644
index 000000000..04ecfad81
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
@@ -0,0 +1,99 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.Http1TestClient;
+import org.apache.hc.core5.testing.nio.Http1TestServer;
+import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Http1TestResources implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(Http1TestResources.class);
+
+ private final URIScheme scheme;
+ private final Timeout socketTimeout;
+
+ private Http1TestServer server;
+ private Http1TestClient client;
+
+ public Http1TestResources(final URIScheme scheme, final Timeout socketTimeout) {
+ this.scheme = scheme;
+ this.socketTimeout = socketTimeout;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+ server = new Http1TestServer(
+ IOReactorConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build(),
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
+
+ LOG.debug("Starting up test client");
+ client = new Http1TestClient(
+ IOReactorConfig.custom()
+ .setSoTimeout(socketTimeout)
+ .build(),
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (client != null) {
+ client.shutdown(TimeValue.ofSeconds(5));
+ }
+
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ server.shutdown(TimeValue.ofSeconds(5));
+ }
+ }
+
+ public Http1TestClient client() {
+ Assertions.assertNotNull(client);
+ return client;
+ }
+
+ public Http1TestServer server() {
+ Assertions.assertNotNull(server);
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncRequesterResource.java
new file mode 100644
index 000000000..02d035ed0
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncRequesterResource.java
@@ -0,0 +1,92 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
+import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpAsyncRequesterResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(HttpAsyncRequesterResource.class);
+
+ private final Consumer<AsyncRequesterBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncRequester requester;
+
+ public HttpAsyncRequesterResource(final Consumer<AsyncRequesterBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final AsyncRequesterBootstrap bootstrap = AsyncRequesterBootstrap.bootstrap()
+ .setTlsStrategy(new BasicClientTlsStrategy(SSLTestContexts.createClientSSLContext()))
+ .setMaxTotal(2)
+ .setDefaultMaxPerRoute(2)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
+ .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ requester = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (requester != null) {
+ try {
+ requester.close(CloseMode.GRACEFUL);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpAsyncRequester start() {
+ Assertions.assertNotNull(requester);
+ requester.start();
+ return requester;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncServerResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncServerResource.java
new file mode 100644
index 000000000..fb76d7e24
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncServerResource.java
@@ -0,0 +1,92 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.hc.core5.testing.nio.extension;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
+import org.apache.hc.core5.http.nio.ssl.BasicServerTlsStrategy;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.testing.SSLTestContexts;
+import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
+import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpAsyncServerResource implements BeforeEachCallback, AfterEachCallback {
+
+ private static final Logger LOG = LoggerFactory.getLogger(HttpAsyncServerResource.class);
+
+ private final Consumer<AsyncServerBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncServer server;
+
+ public HttpAsyncServerResource(final Consumer<AsyncServerBootstrap> bootstrapCustomizer) {
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+
+ final AsyncServerBootstrap bootstrap = AsyncServerBootstrap.bootstrap()
+ .setTlsStrategy(new BasicServerTlsStrategy(SSLTestContexts.createServerSSLContext()))
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
+ .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE);
+ bootstrapCustomizer.accept(bootstrap);
+ server = bootstrap.create();
+ }
+
+ @Override
+ public void afterEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Shutting down test server");
+ if (server != null) {
+ try {
+ server.close(CloseMode.IMMEDIATE);
+ } catch (final Exception ignore) {
+ }
+ }
+ }
+
+ public HttpAsyncServer start() throws IOException {
+ Assertions.assertNotNull(server);
+ server.start();
+ return server;
+ }
+
+}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/IntegrationTests.java
similarity index 54%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/IntegrationTests.java
index 338c411f9..119f691bd 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/IntegrationTests.java
@@ -25,43 +25,32 @@
*
*/
-package org.apache.hc.core5.testing.nio;
+package org.apache.hc.core5.testing.reactive;
-import org.apache.hc.core5.http.URIScheme;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.SocksProxy;
-import org.apache.hc.core5.util.TimeValue;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.apache.hc.core5.http2.HttpVersionPolicy;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
-public class H2SocksProxyIntegrationTest extends H2IntegrationTest {
+public class IntegrationTests {
- protected static SocksProxy PROXY;
+ @Nested
+ @DisplayName("Reactive client (HTTP/1.1)")
+ public class CoreFunctions extends ReactiveClientTest {
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
- }
-
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ public CoreFunctions() {
+ super(HttpVersionPolicy.FORCE_HTTP_1);
}
- }
- public H2SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("Reactive client (HTTP/2)")
+ public class CoreFunctionsTls extends ReactiveClientTest {
+
+ public CoreFunctionsTls() {
+ super(HttpVersionPolicy.FORCE_HTTP_2);
+ }
+
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
index a29fe4b86..99a572e3a 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
@@ -30,14 +30,13 @@ import static java.lang.String.format;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.Random;
import java.util.concurrent.CancellationException;
@@ -57,129 +56,57 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
-import org.apache.hc.core5.http2.impl.nio.bootstrap.H2ServerBootstrap;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactive.ReactiveEntityProducer;
import org.apache.hc.core5.reactive.ReactiveResponseConsumer;
import org.apache.hc.core5.reactive.ReactiveServerExchangeHandler;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
-import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
-import org.apache.hc.core5.testing.nio.LoggingH2StreamListener;
-import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
-import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
-import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
import org.apache.hc.core5.testing.reactive.Reactive3TestUtils.StreamDescription;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.Extensions;
-import org.junit.jupiter.migrationsupport.rules.ExternalResourceSupport;
-import org.junit.rules.ExternalResource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.reactivestreams.Publisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-@RunWith(Parameterized.class)
-@Extensions({@ExtendWith({ExternalResourceSupport.class})})
-public class ReactiveClientTest {
+public abstract class ReactiveClientTest {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> protocols() {
- return Arrays.asList(new Object[][]{
- { HttpVersionPolicy.FORCE_HTTP_1 },
- { HttpVersionPolicy.FORCE_HTTP_2 }
- });
- }
private static final Timeout SOCKET_TIMEOUT = Timeout.ofSeconds(30);
private static final Timeout RESULT_TIMEOUT = Timeout.ofSeconds(60);
private static final Random RANDOM = new Random();
private final HttpVersionPolicy versionPolicy;
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource;
public ReactiveClientTest(final HttpVersionPolicy httpVersionPolicy) {
this.versionPolicy = httpVersionPolicy;
- }
-
- private HttpAsyncServer server;
-
- @Rule
- public ExternalResource serverResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test server");
- server = H2ServerBootstrap.bootstrap()
+ this.serverResource = new H2AsyncServerResource(bootstrap -> bootstrap
.setVersionPolicy(versionPolicy)
.setIOReactorConfig(
- IOReactorConfig.custom()
- .setSoTimeout(SOCKET_TIMEOUT)
- .build())
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_SERVER)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
+ IOReactorConfig.custom()
+ .setSoTimeout(SOCKET_TIMEOUT)
+ .build())
.register("*", () -> new ReactiveServerExchangeHandler(new ReactiveEchoProcessor()))
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test server");
- if (server != null) {
- server.close(CloseMode.GRACEFUL);
- }
- }
-
- };
-
- private HttpAsyncRequester requester;
-
- @Rule
- public ExternalResource clientResource = new ExternalResource() {
-
- @Override
- protected void before() throws Throwable {
- log.debug("Starting up test client");
- requester = H2RequesterBootstrap.bootstrap()
+ );
+ this.clientResource = new H2AsyncRequesterResource(bootstrap -> bootstrap
.setVersionPolicy(versionPolicy)
.setIOReactorConfig(IOReactorConfig.custom()
- .setSoTimeout(SOCKET_TIMEOUT)
- .build())
- .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
- .setStreamListener(LoggingH2StreamListener.INSTANCE)
- .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
- .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
- .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
- .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
- .create();
- }
-
- @Override
- protected void after() {
- log.debug("Shutting down test client");
- if (requester != null) {
- requester.close(CloseMode.GRACEFUL);
- }
- }
-
- };
+ .setSoTimeout(SOCKET_TIMEOUT)
+ .build())
+ );
+ }
@Test
public void testSimpleRequest() throws Exception {
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
final byte[] input = new byte[1024];
RANDOM.nextBytes(input);
final Publisher<ByteBuffer> publisher = Flowable.just(ByteBuffer.wrap(input));
@@ -209,7 +136,8 @@ public class ReactiveClientTest {
@Test
public void testLongRunningRequest() throws Exception {
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
final long expectedLength = 6_554_200L;
final AtomicReference<String> expectedHash = new AtomicReference<>();
final Flowable<ByteBuffer> stream = Reactive3TestUtils.produceStream(expectedLength, expectedHash);
@@ -232,7 +160,8 @@ public class ReactiveClientTest {
// ReactiveDataConsumer signals capacity with its capacity channel. The situations in which
// this kind of bug manifests depend on the ordering of several events on different threads
// so it's unlikely to consistently occur.
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
for (int i = 0; i < 10; i++) {
final long expectedLength = 1_024_000;
final int maximumBlockSize = 1024;
@@ -244,7 +173,7 @@ public class ReactiveClientTest {
final ReactiveResponseConsumer consumer = new ReactiveResponseConsumer();
requester.execute(request, consumer, SOCKET_TIMEOUT, null);
final Message<HttpResponse, Publisher<ByteBuffer>> response = consumer.getResponseFuture()
- .get(RESULT_TIMEOUT.getDuration(), RESULT_TIMEOUT.getTimeUnit());
+ .get(RESULT_TIMEOUT.getDuration(), RESULT_TIMEOUT.getTimeUnit());
final StreamDescription desc = Reactive3TestUtils.consumeStream(response.getBody()).blockingGet();
Assertions.assertEquals(expectedLength, desc.length);
@@ -254,7 +183,8 @@ public class ReactiveClientTest {
@Test
public void testRequestError() throws Exception {
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
final RuntimeException exceptionThrown = new RuntimeException("Test");
final Publisher<ByteBuffer> publisher = Flowable.error(exceptionThrown);
final ReactiveEntityProducer producer = new ReactiveEntityProducer(publisher, 100, null, null);
@@ -273,10 +203,11 @@ public class ReactiveClientTest {
@Test
public void testRequestTimeout() throws Exception {
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
final AtomicBoolean requestPublisherWasCancelled = new AtomicBoolean(false);
final Publisher<ByteBuffer> publisher = Flowable.<ByteBuffer>never()
- .doOnCancel(() -> requestPublisherWasCancelled.set(true));
+ .doOnCancel(() -> requestPublisherWasCancelled.set(true));
final ReactiveEntityProducer producer = new ReactiveEntityProducer(publisher, -1, null, null);
final BasicRequestProducer request = getRequestProducer(address, producer);
@@ -298,12 +229,13 @@ public class ReactiveClientTest {
@Test
public void testResponseCancellation() throws Exception {
- final InetSocketAddress address = startClientAndServer();
+ final InetSocketAddress address = startServer();
+ final HttpAsyncRequester requester = clientResource.start();
final AtomicBoolean requestPublisherWasCancelled = new AtomicBoolean(false);
final AtomicReference<Throwable> requestStreamError = new AtomicReference<>();
final Publisher<ByteBuffer> stream = Reactive3TestUtils.produceStream(Long.MAX_VALUE, 1024, null)
- .doOnCancel(() -> requestPublisherWasCancelled.set(true))
- .doOnError(requestStreamError::set);
+ .doOnCancel(() -> requestPublisherWasCancelled.set(true))
+ .doOnError(requestStreamError::set);
final ReactiveEntityProducer producer = new ReactiveEntityProducer(stream, -1, null, null);
final BasicRequestProducer request = getRequestProducer(address, producer);
@@ -314,10 +246,10 @@ public class ReactiveClientTest {
final AtomicBoolean responsePublisherWasCancelled = new AtomicBoolean(false);
final List<ByteBuffer> outputBuffers = Flowable.fromPublisher(response.getBody())
- .doOnCancel(() -> responsePublisherWasCancelled.set(true))
- .take(3)
- .toList()
- .blockingGet();
+ .doOnCancel(() -> responsePublisherWasCancelled.set(true))
+ .take(3)
+ .toList()
+ .blockingGet();
Assertions.assertEquals(3, outputBuffers.size());
Assertions.assertTrue(responsePublisherWasCancelled.get(), "The response subscription should have been cancelled");
final Exception exception = Assertions.assertThrows(Exception.class, () ->
@@ -330,11 +262,10 @@ public class ReactiveClientTest {
Assertions.assertNull(requestStreamError.get());
}
- private InetSocketAddress startClientAndServer() throws InterruptedException, ExecutionException {
- server.start();
+ private InetSocketAddress startServer() throws IOException, InterruptedException, ExecutionException {
+ final HttpAsyncServer server = serverResource.start();
final ListenerEndpoint listener = server.listen(new InetSocketAddress(0), URIScheme.HTTP).get();
final InetSocketAddress address = (InetSocketAddress) listener.getAddress();
- requester.start();
return address;
}
}
diff --git a/pom.xml b/pom.xml
index 0b66a4468..42fe45024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,12 +146,6 @@
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>