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 2024/06/21 09:36:21 UTC
(httpcomponents-core) branch master updated: Moved test extension classes
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/master by this push:
new 2381737fc Moved test extension classes
2381737fc is described below
commit 2381737fc6120c6b35b2f3fe323096016d4d522c
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Fri Jun 21 11:28:15 2024 +0200
Moved test extension classes
---
.../apache/hc/core5/testing/classic/ClassicAuthenticationTest.java | 4 ++--
.../hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java | 4 ++--
.../testing/classic/ClassicHttp1SocksProxyCoreTransportTest.java | 4 ++--
.../org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java | 2 +-
.../hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java | 4 ++--
.../classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java | 4 ++--
.../extension => extension/classic}/ClassicTestResources.java | 2 +-
.../extension => extension/classic}/HttpRequesterResource.java | 2 +-
.../{classic/extension => extension/classic}/HttpServerResource.java | 2 +-
.../{nio/extension => extension/nio}/H2AsyncRequesterResource.java | 2 +-
.../{nio/extension => extension/nio}/H2AsyncServerResource.java | 2 +-
.../extension => extension/nio}/H2MultiplexingRequesterResource.java | 2 +-
.../testing/{nio/extension => extension/nio}/H2TestResources.java | 2 +-
.../testing/{nio/extension => extension/nio}/Http1TestResources.java | 2 +-
.../{nio/extension => extension/nio}/HttpAsyncRequesterResource.java | 2 +-
.../{nio/extension => extension/nio}/HttpAsyncServerResource.java | 2 +-
.../apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java | 4 ++--
.../src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java | 4 ++--
.../src/test/java/org/apache/hc/core5/testing/nio/H2ConnPoolTest.java | 4 ++--
.../apache/hc/core5/testing/nio/H2CoreTransportMultiplexingTest.java | 4 ++--
.../java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java | 4 ++--
.../test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java | 2 +-
.../org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java | 4 ++--
.../org/apache/hc/core5/testing/nio/H2ServerBootstrapFiltersTest.java | 4 ++--
.../apache/hc/core5/testing/nio/H2SocksProxyCoreTransportTest.java | 4 ++--
.../java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java | 4 ++--
.../java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java | 4 ++--
.../java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java | 2 +-
.../apache/hc/core5/testing/nio/Http1SocksProxyCoreTransportTest.java | 4 ++--
.../src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java | 4 ++--
.../java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java | 4 ++--
31 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 8a6f6fbb8..abec95cb2 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.net.URIAuthority;
-import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
-import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
+import org.apache.hc.core5.testing.extension.classic.HttpRequesterResource;
+import org.apache.hc.core5.testing.extension.classic.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java
index 293506caa..c1aad08a4 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1CoreTransportTest.java
@@ -41,8 +41,8 @@ import org.apache.hc.core5.http.impl.routing.RequestRouter;
import org.apache.hc.core5.http.io.HttpFilterChain;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.SocketConfig;
-import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
-import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
+import org.apache.hc.core5.testing.extension.classic.HttpRequesterResource;
+import org.apache.hc.core5.testing.extension.classic.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1SocksProxyCoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1SocksProxyCoreTransportTest.java
index 382558e17..67756db77 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1SocksProxyCoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicHttp1SocksProxyCoreTransportTest.java
@@ -41,9 +41,9 @@ import org.apache.hc.core5.http.impl.routing.RequestRouter;
import org.apache.hc.core5.http.io.HttpFilterChain;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.SocketConfig;
-import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
-import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
import org.apache.hc.core5.testing.extension.SocksProxyResource;
+import org.apache.hc.core5.testing.extension.classic.HttpRequesterResource;
+import org.apache.hc.core5.testing.extension.classic.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
index c41091c88..5f4bd6fa6 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
@@ -67,7 +67,7 @@ import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestExpectContinue;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.http.protocol.RequestUserAgent;
-import org.apache.hc.core5.testing.classic.extension.ClassicTestResources;
+import org.apache.hc.core5.testing.extension.classic.ClassicTestResources;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
index 726182448..36a17c21a 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerBootstrapFilterTest.java
@@ -49,8 +49,8 @@ import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
-import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
+import org.apache.hc.core5.testing.extension.classic.HttpRequesterResource;
+import org.apache.hc.core5.testing.extension.classic.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
index d6cd7d4ba..a67f08156 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java
@@ -49,8 +49,8 @@ import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.testing.classic.extension.HttpRequesterResource;
-import org.apache.hc.core5.testing.classic.extension.HttpServerResource;
+import org.apache.hc.core5.testing.extension.classic.HttpRequesterResource;
+import org.apache.hc.core5.testing.extension.classic.HttpServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/classic/ClassicTestResources.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/classic/ClassicTestResources.java
index 6acbc769c..ad80ee7df 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/ClassicTestResources.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/classic/ClassicTestResources.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.classic.extension;
+package org.apache.hc.core5.testing.extension.classic;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.io.SocketConfig;
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/extension/classic/HttpRequesterResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpRequesterResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/classic/HttpRequesterResource.java
index e9185815e..b5d6be531 100644
--- 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/extension/classic/HttpRequesterResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.classic.extension;
+package org.apache.hc.core5.testing.extension.classic;
import java.util.function.Consumer;
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/extension/classic/HttpServerResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/extension/HttpServerResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/classic/HttpServerResource.java
index 3c6d04690..ec961f104 100644
--- 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/extension/classic/HttpServerResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.classic.extension;
+package org.apache.hc.core5.testing.extension.classic;
import java.io.IOException;
import java.util.function.Consumer;
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/extension/nio/H2AsyncRequesterResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncRequesterResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2AsyncRequesterResource.java
index c4a36a98c..6ed7cfc9f 100644
--- 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/extension/nio/H2AsyncRequesterResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import java.util.function.Consumer;
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/extension/nio/H2AsyncServerResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2AsyncServerResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2AsyncServerResource.java
index 9f87d05f1..73beaa04a 100644
--- 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/extension/nio/H2AsyncServerResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import java.io.IOException;
import java.util.function.Consumer;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2MultiplexingRequesterResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2MultiplexingRequesterResource.java
index 8b9ad8e9c..1739ef893 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2MultiplexingRequesterResource.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2MultiplexingRequesterResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import java.util.function.Consumer;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2TestResources.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2TestResources.java
index 113ca3006..e6180ab90 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/H2TestResources.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/H2TestResources.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.reactor.IOReactorConfig;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/Http1TestResources.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/Http1TestResources.java
index 04ecfad81..155089543 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/Http1TestResources.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/Http1TestResources.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.reactor.IOReactorConfig;
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/extension/nio/HttpAsyncRequesterResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncRequesterResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/HttpAsyncRequesterResource.java
index 02d035ed0..18a5ac67f 100644
--- 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/extension/nio/HttpAsyncRequesterResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import java.util.function.Consumer;
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/extension/nio/HttpAsyncServerResource.java
similarity index 98%
rename from httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/extension/HttpAsyncServerResource.java
rename to httpcore5-testing/src/test/java/org/apache/hc/core5/testing/extension/nio/HttpAsyncServerResource.java
index fb76d7e24..85feab781 100644
--- 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/extension/nio/HttpAsyncServerResource.java
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.testing.nio.extension;
+package org.apache.hc.core5.testing.extension.nio;
import java.io.IOException;
import java.util.function.Consumer;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
index e3d1cb147..18c7aaf81 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/AsyncServerBootstrapFilterTest.java
@@ -57,8 +57,8 @@ import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index c6f7716b6..7159dac97 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -60,8 +60,8 @@ import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
-import org.apache.hc.core5.testing.nio.extension.H2MultiplexingRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2MultiplexingRequesterResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ConnPoolTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ConnPoolTest.java
index f85c4b361..4fc4982da 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ConnPoolTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ConnPoolTest.java
@@ -49,8 +49,8 @@ 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.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
-import org.apache.hc.core5.testing.nio.extension.H2MultiplexingRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2MultiplexingRequesterResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportMultiplexingTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportMultiplexingTest.java
index 02d57da6f..9b666564c 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportMultiplexingTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportMultiplexingTest.java
@@ -59,8 +59,8 @@ import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.http2.impl.nio.bootstrap.H2MultiplexingRequester;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
-import org.apache.hc.core5.testing.nio.extension.H2MultiplexingRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2MultiplexingRequesterResource;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
index 0810e737a..03e35a998 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2CoreTransportTest.java
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.impl.routing.RequestRouter;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
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 eb30e42b3..3f9121672 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
@@ -114,7 +114,7 @@ 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.IOSession;
-import org.apache.hc.core5.testing.nio.extension.H2TestResources;
+import org.apache.hc.core5.testing.extension.nio.H2TestResources;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
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 f3fb9adce..e205561b5 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
@@ -53,8 +53,8 @@ import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
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 bc28c9e0c..44b407db8 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
@@ -58,8 +58,8 @@ import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyCoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyCoreTransportTest.java
index 3c4b8f717..21c47426c 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyCoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2SocksProxyCoreTransportTest.java
@@ -38,8 +38,8 @@ import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.testing.extension.SocksProxyResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index c67ccd835..b83fdc7d9 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -62,8 +62,8 @@ import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java
index f3da2387c..1c37d90b8 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1CoreTransportTest.java
@@ -59,8 +59,8 @@ import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
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 6fc7b69c6..b3afc3a68 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
@@ -127,7 +127,7 @@ import org.apache.hc.core5.http.protocol.RequestValidateHost;
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.testing.extension.nio.Http1TestResources;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyCoreTransportTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyCoreTransportTest.java
index 0f0b5ef9e..18a1c2d5f 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyCoreTransportTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1SocksProxyCoreTransportTest.java
@@ -46,8 +46,8 @@ import org.apache.hc.core5.http.nio.AsyncPushProducer;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.testing.extension.SocksProxyResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
index fb53f9ce5..e056814a2 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/TLSUpgradeTest.java
@@ -56,8 +56,8 @@ import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.reactor.ProtocolIOSession;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.HttpAsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.HttpAsyncServerResource;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Assertions;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
index 71a95bb52..8247f665d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
@@ -64,8 +64,8 @@ import org.apache.hc.core5.reactive.ReactiveResponseConsumer;
import org.apache.hc.core5.reactive.ReactiveServerExchangeHandler;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncRequesterResource;
-import org.apache.hc.core5.testing.nio.extension.H2AsyncServerResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncRequesterResource;
+import org.apache.hc.core5.testing.extension.nio.H2AsyncServerResource;
import org.apache.hc.core5.testing.reactive.Reactive3TestUtils.StreamDescription;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;