yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-07 16:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: make test setup non-static so it can be overriden (#15451)

Browse Source 
- made test hooks non-static
- added getApp
---------

Co-authored-by: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com>
This commit is contained in:
Imri Paran 2024-03-06 15:14:48 +01:00 committed by GitHub
parent 7490663bc8
commit 182f3a39f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java
View File

@ -35,6 +35,7 @@ import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.core.Jdbi;
import org.jdbi.v3.sqlobject.SqlObjectPlugin; import org.jdbi.v3.sqlobject.SqlObjectPlugin;
import org.jdbi.v3.sqlobject.SqlObjects; import org.jdbi.v3.sqlobject.SqlObjects;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
@ -61,7 +62,7 @@ public abstract class OpenMetadataApplicationTest {
public static final boolean RUN_ELASTIC_SEARCH_TESTCASES = false; public static final boolean RUN_ELASTIC_SEARCH_TESTCASES = false;
private static final Set<ConfigOverride> configOverrides = new HashSet<>(); protected static final Set<ConfigOverride> configOverrides = new HashSet<>();
private static final String JDBC_CONTAINER_CLASS_NAME = private static final String JDBC_CONTAINER_CLASS_NAME =
"org.testcontainers.containers.MySQLContainer"; "org.testcontainers.containers.MySQLContainer";
@ -80,7 +81,7 @@ public abstract class OpenMetadataApplicationTest {
} }
@BeforeAll @BeforeAll
public static void createApplication() throws Exception { public void createApplication() throws Exception {
String jdbcContainerClassName = System.getProperty("jdbcContainerClassName"); String jdbcContainerClassName = System.getProperty("jdbcContainerClassName");
String jdbcContainerImage = System.getProperty("jdbcContainerImage"); String jdbcContainerImage = System.getProperty("jdbcContainerImage");
String elasticSearchContainerImage = System.getProperty("elasticSearchContainerClassName"); String elasticSearchContainerImage = System.getProperty("elasticSearchContainerClassName");
@ -155,9 +156,7 @@ public abstract class OpenMetadataApplicationTest {
ConfigOverride.config("migrationConfiguration.nativePath", nativeMigrationScriptsLocation)); ConfigOverride.config("migrationConfiguration.nativePath", nativeMigrationScriptsLocation));
ConfigOverride[] configOverridesArray = configOverrides.toArray(new ConfigOverride[0]); ConfigOverride[] configOverridesArray = configOverrides.toArray(new ConfigOverride[0]);
APP = APP = getApp(configOverridesArray);
new DropwizardAppExtension<>(
OpenMetadataApplication.class, CONFIG_PATH, configOverridesArray);
// Run System Migrations // Run System Migrations
jdbi = jdbi =
Jdbi.create( Jdbi.create(
@ -176,6 +175,13 @@ public abstract class OpenMetadataApplicationTest {
createClient(); createClient();
} }
@NotNull
protected DropwizardAppExtension<OpenMetadataApplicationConfig> getApp(
ConfigOverride[] configOverridesArray) {
return new DropwizardAppExtension<>(
OpenMetadataApplication.class, CONFIG_PATH, configOverridesArray);
}
private static void createClient() { private static void createClient() {
ClientConfig config = new ClientConfig(); ClientConfig config = new ClientConfig();
config.connectorProvider(new JettyConnectorProvider()); config.connectorProvider(new JettyConnectorProvider());
@ -187,7 +193,7 @@ public abstract class OpenMetadataApplicationTest {
} }
@AfterAll @AfterAll
public static void stopApplication() throws Exception { public void stopApplication() throws Exception {
// If BeforeAll causes and exception AfterAll still gets called before that exception is thrown. // If BeforeAll causes and exception AfterAll still gets called before that exception is thrown.
// If a NullPointerException is thrown during the cleanup of above it will eat the initial error // If a NullPointerException is thrown during the cleanup of above it will eat the initial error
if (APP != null) { if (APP != null) {