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/20 13:39:44 UTC
[httpcomponents-core] branch broken_junit5 updated (0d3ae8f4a -> fa0c52f05)
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 0d3ae8f4a Fixed integration tests broken by JUnit 5 upgrade
new fa0c52f05 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 (0d3ae8f4a)
\
N -- N -- N refs/heads/broken_junit5 (fa0c52f05)
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:
.../classic/ClassicServerAndRequesterTest.java | 4 +-
...ndRequesterTests.java => IntegrationTests.java} | 2 +-
.../classic/extension/HttpRequesterResource.java | 8 +-
.../classic/extension/HttpServerResource.java | 8 +-
...{H2ProtocolTest.java => H2IntegrationTest.java} | 4 +-
.../testing/nio/H2ProtocolNegotiationTest.java | 2 -
.../testing/nio/H2ServerAndRequesterTest.java | 140 +++++----------------
.../testing/nio/H2ServerBootstrapFiltersTest.java | 92 +++-----------
...ProtocolTest.java => Http1IntegrationTest.java} | 4 +-
.../IntegrationTests.java} | 26 ++--
.../{HttpProtocolTests.java => ProtocolTests.java} | 14 +--
.../extension/H2AsyncRequesterResource.java} | 45 ++++---
.../extension/H2AsyncServerResource.java} | 42 ++++---
.../extension/HttpAsyncRequesterResource.java} | 39 +++---
.../extension/HttpAsyncServerResource.java} | 40 +++---
15 files changed, 189 insertions(+), 281 deletions(-)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/{ClassicServerAndRequesterTests.java => IntegrationTests.java} (97%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/{H2ProtocolTest.java => H2IntegrationTest.java} (99%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/{Http1ProtocolTest.java => Http1IntegrationTest.java} (99%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/{classic/ClassicServerAndRequesterTests.java => nio/IntegrationTests.java} (73%)
rename httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/{HttpProtocolTests.java => ProtocolTests.java} (85%)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/{classic/extension/HttpRequesterResource.java => nio/extension/H2AsyncRequesterResource.java} (59%)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/{classic/extension/HttpServerResource.java => nio/extension/H2AsyncServerResource.java} (59%)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/{classic/extension/HttpRequesterResource.java => nio/extension/HttpAsyncRequesterResource.java} (65%)
copy httpcore5-testing/src/test/java/org/apache/hc/core5/testing/{classic/extension/HttpServerResource.java => nio/extension/HttpAsyncServerResource.java} (63%)
[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 fa0c52f054c7e4fdfdf34835e908b18a3f548d8d
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Wed Oct 19 22:53:03 2022 +0200
Fixed integration tests broken by JUnit 5 upgrade
---
.../classic/ClassicServerAndRequesterTest.java | 153 +++++-------------
.../IntegrationTests.java} | 45 ++----
.../classic/extension/HttpRequesterResource.java | 89 +++++++++++
.../classic/extension/HttpServerResource.java | 90 +++++++++++
.../hc/core5/testing/nio/H2IntegrationTest.java | 115 ++++++++------
.../testing/nio/H2ProtocolNegotiationTest.java | 2 -
.../testing/nio/H2ServerAndRequesterTest.java | 140 ++++-------------
.../testing/nio/H2ServerBootstrapFiltersTest.java | 92 ++---------
.../hc/core5/testing/nio/Http1IntegrationTest.java | 172 ++++++++++++++-------
...yIntegrationTest.java => IntegrationTests.java} | 54 +++----
.../testing/nio/InternalHttp1ServerTestBase.java | 80 ----------
...roxyIntegrationTest.java => ProtocolTests.java} | 57 ++++---
.../nio/extension/H2AsyncRequesterResource.java | 98 ++++++++++++
.../nio/extension/H2AsyncServerResource.java | 98 ++++++++++++
.../H2TestResources.java} | 64 +++++---
.../Http1TestResources.java} | 64 +++++---
.../nio/extension/HttpAsyncRequesterResource.java | 96 ++++++++++++
.../nio/extension/HttpAsyncServerResource.java | 96 ++++++++++++
18 files changed, 998 insertions(+), 607 deletions(-)
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/ClassicServerAndRequesterTest.java
index c74677d57..3e5085980 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/ClassicServerAndRequesterTest.java
@@ -30,8 +30,6 @@ 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;
@@ -45,8 +43,6 @@ 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;
@@ -54,128 +50,60 @@ 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.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;
-
-@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 }
- });
- }
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
- private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+public abstract class ClassicServerAndRequesterTest {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Timeout TIMEOUT = Timeout.ofMinutes(1);
private final URIScheme scheme;
- private HttpServer server;
+
+ @RegisterExtension
+ private final HttpServerResource serverResource;
+
+ @RegisterExtension
+ private final HttpRequesterResource clientResource;
public ClassicServerAndRequesterTest(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);
+ 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);
}
- 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()
- .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) {
- }
- }
- }
+ @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(scheme, (bootstrap) ->
+ bootstrap.setSocketConfig(SocketConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build()));
+ }
@Test
public void testSequentialRequests() throws Exception {
- server.start();
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
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 +131,8 @@ public class ClassicServerAndRequesterTest {
@Test
public void testSequentialRequestsNonPersistentConnection() throws Exception {
- server.start();
+ final HttpServer server = serverResource.start();
+ final HttpRequester requester = clientResource.start();
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/nio/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/IntegrationTests.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/IntegrationTests.java
index 338c411f9..67bd20715 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/IntegrationTests.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 IntegrationTests {
- protected static SocksProxy PROXY;
+ @Nested
+ @DisplayName("HTTP")
+ public class Http extends ClassicServerAndRequesterTest {
- @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 Http() {
+ super(URIScheme.HTTP);
}
- }
- public H2SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("HTTPS")
+ public class Https extends ClassicServerAndRequesterTest {
+
+ public Https() {
+ super(URIScheme.HTTPS);
+ }
+
}
}
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..33bc354c7
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpRequesterResource.java
@@ -0,0 +1,89 @@
+/*
+ * ====================================================================
+ * 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.URIScheme;
+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 URIScheme scheme;
+ private final Consumer<RequesterBootstrap> bootstrapCustomizer;
+
+ private HttpRequester requester;
+
+ public HttpRequesterResource(final URIScheme scheme, final Consumer<RequesterBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final RequesterBootstrap bootstrap = RequesterBootstrap.bootstrap()
+ .setSslContext(scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null)
+ .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/H2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
index 173798c51..8a302d533 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,67 +113,28 @@ 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 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);
}
private URI createRequestURI(final InetSocketAddress serverEndpoint, final String path) {
@@ -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..760b2e557 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
@@ -84,7 +84,6 @@ public class H2ProtocolNegotiationTest {
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()
@@ -119,7 +118,6 @@ public class H2ProtocolNegotiationTest {
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)
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
index 81c3657ee..43ccaa620 100644
--- 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
@@ -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.concurrent.Future;
@@ -52,125 +50,55 @@ 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.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.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 H2ServerAndRequesterTest {
+public abstract 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;
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource;
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource;
public H2ServerAndRequesterTest(final URIScheme scheme) {
this.scheme = scheme;
+ this.serverResource = new H2AsyncServerResource(
+ scheme,
+ (bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .setIOReactorConfig(
+ IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setLookupRegistry(new UriPatternMatcher<>())
+ .register("*", () -> new EchoHandler(2048))
+ ));
+ this.clientResource = new H2AsyncRequesterResource(
+ scheme,
+ bootstrap -> bootstrap
+ .setVersionPolicy(HttpVersionPolicy.NEGOTIATE)
+ .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()
- .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 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 HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
@@ -209,11 +137,11 @@ public class H2ServerAndRequesterTest {
@Test
public void testSequentialRequestsSameEndpoint() 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 HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
@@ -260,11 +188,11 @@ public class H2ServerAndRequesterTest {
@Test
public void testPipelinedRequests() 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 HttpAsyncRequester requester = clientResource.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<AsyncClientEndpoint> endpointFuture = requester.connect(target, Timeout.ofSeconds(5));
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..ffc18f6eb 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,52 +54,29 @@ 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()
+ @RegisterExtension
+ private final H2AsyncServerResource serverResource = new H2AsyncServerResource(
+ URIScheme.HTTP,
+ (bootstrap) -> 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() {
@@ -125,60 +102,25 @@ public class H2ServerBootstrapFiltersTest {
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()
+ @RegisterExtension
+ private final H2AsyncRequesterResource clientResource = new H2AsyncRequesterResource(
+ URIScheme.HTTP,
+ (bootstrap) -> 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);
- }
- }
-
- };
+ .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/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 664a05906..04c7a3a18 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;
-
- @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);
}
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();
@@ -617,6 +619,9 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
@Test
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/Http1SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/IntegrationTests.java
similarity index 52%
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/IntegrationTests.java
index dc264acbc..87c7f593e 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/IntegrationTests.java
@@ -28,43 +28,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.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 IntegrationTests {
- @BeforeAll
- public static void before() throws Throwable {
- PROXY = new SocksProxy();
- PROXY.start();
- }
+ @Nested
+ @DisplayName("Core functions")
+ public class CoreFunctions extends H2ServerAndRequesterTest {
- @AfterAll
- public static void after() {
- if (PROXY != null) {
- try {
- PROXY.shutdown(TimeValue.ofSeconds(5));
- } catch (final Exception ignore) {
- }
- PROXY = null;
+ public CoreFunctions() {
+ super(URIScheme.HTTP);
}
+
}
- public Http1SocksProxyIntegrationTest(final URIScheme scheme) {
- super(scheme);
+ @Nested
+ @DisplayName("Core functions (TLS)")
+ public class CoreFunctionsTls extends H2ServerAndRequesterTest {
+
+ public CoreFunctionsTls() {
+ super(URIScheme.HTTPS);
+ }
+
}
- @Override
- protected IOReactorConfig buildReactorConfig() {
- return IOReactorConfig.custom().setSocksProxyAddress(PROXY.getProxyAddress()).build();
+ @Nested
+ @DisplayName("Server filters")
+ public class Filters extends H2ServerBootstrapFiltersTest {
+
+ public Filters() {
+ super();
+ }
+
}
}
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/H2SocksProxyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/ProtocolTests.java
similarity index 58%
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/nio/ProtocolTests.java
index 338c411f9..34260d07d 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/ProtocolTests.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 ProtocolTests {
- 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/extension/H2AsyncRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java
new file mode 100644
index 000000000..eeb867841
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java
@@ -0,0 +1,98 @@
+/*
+ * ====================================================================
+ * 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.URIScheme;
+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 URIScheme scheme;
+ private final Consumer<H2RequesterBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncRequester requester;
+
+ public H2AsyncRequesterResource(final URIScheme scheme, final Consumer<H2RequesterBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final H2RequesterBootstrap bootstrap = H2RequesterBootstrap.bootstrap()
+ .setTlsStrategy(scheme == URIScheme.HTTPS ?
+ new H2ClientTlsStrategy(SSLTestContexts.createClientSSLContext()) : null)
+ .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..a11f494e8
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncServerResource.java
@@ -0,0 +1,98 @@
+/*
+ * ====================================================================
+ * 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.URIScheme;
+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 URIScheme scheme;
+ private final Consumer<H2ServerBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncServer server;
+
+ public H2AsyncServerResource(final URIScheme scheme, final Consumer<H2ServerBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+
+ final H2ServerBootstrap bootstrap = H2ServerBootstrap.bootstrap()
+ .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);
+ 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/InternalH2ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
similarity index 50%
copy from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalH2ServerTestBase.java
copy to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
index fae7f2405..9909fca69 100644
--- 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/extension/H2TestResources.java
@@ -25,52 +25,68 @@
*
*/
-package org.apache.hc.core5.testing.nio;
+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.junit.jupiter.api.Assertions;
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 {
+public class H2TestResources implements BeforeEachCallback, AfterEachCallback {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(H2TestResources.class);
- protected final URIScheme scheme;
+ private final URIScheme scheme;
- public InternalH2ServerTestBase(final URIScheme scheme) {
- this.scheme = scheme;
- }
+ private H2TestServer server;
+ private H2TestClient client;
- public InternalH2ServerTestBase() {
- this(URIScheme.HTTP);
+ public H2TestResources(final URIScheme scheme) {
+ this.scheme = scheme;
}
- protected H2TestServer server;
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+ server = new H2TestServer(
+ IOReactorConfig.DEFAULT,
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
- class serverResource implements AfterEachCallback, BeforeEachCallback {
+ LOG.debug("Starting up test client");
+ client = new H2TestClient(
+ IOReactorConfig.DEFAULT,
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
+ }
- @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 extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (client != null) {
+ client.shutdown(TimeValue.ofSeconds(5));
}
- @Override
- public void afterEach(final ExtensionContext context) throws Exception {
- log.debug("Shutting down test server");
- if (server != null) {
- server.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/InternalH2ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
similarity index 50%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalH2ServerTestBase.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
index fae7f2405..b18f7602a 100644
--- 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/extension/Http1TestResources.java
@@ -25,52 +25,68 @@
*
*/
-package org.apache.hc.core5.testing.nio;
+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.junit.jupiter.api.Assertions;
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 {
+public class Http1TestResources implements BeforeEachCallback, AfterEachCallback {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(Http1TestResources.class);
- protected final URIScheme scheme;
+ private final URIScheme scheme;
- public InternalH2ServerTestBase(final URIScheme scheme) {
- this.scheme = scheme;
- }
+ private Http1TestServer server;
+ private Http1TestClient client;
- public InternalH2ServerTestBase() {
- this(URIScheme.HTTP);
+ public Http1TestResources(final URIScheme scheme) {
+ this.scheme = scheme;
}
- protected H2TestServer server;
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+ server = new Http1TestServer(
+ IOReactorConfig.DEFAULT,
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
- class serverResource implements AfterEachCallback, BeforeEachCallback {
+ LOG.debug("Starting up test client");
+ client = new Http1TestClient(
+ IOReactorConfig.DEFAULT,
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createClientSSLContext() : null, null, null);
+ }
- @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 extensionContext) throws Exception {
+ LOG.debug("Shutting down test client");
+ if (client != null) {
+ client.shutdown(TimeValue.ofSeconds(5));
}
- @Override
- public void afterEach(final ExtensionContext context) throws Exception {
- log.debug("Shutting down test server");
- if (server != null) {
- server.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..a21d14e75
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncRequesterResource.java
@@ -0,0 +1,96 @@
+/*
+ * ====================================================================
+ * 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.URIScheme;
+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 URIScheme scheme;
+ private final Consumer<AsyncRequesterBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncRequester requester;
+
+ public HttpAsyncRequesterResource(final URIScheme scheme, final Consumer<AsyncRequesterBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test client");
+ final AsyncRequesterBootstrap bootstrap = AsyncRequesterBootstrap.bootstrap()
+ .setTlsStrategy(scheme == URIScheme.HTTPS ?
+ new BasicClientTlsStrategy(SSLTestContexts.createClientSSLContext()) : null)
+ .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..15e8d9f56
--- /dev/null
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncServerResource.java
@@ -0,0 +1,96 @@
+/*
+ * ====================================================================
+ * 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.URIScheme;
+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 URIScheme scheme;
+ private final Consumer<AsyncServerBootstrap> bootstrapCustomizer;
+
+ private HttpAsyncServer server;
+
+ public HttpAsyncServerResource(final URIScheme scheme, final Consumer<AsyncServerBootstrap> bootstrapCustomizer) {
+ this.scheme = scheme;
+ this.bootstrapCustomizer = bootstrapCustomizer;
+ }
+
+ @Override
+ public void beforeEach(final ExtensionContext extensionContext) throws Exception {
+ LOG.debug("Starting up test server");
+
+ final AsyncServerBootstrap bootstrap = AsyncServerBootstrap.bootstrap()
+ .setTlsStrategy(scheme == URIScheme.HTTPS ?
+ new BasicServerTlsStrategy(SSLTestContexts.createServerSSLContext()) : null)
+ .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;
+ }
+
+}