Let QuarkusTest pass its launch mode to QuarkusDev

Author: aloubyansky

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java

@@ -411,6 +411,16 @@ private boolean classesExist() {
         return false;
     }
 
+    /**
+     * Returns launch mode for the target application model.
+     *
+     * @return launch mode for the target application model
+     */
+    @Internal
+    protected LaunchMode getLaunchMode() {
+        return LaunchMode.DEVELOPMENT;
+    }
+
     private DevModeCommandLine newLauncher(final AnalyticsService analyticsService) throws Exception {
         final Project project = getProject();
         final JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
@@ -466,7 +476,7 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
 
         builder.sourceEncoding(getSourceEncoding());
 
-        final ApplicationModel appModel = extension().getApplicationModel(LaunchMode.DEVELOPMENT);
+        final ApplicationModel appModel = extension().getApplicationModel(getLaunchMode());
         builder.extensionDevModeConfig(appModel.getExtensionDevModeConfig())
                 .extensionDevModeJvmOptionFilter(extensionJvmOptions);
 
@@ -538,7 +548,8 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
         serializedModel.toFile().deleteOnExit();
         builder.jvmArgs("-D" + BootstrapConstants.SERIALIZED_APP_MODEL + "=" + serializedModel.toAbsolutePath());
 
-        final ApplicationModel testAppModel = extension().getApplicationModel(LaunchMode.TEST);
+        final ApplicationModel testAppModel = getLaunchMode().equals(LaunchMode.TEST) ? appModel
+                : extension().getApplicationModel(LaunchMode.TEST);
         final Path serializedTestModel = ToolingUtils.serializeAppModel(testAppModel, this, true);
         serializedTestModel.toFile().deleteOnExit();
         builder.jvmArgs("-D" + BootstrapConstants.SERIALIZED_TEST_APP_MODEL + "=" + serializedTestModel.toAbsolutePath());

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTest.java

@@ -1,15 +1,14 @@
 package io.quarkus.gradle.tasks;
 
-import java.util.function.Consumer;
-
 import javax.inject.Inject;
 
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.tasks.Internal;
 
 import io.quarkus.deployment.dev.DevModeCommandLineBuilder;
-import io.quarkus.deployment.dev.DevModeContext;
 import io.quarkus.deployment.dev.IsolatedTestModeMain;
 import io.quarkus.gradle.extension.QuarkusPluginExtension;
+import io.quarkus.runtime.LaunchMode;
 
 public abstract class QuarkusTest extends QuarkusDev {
 
@@ -21,12 +20,15 @@ public QuarkusTest(Configuration quarkusDevConfiguration, QuarkusPluginExtension
                 extension);
     }
 
+    @Override
     protected void modifyDevModeContext(DevModeCommandLineBuilder builder) {
-        builder.entryPointCustomizer(new Consumer<DevModeContext>() {
-            @Override
-            public void accept(DevModeContext devModeContext) {
-                devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName());
-            }
-        });
+        builder.entryPointCustomizer(
+                devModeContext -> devModeContext.setAlternateEntryPoint(IsolatedTestModeMain.class.getName()));
+    }
+
+    @Override
+    @Internal
+    protected LaunchMode getLaunchMode() {
+        return LaunchMode.TEST;
     }
 }

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java

@@ -193,6 +193,7 @@ public static ResolvedDependencyBuilder getProjectArtifact(Project project, bool
 
         initProjectModule(project, mainModule, sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME), ArtifactSources.MAIN);
         if (workspaceDiscovery) {
+            appArtifact.setReloadable();
             final TaskCollection<Test> testTasks = project.getTasks().withType(Test.class);
             if (!testTasks.isEmpty()) {
                 final Map<File, SourceSet> sourceSetsByClassesDir = new HashMap<>();
@@ -319,7 +320,7 @@ private static void processDeploymentDependency(Project project, ResolvedDepende
                     clearReloadableFlag = true;
                 }
                 dep.setDeploymentCp();
-                if (clearReloadableFlag) {
+                if (clearReloadableFlag && dep != modelBuilder.getApplicationArtifact()) {
                     dep.clearFlag(DependencyFlags.RELOADABLE);
                 }
             }
@@ -480,14 +481,14 @@ private void collectDependencies(org.gradle.api.artifacts.ResolvedDependency res
                     flags = clearFlag(flags, COLLECT_RELOADABLE_MODULES);
                 }
                 modelBuilder.addDependency(depBuilder);
-                if (projectModule == null && depBuilder.getWorkspaceModule() != null) {
-                    projectModule = depBuilder.getWorkspaceModule().mutable();
-                }
 
                 if (artifactFiles != null) {
                     artifactFiles.add(a.getFile());
                 }
             }
+            if (projectModule == null && depBuilder.getWorkspaceModule() != null) {
+                projectModule = depBuilder.getWorkspaceModule().mutable();
+            }
             if (isFlagOn(flags, COLLECT_DIRECT_DEPS)) {
                 depBuilder.setDirect(true);
                 flags = clearFlag(flags, COLLECT_DIRECT_DEPS);