From 8abaeb5b3ddbb87b2b71b25a933d7073f3b5d0ed Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:11:48 +0530 Subject: [PATCH] Add Test Jar for Collate Testing (#14010) * Add Test Jar for Collate Testing * Add Extension Path for Tests --- openmetadata-service/pom.xml | 11 +++++++++ .../service/OpenMetadataApplicationTest.java | 24 +++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml index d4b72f1a4e7..234777d11d4 100644 --- a/openmetadata-service/pom.xml +++ b/openmetadata-service/pom.xml @@ -765,6 +765,17 @@ org.apache.maven.plugins maven-source-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java index 56b89c082cd..175a90a260b 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java @@ -101,14 +101,24 @@ public abstract class OpenMetadataApplicationTest { sqlContainer.withConnectTimeoutSeconds(240); sqlContainer.start(); - final String flyWayMigrationScripsLocation = + final String flyWayMigrationScriptsLocation = ResourceHelpers.resourceFilePath("db/sql/migrations/flyway/" + sqlContainer.getDriverClassName()); - final String nativeMigrationScripsLocation = ResourceHelpers.resourceFilePath("db/sql/migrations/native/"); + final String nativeMigrationScriptsLocation = ResourceHelpers.resourceFilePath("db/sql/migrations/native/"); + + // Extension Config + String extensionMigrationScripsLocation = ""; + try { + extensionMigrationScripsLocation = ResourceHelpers.resourceFilePath("extension/sql/migrations/"); + configOverrides.add( + ConfigOverride.config("migrationConfiguration.extensionPath", extensionMigrationScripsLocation)); + } catch (Exception ex) { + LOG.info("Extension migrations not found"); + } Flyway flyway = Flyway.configure() .dataSource(sqlContainer.getJdbcUrl(), sqlContainer.getUsername(), sqlContainer.getPassword()) .table("DATABASE_CHANGE_LOG") - .locations("filesystem:" + flyWayMigrationScripsLocation) + .locations("filesystem:" + flyWayMigrationScriptsLocation) .sqlMigrationPrefix("v") .cleanDisabled(false) .load(); @@ -127,8 +137,8 @@ public abstract class OpenMetadataApplicationTest { overrideDatabaseConfig(sqlContainer); // Migration overrides - configOverrides.add(ConfigOverride.config("migrationConfiguration.flywayPath", flyWayMigrationScripsLocation)); - configOverrides.add(ConfigOverride.config("migrationConfiguration.nativePath", nativeMigrationScripsLocation)); + configOverrides.add(ConfigOverride.config("migrationConfiguration.flywayPath", flyWayMigrationScriptsLocation)); + configOverrides.add(ConfigOverride.config("migrationConfiguration.nativePath", nativeMigrationScriptsLocation)); ConfigOverride[] configOverridesArray = configOverrides.toArray(new ConfigOverride[0]); APP = new DropwizardAppExtension<>(OpenMetadataApplication.class, CONFIG_PATH, configOverridesArray); @@ -141,8 +151,8 @@ public abstract class OpenMetadataApplicationTest { jdbi, config, ConnectionType.from(sqlContainer.getDriverClassName()), - nativeMigrationScripsLocation, - null, + nativeMigrationScriptsLocation, + extensionMigrationScripsLocation, false); APP.before(); createClient();