Revert "Revert "Use JUnit TempDir instead of custom code.""

This reverts commit a149541.

Author: Gary Gregory

src/test/java/org/apache/commons/io/file/CleaningPathVisitorTest.java

@@ -18,17 +18,15 @@
 package org.apache.commons.io.file;
 
 import static org.apache.commons.io.file.CounterAssertions.assertCounts;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.apache.commons.io.file.Counters.PathCounters;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -37,28 +35,14 @@
  */
 public class CleaningPathVisitorTest extends TestArguments {
 
+    @TempDir
     private Path tempDir;
 
-    @AfterEach
-    public void afterEach() throws IOException {
-        // temp dir should still exist since we are cleaning and not deleting.
-        assertTrue(Files.exists(tempDir));
-        // backstop
-        if (Files.exists(tempDir) && PathUtils.isEmptyDirectory(tempDir)) {
-            Files.deleteIfExists(tempDir);
-        }
-    }
-
     private void applyCleanEmptyDirectory(final CleaningPathVisitor visitor) throws IOException {
         Files.walkFileTree(tempDir, visitor);
         assertCounts(1, 0, 0, visitor);
     }
 
-    @BeforeEach
-    public void beforeEach() throws IOException {
-        tempDir = Files.createTempDirectory(getClass().getCanonicalName());
-    }
-
     /**
      * Tests an empty folder.
      */

src/test/java/org/apache/commons/io/file/CountingPathVisitorTest.java

@@ -20,8 +20,6 @@
 import static org.apache.commons.io.file.CounterAssertions.assertCounts;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -44,11 +42,8 @@ private void checkZeroCounts(final CountingPathVisitor visitor) {
     @MethodSource("countingPathVisitors")
     public void testCountEmptyFolder(final CountingPathVisitor visitor) throws IOException {
         checkZeroCounts(visitor);
-        final Path tempDir = Files.createTempDirectory(getClass().getCanonicalName());
-        try {
-            assertCounts(1, 0, 0, PathUtils.visitFileTree(visitor, tempDir));
-        } finally {
-            Files.deleteIfExists(tempDir);
+        try (final TempDirectory tempDir = TempDirectory.create(getClass().getCanonicalName())) {
+            assertCounts(1, 0, 0, PathUtils.visitFileTree(visitor, tempDir.unwrap()));
         }
     }