From ba3c975f1625914d7340c86a4d046b1c1dd62545 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Fri, 18 Oct 2024 19:58:54 +0200
Subject: [PATCH] Fix Single-file-java-launcher test and add module to CI

---
 .github/workflows/main.yml                    |  3 +++
 .../file/launcher/actions/JavaFileTest.java   | 27 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4e657d947fb..a2d9863c1e71 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1294,6 +1294,9 @@ jobs:
       - name: java.freeform
         run: ant $OPTS -f java/java.freeform test
 
+      - name: java.file.launcher
+        run: ant $OPTS -f java/java.file.launcher test
+
 #      - name: java.kit
 #        run: ant $OPTS -f java/java.kit test
 
diff --git a/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/actions/JavaFileTest.java b/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/actions/JavaFileTest.java
index 38fb8ef3d91b..31eb0572ecbc 100644
--- a/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/actions/JavaFileTest.java
+++ b/java/java.file.launcher/test/unit/src/org/netbeans/modules/java/file/launcher/actions/JavaFileTest.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.InputStreamReader;
-import java.util.logging.Logger;
 import static junit.framework.TestCase.assertEquals;
 import org.netbeans.api.extexecution.base.ExplicitProcessParameters;
 import org.netbeans.junit.NbTestCase;
@@ -36,8 +35,6 @@
  */
 public class JavaFileTest extends NbTestCase {
     
-    private static final Logger LOG = Logger.getLogger(JavaFileTest.class.getName());
-    
     public JavaFileTest(String name) {
         super(name);
     }
@@ -45,23 +42,25 @@ public JavaFileTest(String name) {
     public void testSingleJavaSourceRun() throws Exception {
         clearWorkDir();
         File f1 = new File(getWorkDir(), "TestSingleJavaFile.java");
-        FileWriter w = new FileWriter(f1);
-        w.write("public class TestSingleJavaFile {\n" +
-        "    \n" +
-        "    public static void main (String args[]) {\n" +
-        "        System.out.print(\"hello world\");\n" +
-        "    }\n" +
-        "    \n" +
-        "}");
-        w.close();
+        try (FileWriter w = new FileWriter(f1)) {
+            w.write(
+                """
+                public class TestSingleJavaFile {
+                    public static void main (String args[]) {
+                        System.out.print("hello world");
+                    }
+                }
+                """
+            );
+        }
         FileObject javaFO = FileUtil.toFileObject(f1);
         assertNotNull("FileObject found: " + f1, javaFO);
         SingleJavaSourceRunActionProvider runActionProvider = new SingleJavaSourceRunActionProvider();
-        LaunchProcess process = runActionProvider.invokeActionHelper(null, "run.single", javaFO, ExplicitProcessParameters.empty());
+        LaunchProcess process = runActionProvider.invokeActionHelper("run.single", javaFO, ExplicitProcessParameters.empty());
         BufferedReader reader
                 = new BufferedReader(new InputStreamReader(process.call().getInputStream()));
         StringBuilder builder = new StringBuilder();
-        String line = null;
+        String line;
         while ((line = reader.readLine()) != null) {
             builder.append(line);
         }