Add Test Jar for Collate Testing (#14010)

* Add Test Jar for Collate Testing

* Add Extension Path for Tests
This commit is contained in:
Mohit Yadav 2023-11-17 15:11:48 +05:30 committed by GitHub
parent 6fb3f12675
commit 8abaeb5b3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions

View File

@ -765,6 +765,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -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();