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