Use the runtime classloader for test config building

Author: holly-cummins

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

@@ -555,28 +555,16 @@ private StartupAction getOrCreateRuntimeClassLoader(String key, Class<?> require
         StartupAction startupAction = appMakerHelper.getStartupAction(requiredTestClass,
                 curatedApplication, isAuxiliaryApplication, profile);
 
-        ClassLoader original = Thread.currentThread()
-                .getContextClassLoader();
-        try {
-            // See comments on AbstractJVMTestExtension#evaluateExecutionCondition for why this is the system classloader
-            Thread.currentThread()
-                    .setContextClassLoader(ClassLoader.getSystemClassLoader());
-
-            QuarkusClassLoader loader = startupAction.getClassLoader();
+        QuarkusClassLoader loader = startupAction.getClassLoader();
 
-            Class<?> configProviderResolverClass = loader.loadClass(ConfigProviderResolver.class.getName());
+        Class<?> configProviderResolverClass = loader.loadClass(ConfigProviderResolver.class.getName());
 
-            Class<?> testConfigProviderResolverClass = loader.loadClass(QuarkusTestConfigProviderResolver.class.getName());
-            Object testConfigProviderResolver = testConfigProviderResolverClass.getDeclaredConstructor(ClassLoader.class)
-                    .newInstance(loader);
+        Class<?> testConfigProviderResolverClass = loader.loadClass(QuarkusTestConfigProviderResolver.class.getName());
+        Object testConfigProviderResolver = testConfigProviderResolverClass.getDeclaredConstructor()
+                .newInstance();
 
-            configProviderResolverClass.getDeclaredMethod("setInstance", configProviderResolverClass)
-                    .invoke(null,
-                            testConfigProviderResolver);
-        } finally {
-            Thread.currentThread()
-                    .setContextClassLoader(original);
-        }
+        configProviderResolverClass.getDeclaredMethod("setInstance", configProviderResolverClass)
+                .invoke(null, testConfigProviderResolver);
 
         return startupAction;
 

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

@@ -9,15 +9,23 @@
 public class QuarkusTestConfigProviderResolver extends SmallRyeConfigProviderResolver {
     private final SmallRyeConfigProviderResolver resolver;
 
-    public QuarkusTestConfigProviderResolver(final ClassLoader classLoader) {
+    public QuarkusTestConfigProviderResolver() {
         this.resolver = (SmallRyeConfigProviderResolver) SmallRyeConfigProviderResolver.instance();
 
-        SmallRyeConfig config = ConfigUtils.configBuilder(false, true, LaunchMode.TEST)
-                .withProfile(LaunchMode.TEST.getDefaultProfile())
-                .withMapping(TestConfig.class, "quarkus.test")
-                .forClassLoader(classLoader)
-                .build();
+        ClassLoader classLoader = this.getClass().getClassLoader();
+        ClassLoader original = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(classLoader);
+            SmallRyeConfig config = ConfigUtils.configBuilder(false, true, LaunchMode.TEST)
+                    .withProfile(LaunchMode.TEST.getDefaultProfile())
+                    .withMapping(TestConfig.class, "quarkus.test")
+                    .forClassLoader(classLoader)
+                    .build();
 
-        this.registerConfig(config, Thread.currentThread().getContextClassLoader());
+            // See comments on AbstractJVMTestExtension#evaluateExecutionCondition for why this is the system classloader
+            this.registerConfig(config, ClassLoader.getSystemClassLoader());
+        } finally {
+            Thread.currentThread().setContextClassLoader(original);
+        }
     }
 }