Moved test extension classes

apache · Jun 21, 2024 · 0b4b06d · 0b4b06d
1 parent 1cd7f8f
commit 0b4b06d
Show file tree

Hide file tree

Showing 54 changed files with 114 additions and 114 deletions.
diff --git a/...t/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java b/...t/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java
@@ -55,11 +55,11 @@
 import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.testing.BasicTestAuthenticator;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
 import org.apache.hc.client5.testing.auth.Authenticator;
 import org.apache.hc.client5.testing.auth.BearerAuthenticationHandler;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/.../src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java b/.../src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java
@@ -41,9 +41,9 @@
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/...ing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java b/...ing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java
@@ -44,11 +44,11 @@
 import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.testing.OldPathRedirectResolver;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
-import org.apache.hc.client5.testing.async.extension.TestAsyncServer;
-import org.apache.hc.client5.testing.async.extension.TestAsyncServerBootstrap;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.TestAsyncServer;
+import org.apache.hc.client5.testing.extension.async.TestAsyncServerBootstrap;
 import org.apache.hc.client5.testing.redirect.Redirect;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;

diff --git a/...c/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java b/...c/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java
@@ -52,9 +52,9 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/...esting/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java b/...esting/src/test/java/org/apache/hc/client5/testing/async/AbstractIntegrationTestBase.java
@@ -30,13 +30,13 @@
 import java.net.InetSocketAddress;
 import java.util.function.Consumer;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClientBuilder;
-import org.apache.hc.client5.testing.async.extension.TestAsyncResources;
-import org.apache.hc.client5.testing.async.extension.TestAsyncServer;
-import org.apache.hc.client5.testing.async.extension.TestAsyncServerBootstrap;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClientBuilder;
+import org.apache.hc.client5.testing.extension.async.TestAsyncResources;
+import org.apache.hc.client5.testing.extension.async.TestAsyncServer;
+import org.apache.hc.client5.testing.extension.async.TestAsyncServerBootstrap;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.URIScheme;
 import org.apache.hc.core5.util.Timeout;

diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2Async extends AbstractHttpAsyncFundamentalsTest {

diff --git a/...client5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java b/...client5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2AsyncMinimal extends AbstractHttpAsyncFundamentalsTest {

diff --git a/...lient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java b/...lient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2AsyncRedirect extends AbstractHttpAsyncRedirectsTest {

diff --git a/...testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java b/...testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2ClientAuthentication extends AbstractHttpAsyncClientAuthenticationTest {

diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Reactive.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2Reactive extends AbstractHttpReactiveFundamentalsTest {

diff --git a/...ent5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java b/...ent5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ReactiveMinimal.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.testing.async;
 
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.URIScheme;
 
 public abstract class TestH2ReactiveMinimal extends AbstractHttpReactiveFundamentalsTest {

diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java
@@ -40,9 +40,9 @@
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/...ent5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java b/...ent5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java
@@ -36,8 +36,8 @@
 
 import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;

diff --git a/...t5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java b/...t5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncRedirects.java
@@ -34,9 +34,9 @@
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.testing.OldPathRedirectResolver;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.client5.testing.redirect.Redirect;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;

diff --git a/...c/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java b/...c/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java
@@ -34,9 +34,9 @@
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.EndpointDetails;
 import org.apache.hc.core5.http.HttpException;

diff --git a/...ting/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java b/...ting/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ClientAuthentication.java
@@ -36,9 +36,9 @@
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.testing.BasicTestAuthenticator;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java
@@ -36,9 +36,9 @@
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;

diff --git a/...5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java b/...5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java
@@ -36,8 +36,8 @@
 
 import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpResponse;

diff --git a/...esting/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java b/...esting/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java
@@ -34,9 +34,9 @@
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.function.Resolver;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;

diff --git a/...g/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java b/...g/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncMinimalTlsHandshake.java
@@ -35,8 +35,8 @@
 import org.apache.hc.client5.http.impl.async.MinimalHttpAsyncClient;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.URIScheme;
 import org.apache.hc.core5.http.nio.AsyncClientEndpoint;

diff --git a/...esting/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java b/...esting/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java
@@ -34,9 +34,9 @@
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
 import org.apache.hc.client5.http.config.TlsConfig;
-import org.apache.hc.client5.testing.async.extension.ClientProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.ServerProtocolLevel;
-import org.apache.hc.client5.testing.async.extension.TestAsyncClient;
+import org.apache.hc.client5.testing.extension.async.ClientProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.ServerProtocolLevel;
+import org.apache.hc.client5.testing.extension.async.TestAsyncClient;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;

diff --git a/.../async/extension/ClientProtocolLevel.java → .../extension/async/ClientProtocolLevel.java b/.../async/extension/ClientProtocolLevel.java → .../extension/async/ClientProtocolLevel.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 public enum ClientProtocolLevel {
 

diff --git a/...nsion/H2OnlyMinimalTestClientBuilder.java → ...async/H2OnlyMinimalTestClientBuilder.java b/...nsion/H2OnlyMinimalTestClientBuilder.java → ...async/H2OnlyMinimalTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;

diff --git a/...nc/extension/H2OnlyTestClientBuilder.java → ...ension/async/H2OnlyTestClientBuilder.java b/...nc/extension/H2OnlyTestClientBuilder.java → ...ension/async/H2OnlyTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.util.Collection;
 

diff --git a/...c/extension/MinimalTestClientBuilder.java → ...nsion/async/MinimalTestClientBuilder.java b/...c/extension/MinimalTestClientBuilder.java → ...nsion/async/MinimalTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.TlsConfig;

diff --git a/.../async/extension/ServerProtocolLevel.java → .../extension/async/ServerProtocolLevel.java b/.../async/extension/ServerProtocolLevel.java → .../extension/async/ServerProtocolLevel.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 public enum ServerProtocolLevel {
 

diff --git a/.../extension/StandardTestClientBuilder.java → ...sion/async/StandardTestClientBuilder.java b/.../extension/StandardTestClientBuilder.java → ...sion/async/StandardTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.util.Collection;
 

diff --git a/...ting/async/extension/TestAsyncClient.java → ...ting/extension/async/TestAsyncClient.java b/...ting/async/extension/TestAsyncClient.java → ...ting/extension/async/TestAsyncClient.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.io.IOException;
 import java.util.concurrent.Future;

diff --git a/...ync/extension/TestAsyncClientBuilder.java → ...tension/async/TestAsyncClientBuilder.java b/...ync/extension/TestAsyncClientBuilder.java → ...tension/async/TestAsyncClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.util.Collection;
 

diff --git a/...g/async/extension/TestAsyncResources.java → ...g/extension/async/TestAsyncResources.java b/...g/async/extension/TestAsyncResources.java → ...g/extension/async/TestAsyncResources.java
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.util.function.Consumer;
 
-import org.apache.hc.client5.testing.sync.extension.TestClientResources;
+import org.apache.hc.client5.testing.extension.sync.TestClientResources;
 import org.apache.hc.core5.http.URIScheme;
 import org.apache.hc.core5.io.CloseMode;
 import org.apache.hc.core5.util.Asserts;

diff --git a/...ting/async/extension/TestAsyncServer.java → ...ting/extension/async/TestAsyncServer.java b/...ting/async/extension/TestAsyncServer.java → ...ting/extension/async/TestAsyncServer.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.net.InetSocketAddress;
 import java.util.Set;

diff --git a/...c/extension/TestAsyncServerBootstrap.java → ...nsion/async/TestAsyncServerBootstrap.java b/...c/extension/TestAsyncServerBootstrap.java → ...nsion/async/TestAsyncServerBootstrap.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.async.extension;
+package org.apache.hc.client5.testing.extension.async;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...g/sync/extension/ClientProtocolLevel.java → ...g/extension/sync/ClientProtocolLevel.java b/...g/sync/extension/ClientProtocolLevel.java → ...g/extension/sync/ClientProtocolLevel.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.sync.extension;
+package org.apache.hc.client5.testing.extension.sync;
 
 public enum ClientProtocolLevel {
 

diff --git a/...c/extension/MinimalTestClientBuilder.java → ...ension/sync/MinimalTestClientBuilder.java b/...c/extension/MinimalTestClientBuilder.java → ...ension/sync/MinimalTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.sync.extension;
+package org.apache.hc.client5.testing.extension.sync;
 
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.impl.classic.HttpClients;

diff --git a/.../extension/StandardTestClientBuilder.java → ...nsion/sync/StandardTestClientBuilder.java b/.../extension/StandardTestClientBuilder.java → ...nsion/sync/StandardTestClientBuilder.java
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.testing.sync.extension;
+package org.apache.hc.client5.testing.extension.sync;
 
 import java.util.Collection;