Use FileSystemOperations

Author: dnestoro

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ContributionTask.java

@@ -13,6 +13,7 @@
 import org.graalvm.internal.tck.utils.FilesUtils;
 import org.graalvm.internal.tck.utils.InteractiveTaskUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.process.ExecOperations;
 
@@ -35,6 +36,9 @@ public abstract class ContributionTask extends DefaultTask {
     @Inject
     protected abstract ExecOperations getExecOperations();
 
+    @Inject
+    protected abstract FileSystemOperations getFileSystemOperations();
+
     private Path gradlew;
 
     private final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).setSerializationInclusion(JsonInclude.Include.NON_NULL);
@@ -156,7 +160,12 @@ private Path getTestsLocation() {
 
     private void checkPackages(Path testsPath) {
         List<Path> javaFiles = new ArrayList<>();
-        FilesUtils.findJavaFiles(testsPath, javaFiles);
+        try {
+            FilesUtils.findJavaFiles(testsPath, javaFiles);
+        } catch (IOException e) {
+            throw new RuntimeException("Cannot find java files. Reason: " + e);
+        }
+
         javaFiles.forEach(file -> {
             try {
                 Optional<String> packageLine = Files.readAllLines(file).stream().filter(line -> line.contains("package ")).findFirst();
@@ -325,21 +334,26 @@ private void addTests(Path originalTestsLocation){
         }
 
         InteractiveTaskUtils.printUserInfo("Removing dummy test stubs");
-        invokeCommand("rm -r " + destination, "Cannot delete files from: " + destination);
+        getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(destination));
 
         InteractiveTaskUtils.printUserInfo("Copying tests from: " + originalTestsLocation + " to " + destination);
-        invokeCommand("cp -a " + allTests + " " + destination, "Cannot copy files to: " + destination);
+        getFileSystemOperations().copy(copySpec -> {
+            copySpec.from(allTests);
+            copySpec.into(destination);
+        });
     }
 
     private void addResources(Path originalResourcesDirectory){
         if (originalResourcesDirectory == null) {
             return;
         }
 
-        Path destination = testsDirectory.resolve("src").resolve("test");
+        Path destination = testsDirectory.resolve("src").resolve("test").resolve("resources");
         InteractiveTaskUtils.printUserInfo("Copying resources from: " + originalResourcesDirectory + " to " + destination);
-
-        invokeCommand("cp -r " + originalResourcesDirectory + " " + destination, "Cannot copy files to: " + destination);
+        getFileSystemOperations().copy(copySpec -> {
+           copySpec.from(originalResourcesDirectory);
+           copySpec.into(destination);
+        });
     }
 
     private void addDockerImages(List<String> images) throws IOException {
@@ -354,7 +368,7 @@ private void addDockerImages(List<String> images) throws IOException {
         }
 
         for (var image : images) {
-            writeToFile(destination, image.concat("\n"), StandardOpenOption.APPEND);
+            writeToFile(destination, image.concat(System.lineSeparator()), StandardOpenOption.APPEND);
         }
     }
 
@@ -431,7 +445,7 @@ private void addAgentConfigBlock() {
                 throw new RuntimeException("Cannot find template for the graalvm configuration block");
             }
 
-            String content = "\n" + (new String(stream.readAllBytes(), StandardCharsets.UTF_8));
+            String content = System.lineSeparator() + (new String(stream.readAllBytes(), StandardCharsets.UTF_8));
             writeToFile(buildFilePath, content, StandardOpenOption.APPEND);
         } catch (IOException e) {
             throw new RuntimeException("Cannot add agent block into: " + buildFilePath);
@@ -510,10 +524,12 @@ private void removeEmptyConfigFiles() throws IOException {
         if (Files.exists(agentExtractedPredefinedClasses)) {
             File[] extractedPredefinedClasses = new File(agentExtractedPredefinedClasses.toUri()).listFiles();
             if (extractedPredefinedClasses == null || extractedPredefinedClasses.length == 0) {
+                ensureFileBelongsToProject(agentExtractedPredefinedClasses);
+
                 boolean canDelete = InteractiveTaskUtils.askForDeletePermission(agentExtractedPredefinedClasses);
                 if (canDelete) {
                     InteractiveTaskUtils.printUserInfo("Removing empty: agent-extracted-predefined-classes");
-                    invokeCommand("rm -r " + agentExtractedPredefinedClasses, "Cannot delete empty config file: " + agentExtractedPredefinedClasses);
+                    getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(agentExtractedPredefinedClasses));
                 }
             }
         }
@@ -526,7 +542,7 @@ private void removeConfigFile(Path path, CONFIG_FILES file, List<CONFIG_FILES> r
         boolean canDelete = InteractiveTaskUtils.askForDeletePermission(path);
         if (canDelete) {
             InteractiveTaskUtils.printUserInfo("Removing empty: " + file.get());
-            invokeCommand("rm " + path, "Cannot delete empty config file: " + path);
+            getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(path));
             remainingFiles.remove(file);
         }
     }

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/utils/ConfigurationStringBuilder.java

@@ -25,7 +25,7 @@ public ConfigurationStringBuilder append(String content) {
     }
 
     public ConfigurationStringBuilder newLine() {
-        this.append("\n");
+        this.append(System.lineSeparator());
         startedNewLine = true;
 
         return this;

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/utils/FilesUtils.java

@@ -1,27 +1,26 @@
 package org.graalvm.internal.tck.utils;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
 public class FilesUtils {
 
-    public static void findJavaFiles(Path root, List<Path> result) {
-        if (Files.exists(root) && Files.isRegularFile(root) && root.toString().endsWith(".java")) {
-            result.add(root);
-            return;
-        }
+    public static void findJavaFiles(Path root, List<Path> result) throws IOException {
+        Files.walkFileTree(root, new SimpleFileVisitor<>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                if (Files.isRegularFile(file) && file.toString().endsWith(".java")) {
+                    result.add(file);
+                }
 
-        if (Files.isDirectory(root)) {
-            File[] content = root.toFile().listFiles();
-            if (content == null) {
-                return;
+                return super.visitFile(file, attrs);
             }
-
-            for (var file : content) {
-                findJavaFiles(file.toPath(), result);
-            }
-        }
+        });
     }
 }