Fallback quarkus.test.integration-test-profile to quarkus.profile

Author: radcortez

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java

@@ -160,7 +160,7 @@ public interface TestConfig {
     /**
      * The profile to use when testing using {@code @QuarkusIntegrationTest}
      */
-    @WithDefault("${quarkus.profile:prod}")
+    @WithDefault("prod")
     String integrationTestProfile();
 
     /**

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfigCustomizer.java

@@ -0,0 +1,44 @@
+package io.quarkus.deployment.dev.testing;
+
+import java.util.function.Function;
+
+import io.quarkus.runtime.LaunchMode;
+import io.smallrye.config.ConfigSourceInterceptor;
+import io.smallrye.config.ConfigSourceInterceptorContext;
+import io.smallrye.config.ConfigSourceInterceptorFactory;
+import io.smallrye.config.FallbackConfigSourceInterceptor;
+import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
+
+public class TestConfigCustomizer implements SmallRyeConfigBuilderCustomizer {
+    private final LaunchMode launchMode;
+
+    public TestConfigCustomizer(final LaunchMode launchMode) {
+        this.launchMode = launchMode;
+    }
+
+    @Override
+    public void configBuilder(final SmallRyeConfigBuilder builder) {
+        builder.withDefaultValue("quarkus.profile", launchMode.getDefaultProfile());
+        builder.withMapping(TestConfig.class);
+        builder.withInterceptorFactories(new ConfigSourceInterceptorFactory() {
+            @Override
+            public ConfigSourceInterceptor getInterceptor(final ConfigSourceInterceptorContext context) {
+                return new FallbackConfigSourceInterceptor(new Function<String, String>() {
+                    @Override
+                    public String apply(final String name) {
+                        if (name.equals("quarkus.test.integration-test-profile")) {
+                            return "quarkus.profile";
+                        }
+                        return name;
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public int priority() {
+        return SmallRyeConfigBuilderCustomizer.super.priority();
+    }
+}

test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java

@@ -7,12 +7,11 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
-import io.quarkus.deployment.dev.testing.TestConfig;
+import io.quarkus.deployment.dev.testing.TestConfigCustomizer;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
-import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 
 /**
@@ -51,28 +50,18 @@ public Config getConfig() {
     public Config getConfig(final LaunchMode mode) {
         if (classLoader.equals(Thread.currentThread().getContextClassLoader())) {
             resolver.releaseConfig(classLoader);
-            LaunchMode current = LaunchMode.current();
-            LaunchMode.set(mode);
             SmallRyeConfig config = configs.computeIfAbsent(mode, new Function<LaunchMode, SmallRyeConfig>() {
                 @Override
                 public SmallRyeConfig apply(final LaunchMode launchMode) {
-                    return ConfigUtils.configBuilder(false, true, mode)
-                            .withCustomizers(new SmallRyeConfigBuilderCustomizer() {
-                                @Override
-                                public void configBuilder(final SmallRyeConfigBuilder builder) {
-                                    builder.withDefaultValue("quarkus.profile", launchMode.getDefaultProfile());
-                                }
-
-                                @Override
-                                public int priority() {
-                                    return Integer.MAX_VALUE;
-                                }
-                            })
-                            .withMapping(TestConfig.class, "quarkus.test")
+                    LaunchMode current = LaunchMode.current();
+                    LaunchMode.set(launchMode);
+                    SmallRyeConfig config = ConfigUtils.configBuilder(false, true, mode)
+                            .withCustomizers(new TestConfigCustomizer(mode))
                             .build();
+                    LaunchMode.set(current);
+                    return config;
                 }
             });
-            LaunchMode.set(current);
             resolver.registerConfig(config, classLoader);
             return config;
         }

test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/QuarkusTestConfigProviderResolver.java

@@ -1,6 +1,6 @@
 package io.quarkus.test.junit.classloading;
 
-import io.quarkus.deployment.dev.testing.TestConfig;
+import io.quarkus.deployment.dev.testing.TestConfigCustomizer;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.smallrye.config.SmallRyeConfig;
@@ -17,9 +17,8 @@ public QuarkusTestConfigProviderResolver() {
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
             SmallRyeConfig config = ConfigUtils.configBuilder(false, true, LaunchMode.TEST)
-                    .withProfile(LaunchMode.TEST.getDefaultProfile())
-                    .withMapping(TestConfig.class, "quarkus.test")
                     .forClassLoader(classLoader)
+                    .withCustomizers(new TestConfigCustomizer(LaunchMode.TEST))
                     .build();
 
             // See comments on AbstractJVMTestExtension#evaluateExecutionCondition for why this is the system classloader