change deletion approach to fix permission issues

Author: dterrybd

common/src/test/java/com/synopsys/integration/common/test/util/finder/SimpleFileFinderTest.java

@@ -11,10 +11,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
-import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,8 +36,12 @@ public void setup() throws IOException {
     public void cleanup() throws IOException {
         try {
             Files.delete(initialDirectoryPath);
-        } catch (DirectoryNotEmptyException e) {
-            FileUtils.deleteDirectory(initialDirectoryPath.toFile());
+        } catch (DirectoryNotEmptyException e) {            
+            try (Stream<Path> walk = Files.walk(initialDirectoryPath)) {
+                walk.sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .forEach(File::delete);
+            }
         }
     }
 

detector/src/test/java/com/synopsys/integration/detector/finder/DirectoryFinderTest.java

@@ -8,11 +8,12 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Comparator;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterAll;
@@ -33,7 +34,13 @@ public static void setup() throws IOException {
 
     @AfterAll
     public static void cleanup() throws IOException {
-        FileUtils.deleteDirectory(initialDirectoryPath.toFile());
+        if (Files.exists(initialDirectoryPath)) {
+            try (Stream<Path> walk = Files.walk(initialDirectoryPath)) {
+                walk.sorted(Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .forEach(File::delete);
+            }
+        }
     }
 
     @Test
@@ -115,7 +122,11 @@ private void testSymLinks(boolean followSymLinks) throws IOException {
             assertEquals("regularDir", subDirContentsName);
         }
 
-        FileUtils.deleteDirectory(initialDirectory);
+        try (Stream<Path> walk = Files.walk(initialDirectory.toPath())) {
+            walk.sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+        }
     }
 
     @NotNull