Don't sock away a deployment classloader until we know we need it, and don't keep it if we know it's bad

(cherry picked from commit 756071f)

Author: holly-cummins

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

@@ -153,9 +153,7 @@ public Runnable prepare() {
             ClassLoader old = Thread.currentThread().getContextClassLoader();
             QuarkusClassLoader tcl = testApplication.createDeploymentClassLoader();
             deploymentClassLoader = tcl;
-            if (firstDeploymentClassLoader == null) {
-                firstDeploymentClassLoader = deploymentClassLoader;
-            }
+
             LogCapturingOutputFilter logHandler = new LogCapturingOutputFilter(testApplication, true, true,
                     TestSupport.instance()
                             .get()::isDisplayTestOutput);
@@ -724,9 +722,13 @@ private DiscoveryResult discoverTestClasses() {
         ClassLoader classLoaderForLoadingTests;
         Closeable classLoaderToClose = null;
         ClassLoader orig = Thread.currentThread().getContextClassLoader();
+        // JUnitTestRunner is loaded with an augmentation classloader which does not have visibility of FacadeClassLoader, but the deployment classloader can see it
+        // We need a consistent classloader or we leak curated applications, so use a static classloader we stashed away
+        // In a multi-module project we will have several deployment classloaders, but it's ok
+        if (firstDeploymentClassLoader == null) {
+            firstDeploymentClassLoader = deploymentClassLoader;
+        }
         try {
-            // JUnitTestRunner is loaded with an augmentation classloader which does not have visibility of FacadeClassLoader, but the deployment classloader can see it
-            // We need a consistent classloader or we leak curated applications, so use a static classloader we stashed away
             Class fclClazz = firstDeploymentClassLoader.loadClass(FACADE_CLASS_LOADER_NAME);
             Constructor constructor = fclClazz.getConstructor(ClassLoader.class, boolean.class, CuratedApplication.class,
                     Map.class,
@@ -746,6 +748,8 @@ private DiscoveryResult discoverTestClasses() {
                     .setContextClassLoader(classLoaderForLoadingTests);
         } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InstantiationException
                 | InvocationTargetException e) {
+            // If the first deployment classloader cannot load a facade classloader, don't keep using it, let the next module provide one
+            firstDeploymentClassLoader = null;
             // This is fine, and usually just means that test-framework/junit5 isn't one of the project dependencies
             // In that case, fallback to loading classes as we normally would, using a TCCL
             log.debug(

integration-tests/maven/src/test/resources-filtered/projects/multimodule/dependency/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.acme</groupId>
+    <artifactId>quarkus-quickstart-multimodule-dependency</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+</project>

integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml

@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <modules>
+        <module>dependency</module>
         <module>rest</module>
         <module>html</module>
         <module>runner</module>
@@ -63,6 +64,11 @@
                 <artifactId>quarkus-quickstart-multimodule-rest</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.acme</groupId>
+                <artifactId>quarkus-quickstart-multimodule-dependency</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/test/java/org/acme/test/SimpleTest.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 
 public class SimpleTest {
-    
+
     @Test
     public void testNothing() {
         Assertions.assertTrue(true);

integration-tests/maven/src/test/resources-filtered/projects/multimodule/runner/pom.xml

@@ -24,6 +24,10 @@
             <groupId>org.acme</groupId>
             <artifactId>quarkus-quickstart-multimodule-rest</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.acme</groupId>
+            <artifactId>quarkus-quickstart-multimodule-dependency</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>

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

@@ -113,6 +113,7 @@ public FacadeClassLoader(ClassLoader parent) {
         this(parent, false, null, null, null, System.getProperty("java.class.path"));
     }
 
+    // Also called reflectively by JUnitTestRunner
     public FacadeClassLoader(ClassLoader parent, boolean isAuxiliaryApplication, CuratedApplication curatedApplication,
             final Map<String, String> profileNames,
             final Set<String> quarkusTestClasses, final String classesPath) {
@@ -563,6 +564,7 @@ private QuarkusClassLoader getOrCreateRuntimeClassLoader(String key, Class<?> re
         // If the try block fails, this would be null, but there's no catch, so we'd never get to this code
         QuarkusClassLoader loader = startupAction.getClassLoader();
 
+        // Make sure that our new classloader has config on it; this is a bit of a scattergun approach to setting config, but it helps cover most paths
         Class<?> configProviderResolverClass = loader.loadClass(ConfigProviderResolver.class.getName());
 
         Class<?> testConfigProviderResolverClass = loader.loadClass(QuarkusTestConfigProviderResolver.class.getName());