From 636de5ea584d9b94a8fb34fce25c4d00fd79ae34 Mon Sep 17 00:00:00 2001 From: Malik Diarra Date: Thu, 10 Feb 2022 10:57:27 -0800 Subject: [PATCH] Extract test helper function to truncate all tables Multiple persistence test truncates tables when they need to reset the state of the DB. All subclasses of `BaseDatabaseConfigPersistenceTest` now relies on `truncateAllTables` to do so. --- .../persistence/BaseDatabaseConfigPersistenceTest.java | 7 +++++++ .../DatabaseConfigPersistenceE2EReadWriteTest.java | 4 +--- .../persistence/DatabaseConfigPersistenceLoadDataTest.java | 4 +--- .../config/persistence/DatabaseConfigPersistenceTest.java | 4 +--- ...aseConfigPersistenceUpdateConnectorDefinitionsTest.java | 4 +--- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/BaseDatabaseConfigPersistenceTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/BaseDatabaseConfigPersistenceTest.java index d313fa5700e9..1c14d8fae787 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/BaseDatabaseConfigPersistenceTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/BaseDatabaseConfigPersistenceTest.java @@ -15,6 +15,7 @@ import io.airbyte.config.StandardSourceDefinition; import io.airbyte.config.StandardSourceDefinition.SourceType; import io.airbyte.db.Database; +import java.sql.SQLException; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -53,6 +54,12 @@ public static void dbDown() { container.close(); } + protected static void truncateAllTables() throws SQLException { + database.query(ctx -> ctx + .execute( + "TRUNCATE TABLE state, actor_catalog, actor_catalog_fetch_event, connection_operation, connection, operation, actor_oauth_parameter, actor, actor_definition, workspace")); + } + protected static final StandardSourceDefinition SOURCE_GITHUB = new StandardSourceDefinition() .withName("GitHub") .withSourceDefinitionId(UUID.fromString("ef69ef6e-aa7f-4af1-a01d-ef775033524e")) diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceE2EReadWriteTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceE2EReadWriteTest.java index 6239421cd8fd..12352c65123f 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceE2EReadWriteTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceE2EReadWriteTest.java @@ -42,9 +42,7 @@ public void setup() throws Exception { new ConfigsDatabaseMigrator(database, DatabaseConfigPersistenceLoadDataTest.class.getName()); final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator); MigrationDevHelper.runLastMigration(devDatabaseMigrator); - database.query(ctx -> ctx - .execute( - "TRUNCATE TABLE state, actor_catalog, actor_catalog_fetch_event, connection_operation, connection, operation, actor_oauth_parameter, actor, actor_definition, workspace")); + truncateAllTables(); } @AfterEach diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceLoadDataTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceLoadDataTest.java index 7fdf97a1003e..f882a6a58a65 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceLoadDataTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceLoadDataTest.java @@ -53,9 +53,7 @@ public static void setup() throws Exception { new ConfigsDatabaseMigrator(database, DatabaseConfigPersistenceLoadDataTest.class.getName()); final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator); MigrationDevHelper.runLastMigration(devDatabaseMigrator); - database.query(ctx -> ctx - .execute( - "TRUNCATE TABLE state, actor_catalog, actor_catalog_fetch_event, connection_operation, connection, operation, actor_oauth_parameter, actor, actor_definition, workspace")); + truncateAllTables(); } @AfterAll diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java index e27c8f1fe10c..b49d279e3998 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java @@ -56,9 +56,7 @@ public void setup() throws Exception { new ConfigsDatabaseMigrator(database, DatabaseConfigPersistenceLoadDataTest.class.getName()); final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator); MigrationDevHelper.runLastMigration(devDatabaseMigrator); - database.query(ctx -> ctx - .execute( - "TRUNCATE TABLE state, actor_catalog, actor_catalog_fetch_event, connection_operation, connection, operation, actor_oauth_parameter, actor, actor_definition, workspace")); + truncateAllTables(); } @AfterEach diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.java index 72f193d830af..1d9e61bc6da2 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.java @@ -53,9 +53,7 @@ public static void tearDown() throws Exception { @BeforeEach public void resetDatabase() throws SQLException { - database.query(ctx -> ctx - .execute( - "TRUNCATE TABLE state, actor_catalog, actor_catalog_fetch_event, connection_operation, connection, operation, actor_oauth_parameter, actor, actor_definition, workspace")); + truncateAllTables(); } @Test