|
66 | 66 | import org.apache.commons.io.file.AbstractTempDirTest; |
67 | 67 | import org.apache.commons.io.file.PathUtils; |
68 | 68 | import org.apache.commons.io.file.PathUtilsIsEmptyTest; |
69 | | -import org.apache.commons.io.file.TempDirectory; |
70 | 69 | import org.apache.commons.io.filefilter.IOFileFilter; |
71 | 70 | import org.apache.commons.io.filefilter.NameFileFilter; |
72 | 71 | import org.apache.commons.io.filefilter.WildcardFileFilter; |
@@ -1622,19 +1621,21 @@ public void testIsDirectory() throws IOException { |
1622 | 1621 | assertTrue(FileUtils.isDirectory(tempDirFile)); |
1623 | 1622 | assertFalse(FileUtils.isDirectory(testFile1)); |
1624 | 1623 |
|
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); |
1630 | 1628 | assertFalse(FileUtils.isDirectory(tempDirAsFile)); |
1631 | 1629 | } |
1632 | 1630 |
|
1633 | 1631 | @Test |
1634 | 1632 | 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 { |
1637 | 1636 | Assertions.assertTrue(FileUtils.isEmptyDirectory(tempDirAsFile)); |
| 1637 | + } finally { |
| 1638 | + Files.delete(tempDir); |
1638 | 1639 | } |
1639 | 1640 | Assertions.assertFalse(FileUtils.isEmptyDirectory(PathUtilsIsEmptyTest.DIR_SIZE_1.toFile())); |
1640 | 1641 | } |
|
0 commit comments