[maven-file-management] 01/01: use JUnit @TempDir

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch temp
in repository https://gitbox.apache.org/repos/asf/maven-file-management.git

commit 51ec2b8bc6fd72bd4965e56c157f05931b68b1e6
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Tue Jun 6 18:41:39 2023 -0400

    use JUnit @TempDir
---
 .../maven/shared/model/fileset/util/FileSetUtilsTest.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java b/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
index cbfd101..69dbf3d 100644
--- a/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
@@ -31,6 +31,7 @@ import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -41,7 +42,8 @@ import static org.junit.jupiter.api.Assertions.fail;
  * Test the FileSet
  */
 public class FileSetUtilsTest {
-    private final Set<File> testDirectories = new HashSet<>();
+    @TempDir
+    File testDirectory;
 
     private final Set<File> linkFiles = new HashSet<>();
 
@@ -51,10 +53,6 @@ public class FileSetUtilsTest {
         for (File linkFile : linkFiles) {
             linkFile.delete();
         }
-
-        for (File dir : testDirectories) {
-            FileUtils.deleteDirectory(dir);
-        }
     }
 
     /**
@@ -302,13 +300,11 @@ public class FileSetUtilsTest {
 
         File sourceDir = new File(URLDecoder.decode(sourceResource.getPath(), "UTF-8"));
 
-        String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
         String testBase = System.getProperty("testBase", "target/test-directories");
 
-        File testDir = new File(basedir, testBase + "/" + directoryName);
+        File testDir = new File(testDirectory, testBase + "/" + directoryName);
         if (testDir.mkdirs()) {
             FileUtils.copyDirectory(sourceDir, testDir);
-            testDirectories.add(testDir);
             return testDir;
         } else {
             throw new IOException("Could not create test directory " + testDir);