Fix tests

Author: tuliren

airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcSourceAcceptanceTest.java

@@ -19,6 +19,7 @@
 import com.google.common.collect.Lists;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.resources.MoreResources;
+import io.airbyte.commons.string.Strings;
 import io.airbyte.commons.util.MoreIterators;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
@@ -69,8 +70,10 @@
 // 4. Then implement the abstract methods documented below.
 public abstract class JdbcSourceAcceptanceTest {
 
-  public static String SCHEMA_NAME = "jdbc_integration_test1";
-  public static String SCHEMA_NAME2 = "jdbc_integration_test2";
+  // schema name must be randomized for each test run,
+  // otherwise parallel runs can interfere with each other
+  public static String SCHEMA_NAME = Strings.addRandomSuffix("jdbc_integration_test1", "_", 5).toLowerCase();
+  public static String SCHEMA_NAME2 = Strings.addRandomSuffix("jdbc_integration_test2", "_", 5).toLowerCase();
   public static Set<String> TEST_SCHEMAS = ImmutableSet.of(SCHEMA_NAME, SCHEMA_NAME2);
 
   public static String TABLE_NAME = "id_and_name";

airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java

@@ -41,6 +41,7 @@ public class RedshiftSourceAcceptanceTest extends SourceAcceptanceTest {
   protected ObjectNode config;
   protected JdbcDatabase database;
   protected String schemaName;
+  protected String schemaToIgnore;
   protected String streamName;
 
   protected static ObjectNode getStaticConfig() {
@@ -51,26 +52,31 @@ protected static ObjectNode getStaticConfig() {
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
     config = getStaticConfig();
 
-    database = Databases.createJdbcDatabase(
-        config.get("username").asText(),
-        config.get("password").asText(),
-        String.format("jdbc:redshift://%s:%s/%s",
-            config.get("host").asText(),
-            config.get("port").asText(),
-            config.get("database").asText()),
-        RedshiftSource.DRIVER_CLASS);
+    database = createDatabase(config);
 
     schemaName = Strings.addRandomSuffix("integration_test", "_", 5).toLowerCase();
+    schemaToIgnore = schemaName + "shouldIgnore";
 
-    // add the schema to test that only specified schemas will be retrieved
+    // limit the connection to one schema only
     config = config.set("schemas", Jsons.jsonNode(List.of(schemaName)));
 
     // create a test data
     createTestData(database, schemaName);
 
     // create a schema with data that will not be used for testing, but would be used to check schema
     // filtering. This one should not be visible in results
-    createTestData(database, schemaName + "shouldIgnore");
+    createTestData(database, schemaToIgnore);
+  }
+
+  protected static JdbcDatabase createDatabase(final JsonNode config) {
+    return Databases.createJdbcDatabase(
+        config.get("username").asText(),
+        config.get("password").asText(),
+        String.format("jdbc:redshift://%s:%s/%s",
+            config.get("host").asText(),
+            config.get("port").asText(),
+            config.get("database").asText()),
+        RedshiftSource.DRIVER_CLASS);
   }
 
   protected void createTestData(final JdbcDatabase database, final String schemaName)
@@ -99,8 +105,10 @@ protected void createTestData(final JdbcDatabase database, final String schemaNa
 
   @Override
   protected void tearDown(final TestDestinationEnv testEnv) throws SQLException {
-    final String dropSchemaQuery = String.format("DROP SCHEMA IF EXISTS %s CASCADE", schemaName);
-    database.execute(connection -> connection.createStatement().execute(dropSchemaQuery));
+    database.execute(connection -> connection.createStatement()
+        .execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE", schemaName)));
+    database.execute(connection -> connection.createStatement()
+        .execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE", schemaToIgnore)));
   }
 
   @Override

airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java

@@ -4,18 +4,15 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
-import io.airbyte.commons.string.Strings;
+import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.db.Databases;
+import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.integrations.source.redshift.RedshiftSource;
-import io.airbyte.integrations.standardtest.source.TestDestinationEnv;
 
 public class RedshiftSslSourceAcceptanceTest extends RedshiftSourceAcceptanceTest {
 
-  @Override
-  protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    config = getStaticConfig();
-
-    database = Databases.createJdbcDatabase(
+  protected static JdbcDatabase createDatabase(final JsonNode config) {
+    return Databases.createJdbcDatabase(
         config.get("username").asText(),
         config.get("password").asText(),
         String.format("jdbc:redshift://%s:%s/%s",
@@ -25,9 +22,6 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc
         RedshiftSource.DRIVER_CLASS,
         "ssl=true;" +
             "sslfactory=com.amazon.redshift.ssl.NonValidatingFactory");
-
-    schemaName = Strings.addRandomSuffix("integration_test", "_", 5).toLowerCase();
-    createTestData(database, schemaName);
   }
 
 }