This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 038810b4144fd834460fb65a1e9c701590aab9d1 Author: James Netherton <[email protected]> AuthorDate: Fri Sep 1 11:24:09 2023 +0100 Fix resolution of postgres.container.image config property in Quartz Clustered tests Fixes #5241 --- .../src/main/resources/application.properties | 1 - .../component/quartz/it/QuartzClusteredIT.java | 2 -- .../component/quartz/it/QuartzClusteredTest.java | 2 ++ ...eredIT.java => QuartzClusteredTestResource.java} | 21 ++++++++++++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/integration-tests/quartz-clustered/src/main/resources/application.properties b/integration-tests/quartz-clustered/src/main/resources/application.properties index 66f8179a32..6ba0495bd2 100644 --- a/integration-tests/quartz-clustered/src/main/resources/application.properties +++ b/integration-tests/quartz-clustered/src/main/resources/application.properties @@ -28,7 +28,6 @@ quarkus.quartz.cluster-checkin-interval=100 # Quartz persistent job store quarkus.datasource.devservices.enabled = true quarkus.datasource.db-kind = postgresql -quarkus.datasource.devservices.image-name = ${postgres.container.image} # Flyway to create Quartz tables quarkus.flyway.connect-retries = 10 diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java index d52c5e8d21..da405a54fb 100644 --- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java +++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java @@ -17,10 +17,8 @@ package org.apache.camel.quarkus.component.quartz.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; @QuarkusIntegrationTest -@Disabled // https://github.com/apache/camel-quarkus/issues/5241 class QuartzClusteredIT extends QuartzClusteredTest { } diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java index e9e5acb6ce..cfe38bd7f7 100644 --- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java +++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; +import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.apache.camel.quarkus.test.support.process.QuarkusProcessExecutor; @@ -33,6 +34,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.zeroturnaround.exec.StartedProcess; +@QuarkusTestResource(QuartzClusteredTestResource.class) @QuarkusTest class QuartzClusteredTest { diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTestResource.java similarity index 58% copy from integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java copy to integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTestResource.java index d52c5e8d21..23c3dc84d6 100644 --- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java +++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTestResource.java @@ -16,11 +16,22 @@ */ package org.apache.camel.quarkus.component.quartz.it; -import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.junit.jupiter.api.Disabled; +import java.util.Map; -@QuarkusIntegrationTest -@Disabled // https://github.com/apache/camel-quarkus/issues/5241 -class QuartzClusteredIT extends QuartzClusteredTest { +import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; +import org.eclipse.microprofile.config.ConfigProvider; +public class QuartzClusteredTestResource implements QuarkusTestResourceLifecycleManager { + private static final String POSTGRES_IMAGE_NAME = ConfigProvider.getConfig().getValue("postgres.container.image", + String.class); + + @Override + public Map<String, String> start() { + return Map.of("quarkus.datasource.\"postgres\".devservices.image-name", POSTGRES_IMAGE_NAME); + } + + @Override + public void stop() { + // Noop + } }
