fix tests

trinodb · Mar 13, 2024 · cfa3cd4 · cfa3cd4
1 parent 32df8a6
commit cfa3cd4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/gateway-ha/src/main/java/io/trino/gateway/baseapp/AppModule.java b/gateway-ha/src/main/java/io/trino/gateway/baseapp/AppModule.java
@@ -44,7 +44,6 @@ protected int getApplicationPort()
                         .map(SimpleServerFactory::getConnector);
 
         return connectors
-                .filter(connector -> connector instanceof HttpConnectorFactory)
                 .mapToInt(connector -> {
                     if (connector instanceof HttpsConnectorFactory httpsConnectorFactory) {
                         return httpsConnectorFactory.getPort();

diff --git a/gateway-ha/src/test/java/io/trino/gateway/baseapp/TestAppModule.java b/gateway-ha/src/test/java/io/trino/gateway/baseapp/TestAppModule.java
@@ -16,6 +16,7 @@
 import io.dropwizard.core.server.DefaultServerFactory;
 import io.dropwizard.core.setup.Environment;
 import io.dropwizard.jetty.HttpConnectorFactory;
+import io.dropwizard.jetty.HttpsConnectorFactory;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -29,7 +30,7 @@
 public class TestAppModule
 {
     @Test
-    public void testGetApplicationPort()
+    public void testGetApplicationPortHttp()
     {
         AppConfiguration mockConfig = Mockito.mock(AppConfiguration.class);
         DefaultServerFactory mockServerFactory = Mockito.mock(DefaultServerFactory.class);
@@ -46,6 +47,24 @@ public void testGetApplicationPort()
         assertThat(port).isEqualTo(8090);
     }
 
+    @Test
+    public void testGetApplicationPortHttps()
+    {
+        AppConfiguration mockConfig = Mockito.mock(AppConfiguration.class);
+        DefaultServerFactory mockServerFactory = Mockito.mock(DefaultServerFactory.class);
+        HttpsConnectorFactory mockConnector = Mockito.mock(HttpsConnectorFactory.class);
+
+        when(mockConfig.getServerFactory()).thenReturn(mockServerFactory);
+        when(mockServerFactory.getApplicationConnectors()).thenReturn(List.of(mockConnector));
+        when(mockConnector.getPort()).thenReturn(8090);
+
+        AppModule<AppConfiguration, Object> appModule = new AppModule<>(mockConfig, new Object()) {};
+
+        int port = appModule.getApplicationPort();
+
+        assertThat(port).isEqualTo(8090);
+    }
+
     @Test
     public void testGetApplicationPortThrowsException()
     {