TestConnectionManagement test setup improvements

Author: ok2c

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestServerResources.java

@@ -0,0 +1,82 @@
+/*
+ * ====================================================================
+ * 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.client5.testing.extension.sync;
+
+import java.util.function.Consumer;
+
+import org.apache.hc.core5.http.URIScheme;
+import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.util.Asserts;
+import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestServerResources implements AfterEachCallback {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestServerResources.class);
+
+    private final URIScheme scheme;
+    private final Timeout timeout;
+    private final TestServerBootstrap serverBootstrap;
+
+    private TestServer server;
+
+    public TestServerResources(final URIScheme scheme, final Timeout timeout) {
+        this.scheme = scheme != null ? scheme : URIScheme.HTTP;
+        this.timeout = timeout;
+        this.serverBootstrap = new TestServerBootstrap(this.scheme)
+                .setTimeout(this.timeout);
+    }
+
+    @Override
+    public void afterEach(final ExtensionContext extensionContext) {
+        LOG.debug("Shutting down test server");
+        if (server != null) {
+            server.shutdown(CloseMode.IMMEDIATE);
+        }
+    }
+
+    public URIScheme scheme() {
+        return this.scheme;
+    }
+
+    public void configureServer(final Consumer<TestServerBootstrap> serverCustomizer) {
+        Asserts.check(server == null, "Server is already running and cannot be changed");
+        serverCustomizer.accept(serverBootstrap);
+    }
+
+    public TestServer server() throws Exception {
+        if (server == null) {
+            server = serverBootstrap.build();
+        }
+        return server;
+    }
+
+}

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionManagement.java

@@ -28,7 +28,9 @@
 package org.apache.hc.client5.testing.sync;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 
 import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -39,8 +41,9 @@
 import org.apache.hc.client5.http.io.LeaseRequest;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.testing.classic.RandomHandler;
-import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel;
-import org.apache.hc.client5.testing.extension.sync.TestClient;
+import org.apache.hc.client5.testing.extension.sync.TestServer;
+import org.apache.hc.client5.testing.extension.sync.TestServerBootstrap;
+import org.apache.hc.client5.testing.extension.sync.TestServerResources;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.HttpConnection;
@@ -57,28 +60,48 @@
 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.io.CloseMode;
 import org.apache.hc.core5.pool.PoolConcurrencyPolicy;
 import org.apache.hc.core5.pool.PoolReusePolicy;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * Tests for {@code PoolingHttpClientConnectionManager} that do require a server
  * to communicate with.
  */
-class TestConnectionManagement extends AbstractIntegrationTestBase {
+class TestConnectionManagement {
 
-    public TestConnectionManagement() {
-        super(URIScheme.HTTP, ClientProtocolLevel.STANDARD);
-    }
+    public static final Timeout TIMEOUT = Timeout.ofMinutes(1);
+
+    @RegisterExtension
+    private final TestServerResources testResources;
 
+    PoolingHttpClientConnectionManager connManager;
     ConnectionEndpoint.RequestExecutor exec;
 
+    TestConnectionManagement() {
+        this.testResources = new TestServerResources(URIScheme.HTTP, TIMEOUT);
+    }
+
+    public void configureServer(final Consumer<TestServerBootstrap> serverCustomizer) {
+        testResources.configureServer(serverCustomizer);
+    }
+
+    public HttpHost startServer() throws Exception {
+        final TestServer server = testResources.server();
+        final InetSocketAddress inetSocketAddress = server.start();
+        return new HttpHost(testResources.scheme().id, "localhost", inetSocketAddress.getPort());
+    }
+
     @BeforeEach
     void setup() {
+        connManager = new PoolingHttpClientConnectionManager();
         exec = new ConnectionEndpoint.RequestExecutor() {
 
             final HttpRequestExecutor requestExecutor = new HttpRequestExecutor();
@@ -97,6 +120,13 @@ public ClassicHttpResponse execute(final ClassicHttpRequest request,
         };
     }
 
+    @AfterEach
+    void cleanup() {
+        if (connManager != null) {
+            connManager.close(CloseMode.IMMEDIATE);
+        }
+    }
+
     /**
      * Tests releasing and re-using a connection after a response is read.
      */
@@ -106,8 +136,6 @@ void testReleaseConnection() throws Exception {
                 .register("/random/*", new RandomHandler()));
         final HttpHost target = startServer();
 
-        final TestClient client = client();
-        final PoolingHttpClientConnectionManager connManager = client.getConnectionManager();
         connManager.setMaxTotal(1);
 
         final HttpRoute route = new HttpRoute(target, null, false);
@@ -171,8 +199,6 @@ void testReleaseConnectionWithTimeLimits() throws Exception {
                 .register("/random/*", new RandomHandler()));
         final HttpHost target = startServer();
 
-        final TestClient client = client();
-        final PoolingHttpClientConnectionManager connManager = client.getConnectionManager();
         connManager.setMaxTotal(1);
 
         final HttpRoute route = new HttpRoute(target, null, false);
@@ -239,8 +265,6 @@ void testReleaseConnectionWithTimeLimits() throws Exception {
     @Test
     void testCloseExpiredIdleConnections() throws Exception {
         final HttpHost target = startServer();
-        final TestClient client = client();
-        final PoolingHttpClientConnectionManager connManager = client.getConnectionManager();
         connManager.setMaxTotal(1);
 
         final HttpRoute route = new HttpRoute(target, null, false);
@@ -281,18 +305,13 @@ void testCloseExpiredTTLConnections() throws Exception {
         configureServer(bootstrap -> bootstrap
                 .register("/random/*", new RandomHandler()));
         final HttpHost target = startServer();
-
-        configureClient(builder -> builder
-                .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
+        connManager = PoolingHttpClientConnectionManagerBuilder.create()
                         .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
                         .setConnPoolPolicy(PoolReusePolicy.LIFO)
                         .setDefaultConnectionConfig(ConnectionConfig.custom()
                                 .setTimeToLive(TimeValue.ofMilliseconds(100))
                                 .build())
-                        .build()));
-        final TestClient client = client();
-
-        final PoolingHttpClientConnectionManager connManager = client.getConnectionManager();
+                        .build();
         connManager.setMaxTotal(1);
 
         final HttpRoute route = new HttpRoute(target, null, false);
@@ -336,8 +355,6 @@ void testConnectionTimeoutSetting() throws Exception {
 
         final Timeout connectionSocketTimeout = Timeout.ofMinutes(5);
 
-        final TestClient client = client();
-        final PoolingHttpClientConnectionManager connManager = client.getConnectionManager();
         connManager.setMaxTotal(1);
         connManager.setDefaultConnectionConfig(ConnectionConfig.custom()
                 .setSocketTimeout(connectionSocketTimeout)

pom.xml

@@ -69,7 +69,6 @@
     <ehcache.version>3.11.1</ehcache.version>
     <memcached.version>2.12.3</memcached.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <junit.version>5.14.2</junit.version>
     <junit.version>5.14.3</junit.version>
     <mockito.version>4.11.0</mockito.version>
     <hc.stylecheck.version>1</hc.stylecheck.version>