Merge pull request #16943 from stuartwdouglas/test-app-root

Make test classes the highest priority
quarkusio · May 3, 2021 · 7a3cf00 · 7a3cf00
2 parents 0144d3a + b9a0e0e
commit 7a3cf00
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java
@@ -1,6 +1,8 @@
 package io.quarkus.deployment.dev.testing;
 
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -9,9 +11,9 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.bootstrap.app.AdditionalDependency;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.PathsCollection;
 import io.quarkus.deployment.dev.CompilationProvider;
 import io.quarkus.deployment.dev.DevModeContext;
 import io.quarkus.deployment.dev.QuarkusCompiler;
@@ -115,16 +117,17 @@ public void init() {
         }
         if (testCuratedApplication == null) {
             try {
+                List<Path> paths = new ArrayList<>();
+                paths.add(Paths.get(context.getApplicationRoot().getTest().get().getClassesPath()));
+                paths.addAll(curatedApplication.getQuarkusBootstrap().getApplicationRoot().toList());
                 testCuratedApplication = curatedApplication.getQuarkusBootstrap().clonedBuilder()
                         .setMode(QuarkusBootstrap.Mode.TEST)
                         .setDisableClasspathCache(false)
                         .setIsolateDeployment(true)
                         .setBaseClassLoader(getClass().getClassLoader())
                         .setTest(true)
                         .setAuxiliaryApplication(true)
-                        .addAdditionalApplicationArchive(new AdditionalDependency(
-                                Paths.get(context.getApplicationRoot().getTest().get().getClassesPath()), true,
-                                true))
+                        .setApplicationRoot(PathsCollection.from(paths))
                         .build()
                         .bootstrap();
                 compiler = new QuarkusCompiler(testCuratedApplication, compilationProviders, context);