feat: adds two tests and makes them pass for new `runFregeTask`

8 files changed, 131 insertions, 24 deletions

diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java
index e93bd19..1ea8e90 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java
@@ -2,11 +2,9 @@ package ch.fhnw.thga.gradleplugins;
 
 import static ch.fhnw.thga.gradleplugins.GradleBuildFileConversionTest.createPluginsSection;
 import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_DOWNLOAD_DIRECTORY;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.COMPILE_FREGE_TASK_NAME;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.FREGE_EXTENSION_NAME;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.FREGE_PLUGIN_ID;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.SETUP_FREGE_TASK_NAME;
+import static ch.fhnw.thga.gradleplugins.FregePlugin.*;
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
+import static org.gradle.testkit.runner.TaskOutcome.FAILED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -35,6 +33,7 @@ import org.junit.jupiter.api.io.TempDir;
 
 @TestInstance(Lifecycle.PER_CLASS)
 public class FregePluginFunctionalTest {
+    private static final String NEW_LINE = System.lineSeparator();
 
     private final FregeDTOBuilder fregeBuilder = new FregeDTOBuilder();
 
@@ -62,9 +61,14 @@ public class FregePluginFunctionalTest {
         return String.format("%s {\n  %s\n}", FREGE_EXTENSION_NAME, fregeDTO.toBuildFile());
     }
 
-    private BuildResult runGradleTask(String taskName) {
-        return GradleRunner.create().withProjectDir(testProjectDir).withPluginClasspath()
-            .withArguments(taskName).build();
+    private BuildResult runGradleTask(String taskName, String... args) {
+        return GradleRunner.create().withProjectDir(testProjectDir).withPluginClasspath().withArguments(taskName)
+                .build();
+    }
+
+    private BuildResult runAndFailGradleTask(String taskName, String... args) {
+        return GradleRunner.create().withProjectDir(testProjectDir).withPluginClasspath().withArguments(taskName)
+                .buildAndFail();
     }
 
     @BeforeAll
@@ -92,13 +96,13 @@ public class FregePluginFunctionalTest {
     class Setup_frege_task_works {
 
         @Test
-        void given_minimal_build_file_config()
-                throws Exception {
-            String minimalBuildFileConfig = createFregeSection(fregeBuilder.version("'3.25.84'").release("'3.25alpha'").build());
+        void given_minimal_build_file_config() throws Exception {
+            String minimalBuildFileConfig = createFregeSection(
+                    fregeBuilder.version("'3.25.84'").release("'3.25alpha'").build());
             appendToFile(buildFile, minimalBuildFileConfig);
 
             BuildResult result = runGradleTask(SETUP_FREGE_TASK_NAME);
-            
+
             assertTrue(project.getTasks().getByName(SETUP_FREGE_TASK_NAME) instanceof SetupFregeTask);
             assertEquals(SUCCESS, result.task(":" + SETUP_FREGE_TASK_NAME).getOutcome());
             assertTrue(testProjectDir.toPath().resolve(Paths.get(DEFAULT_DOWNLOAD_DIRECTORY, "frege3.25.84.jar"))
@@ -106,10 +110,9 @@ public class FregePluginFunctionalTest {
         }
 
         @Test
-        void given_custom_frege_compiler_download_directory_in_build_file_config()
-                throws Exception {
-            String buildFileConfigWithCustomDownloadDir = createFregeSection(fregeBuilder.version("'3.25.84'").release("'3.25alpha'")
-                    .compilerDownloadDir("layout.projectDirectory.dir('dist')").build());
+        void given_custom_frege_compiler_download_directory_in_build_file_config() throws Exception {
+            String buildFileConfigWithCustomDownloadDir = createFregeSection(fregeBuilder.version("'3.25.84'")
+                    .release("'3.25alpha'").compilerDownloadDir("layout.projectDirectory.dir('dist')").build());
             appendToFile(buildFile, buildFileConfigWithCustomDownloadDir);
 
             BuildResult result = runGradleTask(SETUP_FREGE_TASK_NAME);
@@ -132,7 +135,8 @@ public class FregePluginFunctionalTest {
             File completionFr = testProjectDir.toPath().resolve(Paths.get("src", "main", "frege", "Completion.fr"))
                     .toFile();
             writeToFile(completionFr, fregeCode);
-            String minimalBuildFileConfig = createFregeSection(fregeBuilder.version("'3.25.84'").release("'3.25alpha'").build());
+            String minimalBuildFileConfig = createFregeSection(
+                    fregeBuilder.version("'3.25.84'").release("'3.25alpha'").build());
             appendToFile(buildFile, minimalBuildFileConfig);
 
             BuildResult result = runGradleTask(COMPILE_FREGE_TASK_NAME);
@@ -147,4 +151,42 @@ public class FregePluginFunctionalTest {
                             .exists());
         }
     }
+
+    @Nested
+    @IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class)
+    class Run_frege_task_works {
+        @Test
+        void given_frege_file_with_main_function() throws Exception {
+            String fregeCode = String.join(NEW_LINE, "module ch.fhnw.thga.Main where", NEW_LINE, NEW_LINE,
+                    "  main = do", NEW_LINE, "    println \"Frege rocks\"", NEW_LINE);
+            Files.createDirectories(testProjectDir.toPath().resolve(Paths.get("src", "main", "frege")));
+            File mainFr = testProjectDir.toPath().resolve(Paths.get("src", "main", "frege", "Main.fr")).toFile();
+            writeToFile(mainFr, fregeCode);
+            String minimalBuildFileConfig = createFregeSection(
+                    fregeBuilder.version("'3.25.84'").release("'3.25alpha'").mainModule("'ch.fhnw.thga.Main'").build());
+            appendToFile(buildFile, minimalBuildFileConfig);
+
+            BuildResult result = runGradleTask(RUN_FREGE_TASK_NAME);
+            assertTrue(project.getTasks().getByName(RUN_FREGE_TASK_NAME) instanceof RunFregeTask);
+            assertEquals(SUCCESS, result.task(":" + RUN_FREGE_TASK_NAME).getOutcome());
+            assertTrue(result.getOutput().contains("Frege rocks"));
+        }
+
+        @Test
+        void given_frege_file_without_main_function() throws Exception {
+            String fregeCode = "module ch.fhnw.thga.Completion where\n\n" + "complete :: Int -> (Int, String)\n"
+                    + "complete i = (i, \"Frege rocks\")\n";
+            Files.createDirectories(testProjectDir.toPath().resolve(Paths.get("src", "main", "frege")));
+            File completeFr = testProjectDir.toPath().resolve(Paths.get("src", "main", "frege", "Complete.fr")).toFile();
+            writeToFile(completeFr, fregeCode);
+            String minimalBuildFileConfig = createFregeSection(
+                    fregeBuilder.version("'3.25.84'").release("'3.25alpha'").mainModule("'ch.fhnw.thga.Completion'").build());
+            appendToFile(buildFile, minimalBuildFileConfig);
+
+            BuildResult result = runAndFailGradleTask(RUN_FREGE_TASK_NAME);
+            assertTrue(project.getTasks().getByName(RUN_FREGE_TASK_NAME) instanceof RunFregeTask);
+            assertEquals(FAILED, result.task(":" + RUN_FREGE_TASK_NAME).getOutcome());
+            assertTrue(result.getOutput().contains("Main method not found"));
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
index 551f6c5..6ba6212 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
@@ -29,7 +29,6 @@ public abstract class CompileFregeTask extends DefaultTask {
     @Inject
     public CompileFregeTask(ObjectFactory objectFactory) {
         javaExec = objectFactory.newInstance(JavaExec.class);
-
     }
 
     @TaskAction
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
index fd4f1b4..139429b 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
@@ -8,11 +8,14 @@ import org.gradle.api.provider.Property;
 
 public abstract class FregeExtension {
     public static final String DEFAULT_DOWNLOAD_DIRECTORY = "lib";
+    public static final String DEFAULT_RELATIVE_OUTPUT_DIR = "classes/main/frege";
 
     public abstract Property<String> getVersion();
 
     public abstract Property<String> getRelease();
 
+    public abstract Property<String> getMainModule();
+
     public abstract DirectoryProperty getCompilerDownloadDir();
 
     public abstract DirectoryProperty getMainSourceDir();
@@ -23,7 +26,7 @@ public abstract class FregeExtension {
     public FregeExtension(ProjectLayout projectLayout) {
         getCompilerDownloadDir().convention(projectLayout.getProjectDirectory().dir(DEFAULT_DOWNLOAD_DIRECTORY));
         getMainSourceDir().convention(projectLayout.getProjectDirectory());
-        getOutputDir().convention(projectLayout.getBuildDirectory().dir("classes/main/frege"));
+        getOutputDir().convention(projectLayout.getBuildDirectory().dir(DEFAULT_RELATIVE_OUTPUT_DIR));
     }
 
 }
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
index 4f0bb34..8c50a5f 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
@@ -7,6 +7,7 @@ import org.gradle.api.tasks.TaskProvider;
 public class FregePlugin implements Plugin<Project> {
     public static final String SETUP_FREGE_TASK_NAME = "setupFrege";
     public static final String COMPILE_FREGE_TASK_NAME = "compileFrege";
+    public static final String RUN_FREGE_TASK_NAME = "runFrege";
     public static final String FREGE_PLUGIN_ID = "ch.fhnw.thga.frege";
     public static final String FREGE_EXTENSION_NAME = "frege";
 
@@ -20,11 +21,18 @@ public class FregePlugin implements Plugin<Project> {
                     task.getDownloadDir().set(extension.getCompilerDownloadDir());
                 });
 
-        project.getTasks().register(COMPILE_FREGE_TASK_NAME, CompileFregeTask.class, task -> {
-            task.dependsOn(setupFregeCompilerTask);
+        TaskProvider<CompileFregeTask> compileFregeTask = project.getTasks().register(COMPILE_FREGE_TASK_NAME,
+                CompileFregeTask.class, task -> {
+                    task.dependsOn(setupFregeCompilerTask);
+                    task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath());
+                    task.getFregeMainSourceDir().set(extension.getMainSourceDir());
+                    task.getFregeOutputDir().set(extension.getOutputDir());
+                });
+        project.getTasks().register(RUN_FREGE_TASK_NAME, RunFregeTask.class, task -> {
+            task.dependsOn(compileFregeTask);
             task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath());
-            task.getFregeMainSourceDir().set(extension.getMainSourceDir());
             task.getFregeOutputDir().set(extension.getOutputDir());
+            task.getMainModule().set(extension.getMainModule());
         });
     }
 }
diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/RunFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/RunFregeTask.java
new file mode 100644
index 0000000..2f619a5
--- /dev/null
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/RunFregeTask.java
@@ -0,0 +1,41 @@
+package ch.fhnw.thga.gradleplugins;
+
+import javax.inject.Inject;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.JavaExec;
+import org.gradle.api.tasks.TaskAction;
+
+public abstract class RunFregeTask extends DefaultTask {
+    public static final Logger LOGGER = Logging.getLogger(SetupFregeTask.class);
+    private final JavaExec javaExec;
+
+    @InputFile
+    public abstract RegularFileProperty getFregeCompilerJar();
+
+    @InputDirectory
+    public abstract DirectoryProperty getFregeOutputDir();
+
+    @Input
+    public abstract Property<String> getMainModule();
+
+    @Inject
+    public RunFregeTask(ObjectFactory objectFactory) {
+        javaExec = objectFactory.newInstance(JavaExec.class);
+    }
+
+    @TaskAction
+    public void runFrege() {
+        javaExec.getMainClass().set(getMainModule());
+        javaExec.setClasspath(getProject().files(getFregeCompilerJar(), getFregeOutputDir())).exec();
+    }
+}
diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java b/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java
index cebaaf3..c8aeda7 100644
--- a/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java
+++ b/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java
@@ -11,5 +11,7 @@ public interface Builder {
 
     Builder outputDir(String outputDir);
 
+    Builder mainModule(String mainModule);
+
     FregeDTO build();
 }
diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java
index 63d7dae..271d07b 100644
--- a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java
+++ b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java
@@ -12,14 +12,16 @@ public class FregeDTO {
     public final String compilerDownloadDir;
     public final String mainSourceDir;
     public final String outputDir;
+    public final String mainModule;
 
     public FregeDTO(String version, String release, String compilerDownloadDir, String mainSourceDir,
-            String outputDir) {
+            String outputDir, String mainModule) {
         this.version = version;
         this.release = release;
         this.compilerDownloadDir = compilerDownloadDir;
         this.mainSourceDir = mainSourceDir;
         this.outputDir = outputDir;
+        this.mainModule = mainModule;
     }
 
     public String getVersion() {
@@ -42,6 +44,10 @@ public class FregeDTO {
         return outputDir;
     }
 
+    public String getMainModule() {
+        return mainModule;
+    }
+
     private String getFieldValue(Field field) {
         try {
             return field.get(this).toString();
diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java
index afdc862..5c24f10 100644
--- a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java
+++ b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java
@@ -6,6 +6,7 @@ public class FregeDTOBuilder implements Builder {
     private String compilerDownloadDir = "";
     private String mainSourceDir = "";
     private String outputDir = "";
+    private String mainModule = "";
 
     @Override
     public Builder version(String version) {
@@ -41,8 +42,13 @@ public class FregeDTOBuilder implements Builder {
         return this;
     }
 
-    public FregeDTO build() {
-        return new FregeDTO(version, release, compilerDownloadDir, mainSourceDir, outputDir);
+    @Override
+    public Builder mainModule(String mainModule) {
+        this.mainModule = mainModule;
+        return this;
     }
 
+    public FregeDTO build() {
+        return new FregeDTO(version, release, compilerDownloadDir, mainSourceDir, outputDir, mainModule);
+    }
 }