From cfa3cd4d8fc460c18ebd5fe04eb8177f0829b3c3 Mon Sep 17 00:00:00 2001
From: prakharsapre <prakhar.sapre2610@gmail.com>
Date: Wed, 13 Mar 2024 08:19:13 -0500
Subject: [PATCH] fix tests

---
 .../io/trino/gateway/baseapp/AppModule.java   |  1 -
 .../trino/gateway/baseapp/TestAppModule.java  | 21 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 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
index 75e23c65a..3ea1b4231 100644
--- 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
index 794c557bc..d5f5c6d91 100644
--- 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()
     {