Bug-fix: corrects message exchange cancellation logic in InternalHttpAsyncExecRuntime

* Fixes the problem with message exchanges over an existing persistent connection being non-cancellable
* Hard-cancellation request parameter should have no bearing on H2 connections
* Response timeout not be applied to H2 endpoints
* Test coverage

Author: ok2c

…/testing/async/TestAsyncExecRuntime.java …nc/TestInternalHttpAsyncExecRuntime.javahttpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncExecRuntime.java renamed to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestInternalHttpAsyncExecRuntime.java httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncExecRuntime.java renamed to httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestInternalHttpAsyncExecRuntime.java

@@ -62,14 +62,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class TestAsyncExecRuntime {
+public class TestInternalHttpAsyncExecRuntime {
 
     public static final Timeout TIMEOUT = Timeout.ofMinutes(1);
 
     @RegisterExtension
     private final TestAsyncResources testResources;
 
-    public TestAsyncExecRuntime() {
+    public TestInternalHttpAsyncExecRuntime() {
         this.testResources = new TestAsyncResources(URIScheme.HTTP, ClientProtocolLevel.STANDARD, ServerProtocolLevel.STANDARD, TIMEOUT);
     }
 
@@ -89,6 +89,8 @@ public TestAsyncClient startClient() throws Exception {
         return client;
     }
 
+    static final int REQ_NUM = 5;
+
     HttpRequest createRequest(final HttpHost target) {
         return BasicRequestBuilder.get()
                 .setHttpHost(target)
@@ -105,7 +107,7 @@ void testExecutionCancellation_http11HardCancellation_connectionMarkedNonReusabl
         final TestAsyncClient client = startClient();
         final ConnectionInitiator connectionInitiator = client.getImplementation();
         final PoolingAsyncClientConnectionManager connectionManager = client.getConnectionManager();
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < REQ_NUM; i++) {
             final HttpClientContext context = HttpClientContext.create();
 
             final InternalTestHttpAsyncExecRuntime testRuntime = new InternalTestHttpAsyncExecRuntime(
@@ -119,7 +121,7 @@ void testExecutionCancellation_http11HardCancellation_connectionMarkedNonReusabl
 
             final BasicFuture<Message<HttpResponse, byte[]>> resultFuture = new BasicFuture<>(null);
             final Cancellable cancellable = testRuntime.execute(
-                    "test",
+                    "test-" + i,
                     AsyncClientPipeline.assemble()
                             .request(createRequest(target)).noContent()
                             .response().asByteArray()
@@ -155,7 +157,7 @@ void testExecutionCancellation_http11NoHardCancellation_connectionAlive() throws
         final TestAsyncClient client = startClient();
         final ConnectionInitiator connectionInitiator = client.getImplementation();
         final PoolingAsyncClientConnectionManager connectionManager = client.getConnectionManager();
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < REQ_NUM; i++) {
             final HttpClientContext context = HttpClientContext.create();
             context.setRequestConfig(RequestConfig.custom()
                     .setHardCancellationEnabled(false)
@@ -172,7 +174,7 @@ void testExecutionCancellation_http11NoHardCancellation_connectionAlive() throws
 
             final BasicFuture<Message<HttpResponse, byte[]>> resultFuture = new BasicFuture<>(null);
             final Cancellable cancellable = testRuntime.execute(
-                    "test",
+                    "test-" + i,
                     AsyncClientPipeline.assemble()
                             .request(createRequest(target)).noContent()
                             .response().asByteArray()
@@ -204,63 +206,4 @@ public void completed(final Message<HttpResponse, byte[]> result) {
         }
     }
 
-    @Test
-    void testExecutionCancellation_http2_connectionAlive() throws Exception {
-        configureServer(bootstrap -> {
-            bootstrap.setServerProtocolLevel(ServerProtocolLevel.H2_ONLY);
-            bootstrap.register("/random/*", AsyncRandomHandler::new);
-        });
-        final HttpHost target = startServer();
-
-        final TestAsyncClient client = startClient();
-        final ConnectionInitiator connectionInitiator = client.getImplementation();
-        final PoolingAsyncClientConnectionManager connectionManager = client.getConnectionManager();
-
-        for (int i = 0; i < 5; i++) {
-            final HttpClientContext context = HttpClientContext.create();
-            final InternalTestHttpAsyncExecRuntime testRuntime = new InternalTestHttpAsyncExecRuntime(
-                    connectionManager,
-                    connectionInitiator,
-                    TlsConfig.custom()
-                            .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_2)
-                            .build());
-            final Future<Boolean> connectFuture = testRuntime.leaseAndConnect(target, context);
-            Assertions.assertTrue(connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()));
-
-            final BasicFuture<Message<HttpResponse, byte[]>> resultFuture = new BasicFuture<>(null);
-            final Cancellable cancellable = testRuntime.execute(
-                    "test",
-                    AsyncClientPipeline.assemble()
-                            .request(createRequest(target)).noContent()
-                            .response().asByteArray()
-                            .result(new FutureContribution<Message<HttpResponse, byte[]>>(resultFuture) {
-
-                                @Override
-                                public void completed(final Message<HttpResponse, byte[]> result) {
-                                    resultFuture.completed(result);
-                                }
-
-                            })
-                            .create(),
-                    context);
-            // sleep a bit
-            Thread.sleep(i % 10);
-            cancellable.cancel();
-
-            // The message exchange is expected to get aborted
-            try {
-                resultFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
-            } catch (final CancellationException expected) {
-            }
-            Assertions.assertTrue(testRuntime.isAborted());
-            // The underlying connection is expected to stay valid
-            Assertions.assertTrue(testRuntime.isEndpointConnected());
-            testRuntime.markConnectionReusable(null, TimeValue.ofMinutes(1));
-            testRuntime.releaseEndpoint();
-
-            final PoolStats totalStats = connectionManager.getTotalStats();
-            Assertions.assertTrue(totalStats.getAvailable() > 0);
-        }
-    }
-
 }