fix: clear topology cache before each test

Author: karenc-bq

wrapper/src/main/java/com/amazon/awslabs/jdbc/hostlistprovider/AuroraHostListProvider.java

@@ -99,7 +99,7 @@ public class AuroraHostListProvider implements HostListProvider, DynamicHostList
   private final int refreshRateInMilliseconds;
   private List<HostSpec> hostList = new ArrayList<>();
 
-  static final ExpiringCache<String, ClusterTopologyInfo> topologyCache =
+  protected static final ExpiringCache<String, ClusterTopologyInfo> topologyCache =
       new ExpiringCache<>(DEFAULT_CACHE_EXPIRE_MS);
   private static final Object cacheLock = new Object();
 
@@ -383,8 +383,6 @@ public void addToDownHostList(HostSpec downHost) {
         clusterTopologyInfo.downHosts = ConcurrentHashMap.newKeySet();
       }
       clusterTopologyInfo.downHosts.add(downHost.getUrl());
-      LOGGER.fine("add to down host list: " + downHost.getUrl());
-      LOGGER.fine("addToDownHostList: " + Arrays.toString(new SQLException().getStackTrace()));
       this.pluginService.setAvailability(downHost.getAliases(), HostAvailability.NOT_AVAILABLE);
     }
   }

wrapper/src/main/java/com/amazon/awslabs/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java

@@ -219,7 +219,6 @@ private void addActiveReaders(
       }
     }
     Collections.shuffle(activeReaders);
-    LOGGER.fine("active readers: " + Arrays.toString(activeReaders.toArray()));
     list.addAll(activeReaders);
   }
 

wrapper/src/test/java/integration/container/aurora/postgres/AuroraPostgresBaseTest.java

@@ -214,6 +214,7 @@ public void setUpEach() throws InterruptedException, SQLException {
         clusterSize >= 2); // many tests assume that cluster contains at least a writer and a reader
     assertTrue(isDBInstanceWriter(instanceIDs[0]));
     makeSureInstancesUp(instanceIDs);
+    TestAuroraHostListProvider.clearCache();
   }
 
   protected Properties initDefaultPropsNoTimeouts() {

wrapper/src/test/java/integration/container/aurora/postgres/AuroraPostgresTestSuite.java

@@ -16,7 +16,6 @@
 
 package integration.container.aurora.postgres;
 
-import org.junit.platform.suite.api.IncludeTags;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 
@@ -25,7 +24,7 @@
 @Suite
 @SelectClasses({
     AuroraPostgresIntegrationTest.class,
-    // AuroraPostgresFailoverTest.class,
-    // AuroraPostgresDataSourceTest.class
+    AuroraPostgresFailoverTest.class,
+    AuroraPostgresDataSourceTest.class
 })
 public class AuroraPostgresTestSuite {}

wrapper/src/test/java/integration/container/aurora/postgres/TestAuroraHostListProvider.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package integration.container.aurora.postgres;
+
+import com.amazon.awslabs.jdbc.PluginService;
+import com.amazon.awslabs.jdbc.hostlistprovider.AuroraHostListProvider;
+import java.util.Properties;
+
+public class TestAuroraHostListProvider extends AuroraHostListProvider {
+
+  public TestAuroraHostListProvider(String driverProtocol, PluginService pluginService,
+      Properties properties, String originalUrl) {
+    super(driverProtocol, pluginService, properties, originalUrl);
+  }
+
+  public static void clearCache() {
+     AuroraHostListProvider.topologyCache.clear();
+   }
+}