Skip to content

Commit 4b47b44

Browse files
committed
Passes on macOS, fails on Linux and Windows with AccessDeniedException.
- Better comment - Bullet-proof old test for re-runs
1 parent f6b8c06 commit 4b47b44

1 file changed

Lines changed: 7 additions & 17 deletions

File tree

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

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,28 +1731,18 @@ public void testForceDeleteReadOnlyFile() throws Exception {
17311731
}
17321732

17331733
@Test
1734-
public void testForceDeleteUnwritableDirectory() throws Exception {
1735-
try (TempDirectory destDir = TempDirectory.create("dir-");
1736-
TempFile destination = TempFile.create(destDir, "test-", ".txt")) {
1737-
// sanity check structure
1738-
assertTrue(Files.isDirectory(destDir.get()));
1739-
assertEquals(destDir.get(), destination.get().getParent());
1740-
// sanity check attributes
1741-
final File file = destDir.toFile();
1734+
public void testForceDeleteUnwritableFile() throws Exception {
1735+
try (TempFile destination = TempFile.create("test-", ".txt")) {
1736+
final File file = destination.toFile();
17421737
assertTrue(file.canWrite());
17431738
assertTrue(file.setWritable(false));
17441739
assertFalse(file.canWrite());
17451740
assertTrue(file.canRead());
1746-
// sanity check that File.delete() cannot delete non-empty directories.
1747-
assertFalse(file.delete());
1741+
// sanity check that File.delete() deletes unwritable files.
1742+
assertTrue(file.delete());
17481743
}
1749-
try (TempDirectory destDir = TempDirectory.create("dir-");
1750-
TempFile destination = TempFile.create(destDir, "test-", ".txt")) {
1751-
// sanity check structure
1752-
assertTrue(Files.isDirectory(destDir.get()));
1753-
assertEquals(destDir.get(), destination.get().getParent());
1754-
// sanity check attributes
1755-
final File file = destDir.toFile();
1744+
try (TempFile destination = TempFile.create("test-", ".txt")) {
1745+
final File file = destination.toFile();
17561746
// real test
17571747
assertTrue(file.canWrite());
17581748
assertTrue(file.setWritable(false));

0 commit comments

Comments
 (0)