Merge pull request quarkusio#6312 from gastaldi/gradle_missing

Added back methods mistakenly considered unused in QuarkusPluginExtension
aureamunoz · Dec 22, 2019 · 54eb2f5 · 54eb2f5
2 parents 79da438 + b3ea880
commit 54eb2f5
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/devtools/gradle/pom.xml b/devtools/gradle/pom.xml
@@ -64,6 +64,7 @@
                                 <argument>${gradle.task}</argument>
                                 <argument>-Pdescription=${project.description}</argument>
                                 <argument>-S</argument>
+                                <argument>--stacktrace</argument>
                             </arguments>
                             <environmentVariables>
                                 <MAVEN_LOCAL_REPO>${settings.localRepository}</MAVEN_LOCAL_REPO>

diff --git a/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java b/devtools/gradle/src/functionalTest/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java
@@ -9,19 +9,30 @@
 import io.quarkus.cli.commands.CreateProject;
 import io.quarkus.cli.commands.writer.FileProjectWriter;
 import io.quarkus.generators.BuildTool;
+import io.quarkus.generators.SourceType;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class QuarkusPluginFunctionalTest {
 
+    private File projectRoot;
+
+    @BeforeEach
+    void setUp(@TempDir File projectRoot) {
+        this.projectRoot = projectRoot;
+    }
+
     @Test
-    public void canRunListExtensions(@TempDir File projectRoot) throws IOException {
-        createProject(projectRoot);
+    public void canRunListExtensions() throws IOException {
+        createProject(SourceType.JAVA);
 
         BuildResult build = GradleRunner.create()
                 .forwardOutput()
@@ -34,9 +45,11 @@ public void canRunListExtensions(@TempDir File projectRoot) throws IOException {
         assertThat(build.getOutput()).contains("Quarkus - Core");
     }
 
-    @Test
-    public void canBuild(@TempDir File projectRoot) throws IOException {
-        createProject(projectRoot);
+    @ParameterizedTest(name = "Build {0} project")
+    //TODO: Fix Scala build in Windows
+    @EnumSource(value = SourceType.class, names = {"JAVA","KOTLIN"})
+    public void canBuild(SourceType sourceType) throws IOException {
+        createProject(sourceType);
 
         BuildResult build = GradleRunner.create()
                 .forwardOutput()
@@ -60,12 +73,13 @@ private List<String> arguments(String argument) {
         return arguments;
     }
 
-    private void createProject(@TempDir File projectRoot) throws IOException {
+    private void createProject(SourceType sourceType) throws IOException {
         assertThat(new CreateProject(new FileProjectWriter(projectRoot))
                            .groupId("com.acme.foo")
                            .artifactId("foo")
                            .version("1.0.0-SNAPSHOT")
                            .buildTool(BuildTool.GRADLE)
+                           .sourceType(sourceType)
                            .doCreateProject(new HashMap<>()))
                 .withFailMessage("Project was not created")
                 .isTrue();

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java
@@ -36,6 +36,10 @@ public File outputDirectory() {
         return new File(outputDirectory);
     }
 
+    public void setOutputDirectory(String outputDirectory) {
+        this.outputDirectory = outputDirectory;
+    }
+
     public File outputConfigDirectory() {
         if (outputConfigDirectory == null) {
             outputConfigDirectory = project.getConvention().getPlugin(JavaPluginConvention.class)
@@ -44,6 +48,10 @@ public File outputConfigDirectory() {
         return new File(outputConfigDirectory);
     }
 
+    public void setOutputConfigDirectory(String outputConfigDirectory) {
+        this.outputConfigDirectory = outputConfigDirectory;
+    }
+
     public File sourceDir() {
         if (sourceDir == null) {
             sourceDir = project.getConvention().getPlugin(JavaPluginConvention.class)
@@ -52,6 +60,10 @@ public File sourceDir() {
         return new File(sourceDir);
     }
 
+    public void setSourceDir(String sourceDir) {
+        this.sourceDir = sourceDir;
+    }
+
     public File workingDir() {
         if (workingDir == null) {
             workingDir = outputDirectory().getPath();
@@ -60,13 +72,21 @@ public File workingDir() {
         return new File(workingDir);
     }
 
+    public void setWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+    }
+
     public String finalName() {
         if (finalName == null || finalName.length() == 0) {
             this.finalName = String.format("%s-%s", project.getName(), project.getVersion());
         }
         return finalName;
     }
 
+    public void setFinalName(String finalName) {
+        this.finalName = finalName;
+    }
+
     public Set<File> resourcesDir() {
         return project.getConvention().getPlugin(JavaPluginConvention.class)
                 .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getResources().getSrcDirs();