Skip to content

Commit 1d8900e

Browse files
author
Gary Gregory
committed
Revert "Use JUnit TempDir instead of custom code."
This reverts commit ebf06ea.
1 parent ebf06ea commit 1d8900e

13 files changed

Lines changed: 87 additions & 450 deletions

src/main/java/org/apache/commons/io/file/CloseablePath.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/org/apache/commons/io/file/PathWrapper.java

Lines changed: 0 additions & 235 deletions
This file was deleted.

src/main/java/org/apache/commons/io/file/TempDirectory.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main/java/org/apache/commons/io/file/TempFile.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/test/java/org/apache/commons/io/FileUtilsTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.apache.commons.io.file.AbstractTempDirTest;
6767
import org.apache.commons.io.file.PathUtils;
6868
import org.apache.commons.io.file.PathUtilsIsEmptyTest;
69-
import org.apache.commons.io.file.TempDirectory;
7069
import org.apache.commons.io.filefilter.IOFileFilter;
7170
import org.apache.commons.io.filefilter.NameFileFilter;
7271
import org.apache.commons.io.filefilter.WildcardFileFilter;
@@ -1622,19 +1621,21 @@ public void testIsDirectory() throws IOException {
16221621
assertTrue(FileUtils.isDirectory(tempDirFile));
16231622
assertFalse(FileUtils.isDirectory(testFile1));
16241623

1625-
final File tempDirAsFile;
1626-
try (final TempDirectory tempDir = TempDirectory.create(getClass().getCanonicalName())) {
1627-
tempDirAsFile = tempDir.toFile();
1628-
assertTrue(FileUtils.isDirectory(tempDirAsFile));
1629-
}
1624+
final Path tempDir = Files.createTempDirectory(getClass().getCanonicalName());
1625+
final File tempDirAsFile = tempDir.toFile();
1626+
assertTrue(FileUtils.isDirectory(tempDirAsFile));
1627+
Files.delete(tempDir);
16301628
assertFalse(FileUtils.isDirectory(tempDirAsFile));
16311629
}
16321630

16331631
@Test
16341632
public void testIsEmptyDirectory() throws IOException {
1635-
try (final TempDirectory tempDir = TempDirectory.create(getClass().getCanonicalName())) {
1636-
final File tempDirAsFile = tempDir.toFile();
1633+
final Path tempDir = Files.createTempDirectory(getClass().getCanonicalName());
1634+
final File tempDirAsFile = tempDir.toFile();
1635+
try {
16371636
Assertions.assertTrue(FileUtils.isEmptyDirectory(tempDirAsFile));
1637+
} finally {
1638+
Files.delete(tempDir);
16381639
}
16391640
Assertions.assertFalse(FileUtils.isEmptyDirectory(PathUtilsIsEmptyTest.DIR_SIZE_1.toFile()));
16401641
}

0 commit comments

Comments
 (0)