Delete files in read-only dirs by making them writable (#2266)

Fixes #2171.

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0-M1.adoc

@@ -45,6 +45,7 @@ on GitHub.
 
 ==== Bug Fixes
 
+* `@TempDir` is now able to clean up files in read-only directories.
 * The Jupiter engine now ignores `MethodSelectors` for methods in non-Jupiter test
   classes instead of failing for missing methods in such cases.
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java

@@ -219,6 +219,7 @@ private FileVisitResult deleteAndContinue(Path path) {
 
 				private void makeWritableAndTryToDeleteAgain(Path path, IOException exception) {
 					try {
+						tryToMakeParentDirsWritable(path);
 						makeWritable(path);
 						Files.delete(path);
 					}
@@ -228,6 +229,18 @@ private void makeWritableAndTryToDeleteAgain(Path path, IOException exception) {
 					}
 				}
 
+				private void tryToMakeParentDirsWritable(Path path) {
+					Path relativePath = dir.relativize(path);
+					Path parent = dir;
+					for (int i = 0; i < relativePath.getNameCount(); i++) {
+						boolean writable = parent.toFile().setWritable(true);
+						if (!writable) {
+							break;
+						}
+						parent = parent.resolve(relativePath.getName(i));
+					}
+				}
+
 				private void makeWritable(Path path) {
 					boolean writable = path.toFile().setWritable(true);
 					if (!writable) {

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java

@@ -45,6 +45,8 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
@@ -84,11 +86,27 @@ void tempDirectoryDoesNotPreventUserFromDeletingTempDir() {
 
 	@Test
 	@DisplayName("is capable of removal of a read-only file")
-	void nonWritableFileDoesNotCauseFailureTestCase() {
+	void nonWritableFileDoesNotCauseFailure() {
 		executeTestsForClass(NonWritableFileDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
+	@Test
+	@DisabledOnOs(OS.WINDOWS)
+	@DisplayName("is capable of removal of a read-only file in a read-only dir")
+	void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
+		executeTestsForClass(ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisabledOnOs(OS.WINDOWS)
+	@DisplayName("is capable of removal of a read-only file in a dir in a read-only dir")
+	void readOnlyFileInNestedReadOnlyDirDoesNotCauseFailure() {
+		executeTestsForClass(ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
 	@Test
 	@DisplayName("can be used via instance field inside nested test classes")
 	void canBeUsedViaInstanceFieldInsideNestedTestClasses() {
@@ -780,6 +798,34 @@ void createReadonlyFile(@TempDir Path tempDir) throws IOException {
 
 	}
 
+	// https://github.com/junit-team/junit5/issues/2171
+	static class ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase {
+
+		@Test
+		void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
+			File file = tempDir.toPath().resolve("file").toFile();
+			assumeTrue(file.createNewFile());
+			assumeTrue(tempDir.setReadOnly());
+			assumeTrue(file.setReadOnly());
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2171
+	static class ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase {
+
+		@Test
+		void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
+			File file = tempDir.toPath().resolve("dir").resolve("file").toFile();
+			assumeTrue(file.getParentFile().mkdirs());
+			assumeTrue(file.createNewFile());
+			assumeTrue(tempDir.setReadOnly());
+			assumeTrue(file.getParentFile().setReadOnly());
+			assumeTrue(file.setReadOnly());
+		}
+
+	}
+
 	// https://github.com/junit-team/junit5/issues/2079
 	static class TempDirUsageInsideNestedClassesTestCase {