Refactor TestProxiedErrorResponses

trinodb · Oct 2, 2024 · e9b02da · e9b02da
1 parent 88eb9f7
commit e9b02da
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/rest/TestProxiedErrorResponses.java b/trino-aws-proxy/src/test/java/io/trino/aws/proxy/server/rest/TestProxiedErrorResponses.java
@@ -14,15 +14,11 @@
 package io.trino.aws.proxy.server.rest;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.BindingAnnotation;
 import com.google.inject.Inject;
 import com.google.inject.Key;
 import io.airlift.http.client.HttpStatus;
-import io.airlift.http.server.HttpServerConfig;
-import io.airlift.http.server.HttpServerInfo;
 import io.airlift.http.server.testing.TestingHttpServer;
-import io.airlift.node.NodeInfo;
 import io.trino.aws.proxy.server.remote.PathStyleRemoteS3Facade;
 import io.trino.aws.proxy.server.testing.TestingRemoteS3Facade;
 import io.trino.aws.proxy.server.testing.TestingTrinoAwsProxyServer.Builder;
@@ -43,6 +39,7 @@
 import java.util.Optional;
 
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static io.trino.aws.proxy.server.testing.TestingUtil.createTestingHttpServer;
 import static io.trino.aws.proxy.server.testing.TestingUtil.getFileFromStorage;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -87,7 +84,7 @@ public Builder filter(Builder builder)
         {
             TestingHttpServer httpErrorResponseServer;
             try {
-                httpErrorResponseServer = createTestingHttpErrorResponseServer();
+                httpErrorResponseServer = createTestingHttpServer(new HttpErrorResponseServlet());
                 httpErrorResponseServer.start();
             }
             catch (Exception e) {
@@ -120,15 +117,6 @@ private void assertThrownAwsError(HttpStatus status)
                         exception -> assertThat(exception.awsErrorDetails().errorCode()).isEqualTo(status.reason()));
     }
 
-    private static TestingHttpServer createTestingHttpErrorResponseServer()
-            throws IOException
-    {
-        NodeInfo nodeInfo = new NodeInfo("test");
-        HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
-        HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
-        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new HttpErrorResponseServlet(), ImmutableMap.of());
-    }
-
     private static class HttpErrorResponseServlet
             extends HttpServlet
     {