Merge pull request #47807 from radcortez/fix-47755

Allow to override default config profile in the JUnit Config

Author: phillip-kruger

extensions/vertx-http/dev-ui-tests/pom.xml

@@ -12,6 +12,10 @@
     <name>Quarkus - Vert.x - HTTP - Dev UI Tests</name>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-config</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-core</artifactId>

extensions/vertx-http/dev-ui-tests/src/main/java/io/quarkus/devui/tests/DevUIBuildTimeDataTest.java

@@ -1,5 +1,7 @@
 package io.quarkus.devui.tests;
 
+import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -8,14 +10,17 @@
 import java.util.List;
 import java.util.Scanner;
 
-import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.quarkus.test.config.TestConfigProviderResolver;
+
 public abstract class DevUIBuildTimeDataTest {
 
     protected static final Logger log = Logger.getLogger(DevUIBuildTimeDataTest.class);
@@ -26,9 +31,9 @@ public abstract class DevUIBuildTimeDataTest {
     private final JsonFactory factory = mapper.getFactory();
 
     public DevUIBuildTimeDataTest(String namespace) {
-        String testUrl = ConfigProvider.getConfig().getValue("test.url", String.class);
-        String nonApplicationRoot = ConfigProvider.getConfig()
-                .getOptionalValue("quarkus.http.non-application-root-path", String.class).orElse("q");
+        Config config = ((TestConfigProviderResolver) ConfigProviderResolver.instance()).getConfig(DEVELOPMENT);
+        String testUrl = config.getValue("test.url", String.class);
+        String nonApplicationRoot = config.getOptionalValue("quarkus.http.non-application-root-path", String.class).orElse("q");
         if (!nonApplicationRoot.startsWith("/")) {
             nonApplicationRoot = "/" + nonApplicationRoot;
         }

extensions/vertx-http/dev-ui-tests/src/main/java/io/quarkus/devui/tests/DevUIJsonRPCTest.java

@@ -1,13 +1,15 @@
 package io.quarkus.devui.tests;
 
+import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 
 import com.fasterxml.jackson.core.JsonFactory;
@@ -19,6 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import io.quarkus.test.config.TestConfigProviderResolver;
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClient;
@@ -40,13 +43,14 @@ public class DevUIJsonRPCTest {
     private final String testUrl;
 
     public DevUIJsonRPCTest(String namespace) {
-        this(namespace, ConfigProvider.getConfig().getValue("test.url", String.class));
+        this(namespace, ((TestConfigProviderResolver) ConfigProviderResolver.instance()).getConfig(DEVELOPMENT)
+                .getValue("test.url", String.class));
     }
 
     public DevUIJsonRPCTest(String namespace, String testUrl) {
         this.namespace = namespace;
         this.testUrl = testUrl;
-        String nonApplicationRoot = ConfigProvider.getConfig()
+        String nonApplicationRoot = ((TestConfigProviderResolver) ConfigProviderResolver.instance()).getConfig(DEVELOPMENT)
                 .getOptionalValue("quarkus.http.non-application-root-path", String.class).orElse("q");
         if (!nonApplicationRoot.startsWith("/")) {
             nonApplicationRoot = "/" + nonApplicationRoot;

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

@@ -12,6 +12,7 @@
 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;
 
 /**
@@ -50,15 +51,28 @@ 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)
-                            .withProfile(mode.getDefaultProfile())
+                            .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")
                             .build();
                 }
             });
+            LaunchMode.set(current);
             resolver.registerConfig(config, classLoader);
             return config;
         }