test: add integration tests

Author: karenc-bq

wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraInitialConnectionStrategyPlugin.java

@@ -126,7 +126,8 @@ public void initHostProvider(
 
     final RdsUrlType type = this.rdsUtils.identifyRdsType(initialUrl);
     this.hostListProviderService = hostListProviderService;
-    if (type.isRdsCluster() && hostListProviderService.isStaticHostListProvider()) {
+    if ((type.isRdsCluster() || this.verifyOpenedConnectionType != null)
+        && hostListProviderService.isStaticHostListProvider()) {
       throw new SQLException(Messages.get("AuroraInitialConnectionStrategyPlugin.requireDynamicProvider"));
     }
     initHostProviderFunc.call();

wrapper/src/test/java/integration/container/tests/BasicConnectivityTests.java

@@ -16,6 +16,7 @@
 
 package integration.container.tests;
 
+import static integration.container.ConnectionStringHelper.getDefaultProperties;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,6 +40,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
@@ -56,6 +59,7 @@
 import software.amazon.jdbc.wrapper.ConnectionWrapper;
 
 @TestMethodOrder(MethodOrderer.MethodName.class)
+@ExtendWith(TestDriverProvider.class)
 @DisableOnTestFeature({
     TestEnvironmentFeatures.PERFORMANCE,
     TestEnvironmentFeatures.RUN_HIBERNATE_TESTS_ONLY,
@@ -66,7 +70,6 @@ public class BasicConnectivityTests {
   private static final Logger LOGGER = Logger.getLogger(BasicConnectivityTests.class.getName());
 
   @TestTemplate
-  @ExtendWith(TestDriverProvider.class)
   public void test_DirectConnection(TestDriver testDriver) throws SQLException {
     LOGGER.info(testDriver.toString());
 
@@ -105,7 +108,6 @@ public void test_DirectConnection(TestDriver testDriver) throws SQLException {
   }
 
   @TestTemplate
-  @ExtendWith(TestDriverProvider.class)
   public void test_WrapperConnection(TestDriver testDriver) throws SQLException {
     LOGGER.info(testDriver.toString());
 
@@ -144,7 +146,6 @@ public void test_WrapperConnection(TestDriver testDriver) throws SQLException {
   }
 
   @TestTemplate
-  @ExtendWith(TestDriverProvider.class)
   @EnableOnTestFeature(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED)
   public void test_ProxiedDirectConnection(TestDriver testDriver) throws SQLException {
     LOGGER.info(testDriver.toString());
@@ -182,8 +183,23 @@ public void test_ProxiedDirectConnection(TestDriver testDriver) throws SQLExcept
     conn.close();
   }
 
+  @ParameterizedTest
+  @MethodSource("testPluginParameters")
+  public void testBasicConnectivityTestWithPlugins(String plugin, String url) throws SQLException {
+    final Properties props = getDefaultProperties();
+    props.setProperty(PropertyDefinition.PLUGINS.name, plugin);
+    LOGGER.finest("Connecting to " + url);
+
+    try (Connection conn = DriverManager.getConnection(url, props);
+        Statement stmt = conn.createStatement();
+        ResultSet rs = stmt.executeQuery("SELECT 1");
+    ) {
+      assertTrue(rs.next());
+      assertEquals(1, rs.getInt(1));
+    }
+  }
+
   @TestTemplate
-  @ExtendWith(TestDriverProvider.class)
   @EnableOnTestFeature(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED)
   public void test_ProxiedWrapperConnection() throws SQLException {
     LOGGER.info(TestEnvironment.getCurrent().getCurrentDriver().toString());
@@ -221,16 +237,15 @@ public void test_ProxiedWrapperConnection() throws SQLException {
   }
 
   @TestTemplate
-  @ExtendWith(TestDriverProvider.class)
   public void testSuccessOpenConnectionNoPort() throws SQLException {
     String url =
         DriverHelper.getWrapperDriverProtocol()
             + TestEnvironment.getCurrent()
-                .getInfo()
-                .getDatabaseInfo()
-                .getInstances()
-                .get(0)
-                .getHost()
+            .getInfo()
+            .getDatabaseInfo()
+            .getInstances()
+            .get(0)
+            .getHost()
             + "/"
             + TestEnvironment.getCurrent().getInfo().getDatabaseInfo().getDefaultDbName()
             + DriverHelper.getDriverRequiredParameters();
@@ -272,10 +287,10 @@ public void testFailedProperties(
     TestEnvironment.getCurrent().setCurrentDriver(testDriver);
 
     if (TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngine()
-            == DatabaseEngine.MARIADB
+        == DatabaseEngine.MARIADB
         && TestEnvironment.getCurrent().getCurrentDriver() == TestDriver.MARIADB
         && TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngineDeployment()
-            == DatabaseEngineDeployment.DOCKER
+        == DatabaseEngineDeployment.DOCKER
         && StringUtils.isNullOrEmpty(username)) {
       // MariaDb driver uses "root" username if no username is provided. Since MariaDb database in
       // docker container
@@ -314,7 +329,7 @@ protected static String buildConnectionString(
   }
 
   private static Stream<Arguments> testConnectionParameters() {
-    ArrayList<Arguments> results = new ArrayList<>();
+    final List<Arguments> results = new ArrayList<>();
     for (TestDriver testDriver : TestEnvironment.getCurrent().getAllowedTestDrivers()) {
 
       // missing connection prefix
@@ -365,9 +380,8 @@ private static Stream<Arguments> testConnectionParameters() {
   }
 
   private static Stream<Arguments> testPropertiesParameters() {
-    ArrayList<Arguments> results = new ArrayList<>();
+    final List<Arguments> results = new ArrayList<>();
     for (TestDriver testDriver : TestEnvironment.getCurrent().getAllowedTestDrivers()) {
-
       // missing username
       results.add(
           Arguments.of(
@@ -418,4 +432,33 @@ private static Stream<Arguments> testPropertiesParameters() {
     }
     return results.stream();
   }
+
+  private static Stream<Arguments> testPluginParameters() {
+    final List<String> plugins = Arrays.asList(
+        "executeTime",
+        "connectTime"
+    );
+    final List<Arguments> results = new ArrayList<>();
+    final TestInstanceInfo readerInstance = TestEnvironment.getCurrent()
+        .getInfo()
+        .getDatabaseInfo()
+        .getInstances()
+        .get(1);
+    final String writerInstanceUrl = ConnectionStringHelper.getWrapperUrl();
+    final String readerInstanceUrl = ConnectionStringHelper.getWrapperUrl(readerInstance);
+    final String writerClusterUrl = ConnectionStringHelper.getWrapperClusterEndpointUrl();
+    final String readerClusterUrl = ConnectionStringHelper.getWrapperReaderClusterUrl();
+
+    for (String plugin : plugins) {
+      // Connect via writer instance endpoint.
+      results.add(Arguments.of(plugin, writerInstanceUrl));
+      // Connect via reader instance endpoint.
+      results.add(Arguments.of(plugin, readerInstanceUrl));
+      // Connect via writer cluster endpoint.
+      results.add(Arguments.of(plugin, writerClusterUrl));
+      // Connect via reader cluster endpoint.
+      results.add(Arguments.of(plugin, readerClusterUrl));
+    }
+    return results.stream();
+  }
 }