final

Author: sergiyvamz

wrapper/src/test/java/software/amazon/jdbc/hostlistprovider/RdsHostListProviderTest.java

@@ -48,7 +48,6 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
@@ -465,7 +464,6 @@ void testIdentifyConnectionWithInvalidNodeIdQuery() throws SQLException {
   }
 
   @Test
-  @Disabled
   void testIdentifyConnectionNullTopology() throws SQLException {
     rdsHostListProvider = Mockito.spy(getRdsHostListProvider(
         mockHostListProviderService,
@@ -475,8 +473,8 @@ void testIdentifyConnectionNullTopology() throws SQLException {
 
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-1");
-    when(rdsHostListProvider.refresh(eq(mockConnection))).thenReturn(null);
-    when(rdsHostListProvider.forceRefresh(eq(mockConnection))).thenReturn(null);
+    doReturn(null).when(rdsHostListProvider).refresh(mockConnection);
+    doReturn(null).when(rdsHostListProvider).forceRefresh(mockConnection);
 
     assertNull(rdsHostListProvider.identifyConnection(mockConnection));
   }
@@ -495,14 +493,13 @@ void testIdentifyConnectionHostNotInTopology() throws SQLException {
         "jdbc:someprotocol://url"));
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-1");
-    when(rdsHostListProvider.refresh(eq(mockConnection))).thenReturn(cachedTopology);
-    when(rdsHostListProvider.forceRefresh(eq(mockConnection))).thenReturn(cachedTopology);
+    doReturn(cachedTopology).when(rdsHostListProvider).refresh(mockConnection);
+    doReturn(cachedTopology).when(rdsHostListProvider).forceRefresh(mockConnection);
 
     assertNull(rdsHostListProvider.identifyConnection(mockConnection));
   }
 
   @Test
-  @Disabled
   void testIdentifyConnectionHostInTopology() throws SQLException {
     final HostSpec expectedHost = new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
         .host("instance-a-1.xyz.us-east-2.rds.amazonaws.com")
@@ -517,7 +514,8 @@ void testIdentifyConnectionHostInTopology() throws SQLException {
         "jdbc:someprotocol://url"));
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-a-1");
-    when(rdsHostListProvider.refresh()).thenReturn(cachedTopology);
+    doReturn(cachedTopology).when(rdsHostListProvider).refresh(mockConnection);
+    doReturn(cachedTopology).when(rdsHostListProvider).forceRefresh(mockConnection);
 
     final HostSpec actual = rdsHostListProvider.identifyConnection(mockConnection);
     assertEquals("instance-a-1.xyz.us-east-2.rds.amazonaws.com", actual.getHost());

wrapper/src/test/java/software/amazon/jdbc/hostlistprovider/RdsMultiAzDbClusterListProviderTest.java

@@ -455,8 +455,8 @@ void testIdentifyConnectionNullTopology() throws SQLException {
 
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-1");
-    when(rdsMazDbClusterHostListProvider.refresh(eq(mockConnection))).thenReturn(null);
-    when(rdsMazDbClusterHostListProvider.forceRefresh(eq(mockConnection))).thenReturn(null);
+    doReturn(null).when(rdsMazDbClusterHostListProvider).refresh(mockConnection);
+    doReturn(null).when(rdsMazDbClusterHostListProvider).forceRefresh(mockConnection);
 
     assertNull(rdsMazDbClusterHostListProvider.identifyConnection(mockConnection));
   }
@@ -475,8 +475,8 @@ void testIdentifyConnectionHostNotInTopology() throws SQLException {
         "jdbc:someprotocol://url"));
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-1");
-    when(rdsMazDbClusterHostListProvider.refresh(eq(mockConnection))).thenReturn(cachedTopology);
-    when(rdsMazDbClusterHostListProvider.forceRefresh(eq(mockConnection))).thenReturn(cachedTopology);
+    doReturn(cachedTopology).when(rdsMazDbClusterHostListProvider).refresh(mockConnection);
+    doReturn(cachedTopology).when(rdsMazDbClusterHostListProvider).forceRefresh(mockConnection);
 
     assertNull(rdsMazDbClusterHostListProvider.identifyConnection(mockConnection));
   }
@@ -485,19 +485,19 @@ void testIdentifyConnectionHostNotInTopology() throws SQLException {
   void testIdentifyConnectionHostInTopology() throws SQLException {
     final HostSpec expectedHost = new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
         .host("instance-a-1.xyz.us-east-2.rds.amazonaws.com")
+        .hostId("instance-a-1")
         .port(HostSpec.NO_PORT)
         .role(HostRole.WRITER)
         .build();
-    expectedHost.setHostId("instance-a-1");
     final List<HostSpec> cachedTopology = Collections.singletonList(expectedHost);
 
     rdsMazDbClusterHostListProvider = Mockito.spy(getRdsMazDbClusterHostListProvider(
         mockHostListProviderService,
         "jdbc:someprotocol://url"));
     when(mockResultSet.next()).thenReturn(true);
     when(mockResultSet.getString(eq(1))).thenReturn("instance-a-1");
-    when(rdsMazDbClusterHostListProvider.refresh()).thenReturn(cachedTopology);
-    when(rdsMazDbClusterHostListProvider.forceRefresh()).thenReturn(cachedTopology);
+    doReturn(cachedTopology).when(rdsMazDbClusterHostListProvider).refresh(mockConnection);
+    doReturn(cachedTopology).when(rdsMazDbClusterHostListProvider).forceRefresh(mockConnection);
 
     final HostSpec actual = rdsMazDbClusterHostListProvider.identifyConnection(mockConnection);
     assertEquals("instance-a-1.xyz.us-east-2.rds.amazonaws.com", actual.getHost());