Introduce proper property name for controlling IT profile

Closes: quarkusio#29824
geoand · Dec 13, 2022 · 15a6632 · 15a6632
1 parent 0a79d6a
commit 15a6632
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java
@@ -15,6 +15,7 @@
  * <p>
  * TODO refactor code to actually use these values
  */
+@SuppressWarnings("jol")
 @ConfigRoot
 public class TestConfig {
 
@@ -149,6 +150,12 @@ public class TestConfig {
     @ConfigItem(defaultValue = "prod")
     String nativeImageProfile;
 
+    /**
+     * The profile to use when testing using {@code @QuarkusIntegrationTest}
+     */
+    @ConfigItem(defaultValue = "prod")
+    String integrationTestProfile;
+
     /**
      * Profile related test settings
      */

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ConfigUtil.java
@@ -38,4 +38,10 @@ public static Duration waitTimeValue(Config config) {
                 .orElseGet(() -> config.getOptionalValue("quarkus.test.jar-wait-time", Duration.class) // legacy value
                         .orElseGet(() -> Duration.ofSeconds(DEFAULT_WAIT_TIME_SECONDS)));
     }
+
+    public static String integrationTestProfile(Config config) {
+        return config.getOptionalValue("quarkus.test.integration-test-profile", String.class)
+                .orElseGet(() -> config.getOptionalValue("quarkus.test.native-image-profile", String.class)
+                        .orElse(null));
+    }
 }
diff --git a/.../junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java b/.../junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java
@@ -45,7 +45,7 @@ public DockerContainerArtifactLauncher create(CreateContext context) {
                     config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
                     config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
                     ConfigUtil.waitTimeValue(config),
-                    config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null),
+                    ConfigUtil.integrationTestProfile(config),
                     ConfigUtil.argLineValue(config),
                     context.devServicesLaunchResult(),
                     containerImage,

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java
@@ -43,7 +43,7 @@ public JarArtifactLauncher create(CreateContext context) {
                     config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
                     config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
                     ConfigUtil.waitTimeValue(config),
-                    config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null),
+                    ConfigUtil.integrationTestProfile(config),
                     ConfigUtil.argLineValue(config),
                     context.devServicesLaunchResult(),
                     context.buildOutputDirectory().resolve(pathStr)));

diff --git a/...work/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java b/...work/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java
@@ -41,7 +41,7 @@ public NativeImageLauncher create(CreateContext context) {
                     config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
                     config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
                     ConfigUtil.waitTimeValue(config),
-                    config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null),
+                    ConfigUtil.integrationTestProfile(config),
                     ConfigUtil.argLineValue(config),
                     context.devServicesLaunchResult(),
                     System.getProperty("native.image.path"),