refactor: finishes the replFregeTask refactoring

7 files changed, 139 insertions, 205 deletions

diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/CompileFregeTaskFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/CompileFregeTaskFunctionalTest.java
index af3225d..31e6d05 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/CompileFregeTaskFunctionalTest.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/CompileFregeTaskFunctionalTest.java
@@ -6,6 +6,8 @@ import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.createFregeSe
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runAndFailGradleTask;
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runGradleTask;
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.NEW_LINE;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.MINIMAL_BUILD_FILE_CONFIG;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.COMPLETION_FR;
 import static org.gradle.testkit.runner.TaskOutcome.FAILED;
 import static org.gradle.testkit.runner.TaskOutcome.FROM_CACHE;
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
@@ -29,30 +31,6 @@ import ch.fhnw.thga.gradleplugins.fregeproject.FregeSourceFile;
 
 public class CompileFregeTaskFunctionalTest
 {
-    private static final FregeSourceFile COMPLETION_FR = new FregeSourceFile(
-        String.format("%s/%s",
-            DEFAULT_RELATIVE_SOURCE_DIR,
-            "ch/fhnw/thga/Completion.fr"),
-        String.join
-        (
-            NEW_LINE,
-            "module ch.fhnw.thga.Completion where",
-            NEW_LINE,
-            NEW_LINE,
-            "  complete :: Int -> (Int, String)",
-            NEW_LINE,
-            "  complete i = (i, \"Frege rocks\")",
-            NEW_LINE
-        )
-    );
-    private static final String MINIMAL_BUILD_FILE_CONFIG = createFregeSection(
-        FregeDTOBuilder
-        .builder()
-        .version("'3.25.84'")
-        .release("'3.25alpha'")
-        .build()
-    );
-
     private static final boolean assertFileExists(
         File testProjectDir,
         String relativeFilePath)
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java
deleted file mode 100644
index 5159c92..0000000
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/FregePluginFunctionalTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package ch.fhnw.thga.gradleplugins;
-
-import static ch.fhnw.thga.gradleplugins.FregePlugin.COMPILE_FREGE_TASK_NAME;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.SETUP_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.REPL_FREGE_TASK_NAME;
-import static ch.fhnw.thga.gradleplugins.FregePlugin.RUN_FREGE_TASK_NAME;
-import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_RELATIVE_SOURCE_DIR;
-import static ch.fhnw.thga.gradleplugins.GradleBuildFileConversionTest.createPluginsSection;
-import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.createFregeSection;
-import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.writeToFile;
-import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.createFregeGradleProject;
-import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runGradleTask;
-import static org.gradle.testkit.runner.TaskOutcome.FAILED;
-import static org.gradle.testkit.runner.TaskOutcome.FROM_CACHE;
-import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
-import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.stream.Stream;
-
-import org.gradle.api.Project;
-import org.gradle.testfixtures.ProjectBuilder;
-import org.gradle.testkit.runner.BuildResult;
-import org.gradle.testkit.runner.GradleRunner;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.IndicativeSentencesGeneration;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-public class FregePluginFunctionalTest
-{
-    /*@Nested
-    @IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class)
-    class Run_frege_task_works {
-            @Test
-            void given_frege_file_with_main_function_and_main_module_config() 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);
-                    String mainFr = "Main.fr";
-                    String buildFileConfig = createFregeSection(
-                                    FREGE_BUILDER.version("'3.25.84'").release("'3.25alpha'")
-                                                    .mainModule("'ch.fhnw.thga.Main'").build());
-                    setupDefaultFregeProjectStructure(fregeCode, mainFr, buildFileConfig);
-
-                    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 completionFr = "Completion.fr";
-                    String buildFileConfig = createFregeSection(
-                                    FREGE_BUILDER.version("'3.25.84'").release("'3.25alpha'")
-                                                    .mainModule("'ch.fhnw.thga.Completion'").build());
-                    setupDefaultFregeProjectStructure(FREGE_COMPLETION_MODULE_CODE, completionFr, buildFileConfig);
-
-                    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"));
-            }
-
-            @Test
-            void given_frege_file_with_main_function_and_main_module_command_line_option() 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);
-                    String mainFr = "Main.fr";
-                    String buildFileConfig = createFregeSection(
-                                    FREGE_BUILDER.version("'3.25.84'").release("'3.25alpha'").build());
-                    setupDefaultFregeProjectStructure(fregeCode, mainFr, buildFileConfig);
-
-                    BuildResult result = runGradleTask(RUN_FREGE_TASK_NAME, "--mainModule=ch.fhnw.thga.Main");
-                    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"));
-            }
-    }
-
-
-    @Nested
-    @IndicativeSentencesGeneration(
-        separator = " -> ",
-        generator = DisplayNameGenerator.ReplaceUnderscores.class)
-    class Repl_frege_task_works
-    {
-        @Test
-        void given_minimal_build_file_config_with_replModule() throws Exception
-        {
-            String completionFr            = "Completion.fr";
-            String minimalReplModuleConfig = createFregeSection(
-                FREGE_BUILDER
-                .version("'3.25.84'")
-                .release("'3.25alpha'")
-                .replSource(String.format("'ch.fhnw.thga.Completion'"))
-                .build());
-            setupDefaultFregeProjectStructure(
-                FREGE_COMPLETION_MODULE_CODE,
-                completionFr,
-                minimalReplModuleConfig);
-
-            BuildResult result = runGradleTask(REPL_FREGE_TASK_NAME);
-
-            assertTrue(
-                project.getTasks().getByName(REPL_FREGE_TASK_NAME)
-                instanceof ReplFregeTask);
-            assertEquals(SUCCESS, result.task(":" + REPL_FREGE_TASK_NAME).getOutcome());
-            assertTrue(result.getOutput().contains("java -cp"));
-            assertTrue(result.getOutput().contains("frege3.25.84.jar"));
-            assertTrue(result.getOutput().contains("Completion.java"));
-        }
-    }
-
-    @Nested
-    @IndicativeSentencesGeneration(
-        separator = " -> ",
-        generator = DisplayNameGenerator.ReplaceUnderscores.class)
-    class Repl_frege_task_fails
-    {
-        @Test
-        void given_minimal_build_file_config_without_repl_module() throws Exception
-        {
-            String completionFr           = "Completion.fr";
-            String minimalBuildFileConfig = createFregeSection(
-                FREGE_BUILDER
-                .version("'3.25.84'")
-                .release("'3.25alpha'")
-                .build());
-            setupDefaultFregeProjectStructure(
-                FREGE_COMPLETION_MODULE_CODE,
-                completionFr,
-                minimalBuildFileConfig);
-
-            BuildResult result = runAndFailGradleTask(REPL_FREGE_TASK_NAME);
-
-            assertTrue(
-                project.getTasks().getByName(REPL_FREGE_TASK_NAME)
-                instanceof ReplFregeTask);
-            assertEquals(FAILED, result.task(":" + COMPILE_FREGE_TASK_NAME).getOutcome());
-        }
-    }*/
-}
\ No newline at end of file
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/ReplFregeTaskFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/ReplFregeTaskFunctionalTest.java
new file mode 100644
index 0000000..979d1d4
--- /dev/null
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/ReplFregeTaskFunctionalTest.java
@@ -0,0 +1,102 @@
+package ch.fhnw.thga.gradleplugins;
+
+import static ch.fhnw.thga.gradleplugins.FregePlugin.REPL_FREGE_TASK_NAME;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.COMPLETION_FR;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.MINIMAL_BUILD_FILE_CONFIG;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.createFregeSection;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runAndFailGradleTask;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runGradleTask;
+import static org.gradle.testkit.runner.TaskOutcome.FAILED;
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.util.stream.Stream;
+
+import org.gradle.api.Project;
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.IndicativeSentencesGeneration;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import ch.fhnw.thga.gradleplugins.fregeproject.FregeProjectBuilder;
+
+public class ReplFregeTaskFunctionalTest
+{
+    @Nested
+    @IndicativeSentencesGeneration(
+        generator = DisplayNameGenerator.ReplaceUnderscores.class)
+    class Repl_frege_task_works
+    {
+        @Test
+        void given_minimal_build_file_config_with_repl_module(
+            @TempDir File testProjectDir)
+            throws Exception
+        {
+            String replModuleConfig = createFregeSection(
+                FregeDTOBuilder
+                .builder()
+                .version("'3.25.84'")
+                .release("'3.25alpha'")
+                .replModule("'ch.fhnw.thga.Completion'")
+                .build()
+            );
+            Project project = FregeProjectBuilder
+                .builder()
+                .projectRoot(testProjectDir)
+                .buildFile(replModuleConfig)
+                .fregeSourceFiles(() -> Stream.of(COMPLETION_FR))
+                .build();
+                                                                                         
+            BuildResult result = runGradleTask(testProjectDir, REPL_FREGE_TASK_NAME);
+                                                                                         
+            assertTrue(
+                project
+                .getTasks()
+                .getByName(REPL_FREGE_TASK_NAME)
+                instanceof ReplFregeTask);
+            assertEquals(
+                SUCCESS,
+                result.task(":" + REPL_FREGE_TASK_NAME).getOutcome());
+            assertTrue(result.getOutput().contains("java -cp"));
+            assertTrue(result.getOutput().contains("frege3.25.84.jar"));
+            assertFalse(result.getOutput().contains("Completion.class"));
+        }
+    }
+
+    @Nested
+    @IndicativeSentencesGeneration(
+        generator = DisplayNameGenerator.ReplaceUnderscores.class)
+    class Repl_frege_task_fails
+    {
+        @Test
+        void given_minimal_build_file_config_without_repl_module(
+            @TempDir File testProjectDir)
+            throws Exception
+        {
+            Project project = FregeProjectBuilder
+                .builder()
+                .projectRoot(testProjectDir)
+                .buildFile(MINIMAL_BUILD_FILE_CONFIG)
+                .fregeSourceFiles(() -> Stream.of(COMPLETION_FR))
+                .build();
+                                                                                         
+            BuildResult result = runAndFailGradleTask(testProjectDir, REPL_FREGE_TASK_NAME);
+
+            assertTrue(
+                project
+                .getTasks()
+                .getByName(REPL_FREGE_TASK_NAME)
+                instanceof ReplFregeTask
+            );
+            assertEquals(
+                FAILED,
+                result.task(":" + REPL_FREGE_TASK_NAME).getOutcome()
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/RunFregeTaskFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/RunFregeTaskFunctionalTest.java
index c0c870a..c4d5bad 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/RunFregeTaskFunctionalTest.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/RunFregeTaskFunctionalTest.java
@@ -6,6 +6,7 @@ import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.NEW_LINE;
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.createFregeSection;
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runAndFailGradleTask;
 import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.runGradleTask;
+import static ch.fhnw.thga.gradleplugins.SharedFunctionalTestLogic.MINIMAL_BUILD_FILE_CONFIG;
 import static org.gradle.testkit.runner.TaskOutcome.FAILED;
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -91,17 +92,10 @@ public class RunFregeTaskFunctionalTest
             @TempDir File testProjectDir)
             throws Exception
         {
-            String mainBuildConfig = createFregeSection(
-                FregeDTOBuilder
-                .builder()
-                .version("'3.25.84'")
-                .release("'3.25alpha'")
-                .build()
-            );
             Project project = FregeProjectBuilder
                 .builder()
                 .projectRoot(testProjectDir)
-                .buildFile(mainBuildConfig)
+                .buildFile(MINIMAL_BUILD_FILE_CONFIG)
                 .fregeSourceFiles(() -> Stream.of(MAIN_FR))
                 .build();
             
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/SharedFunctionalTestLogic.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/SharedFunctionalTestLogic.java
index c98d7ac..51fa256 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/SharedFunctionalTestLogic.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/SharedFunctionalTestLogic.java
@@ -3,6 +3,7 @@ package ch.fhnw.thga.gradleplugins;
 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.GradleBuildFileConversionTest.createPluginsSection;
+import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_RELATIVE_SOURCE_DIR;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -15,9 +16,35 @@ import org.gradle.testfixtures.ProjectBuilder;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 
+import ch.fhnw.thga.gradleplugins.fregeproject.FregeSourceFile;
+
 public class SharedFunctionalTestLogic
 {
     public static final String NEW_LINE = System.lineSeparator();
+    public static final String MINIMAL_BUILD_FILE_CONFIG = createFregeSection(
+        FregeDTOBuilder
+        .builder()
+        .version("'3.25.84'")
+        .release("'3.25alpha'")
+        .build()
+    );
+    public static final FregeSourceFile COMPLETION_FR = new FregeSourceFile(
+        String.format("%s/%s",
+            DEFAULT_RELATIVE_SOURCE_DIR,
+            "ch/fhnw/thga/Completion.fr"),
+        String.join
+        (
+            NEW_LINE,
+            "module ch.fhnw.thga.Completion where",
+            NEW_LINE,
+            NEW_LINE,
+            "  complete :: Int -> (Int, String)",
+            NEW_LINE,
+            "  complete i = (i, \"Frege rocks\")",
+            NEW_LINE
+        )
+    );
+    
     static String createFregeSection(FregeDTO fregeDTO) 
    {
         return String.format(
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeProjectBuilder.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeProjectBuilder.java
index d2c6aeb..0cb0746 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeProjectBuilder.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeProjectBuilder.java
@@ -1,27 +1,23 @@
 package ch.fhnw.thga.gradleplugins.fregeproject;
 
+import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_RELATIVE_COMPILER_DOWNLOAD_DIR;
+import static ch.fhnw.thga.gradleplugins.FregePlugin.FREGE_PLUGIN_ID;
+import static ch.fhnw.thga.gradleplugins.GradleBuildFileConversionTest.createPluginsSection;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
 
-import ch.fhnw.thga.gradleplugins.FregeDTO;
-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.GradleBuildFileConversionTest.createPluginsSection;
-import static ch.fhnw.thga.gradleplugins.FregeExtension.DEFAULT_RELATIVE_COMPILER_DOWNLOAD_DIR;
-
 public final class FregeProjectBuilder implements ProjectRoot, BuildFile, Build
 {
     private static final String LATEST_COMPILER_VERSION = "3.25.84";
@@ -82,12 +78,6 @@ public final class FregeProjectBuilder implements ProjectRoot, BuildFile, Build
              throw new RuntimeException(e.getMessage(), e.getCause());
          }
      }
- 
-     private static File appendToFile(File destination, String content) throws IOException
-     {
-         writeFile(destination, System.lineSeparator() + content, true);
-         return destination;
-     }
      
      private File setupLocalFregeCompilerInDefaultPath() throws IOException
      {
diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeSourceFile.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeSourceFile.java
index c161dbd..858f6d4 100644
--- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeSourceFile.java
+++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/fregeproject/FregeSourceFile.java
@@ -7,8 +7,8 @@ public class FregeSourceFile
 
     public FregeSourceFile(String modulePath, String sourceCode)
     {
-        this.modulePath   = modulePath;
-        this.sourceCode   = sourceCode;   
+        this.modulePath = modulePath;
+        this.sourceCode = sourceCode;   
     }
 
     public String getFregeModulePath()