Merge pull request #72 from scijava/windows-temp-dir

Work around Windows problems with temporary directories

Author: dscho

src/main/java/org/scijava/test/TestUtils.java

@@ -120,8 +120,15 @@ public static File createTemporaryDirectory(final String prefix,
 			baseDirectory = new File(path);
 		}
 
-		final File file = new File(baseDirectory, prefix + suffix);
-		if (file.isDirectory()) FileUtils.deleteRecursively(file);
+		File file = new File(baseDirectory, prefix + suffix);
+		if (file.isDirectory()) {
+			if (!FileUtils.deleteRecursively(file)) {
+				// Oh, how I *love* Windows. Love, love, love.
+				for (int i = -1; file.isDirectory(); i--) {
+					file = new File(baseDirectory, prefix + i + suffix);
+				}
+			}
+		}
 		else if (file.exists() && !file.delete()) {
 			throw new IOException("Could not remove " + file);
 		}

src/test/java/org/scijava/util/TestUtilsTest.java

@@ -34,7 +34,9 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.junit.Test;
 import org.scijava.test.TestUtils;
@@ -63,4 +65,19 @@ public void testCreateTemporaryDirectory() throws IOException {
 		assertTrue(!tmp3.getAbsolutePath().equals(tmp4.getAbsolutePath()));
 
 	}
+
+	@Test
+	public void sameDirectoryTwice() throws IOException {
+		final FileOutputStream[] out = new FileOutputStream[2];
+		for (int i = 0; i < 2; i++) {
+			final File tmp = TestUtils.createTemporaryDirectory("same-");
+			assertTrue(tmp != null);
+			final String[] list = tmp.list();
+			assertTrue("Not null: " + Arrays.toString(list), list == null || list.length == 0);
+			out[i] = new FileOutputStream(new File(tmp, "hello" + i + ".txt"));
+		}
+		for (final FileOutputStream stream : out) {
+			if (stream != null) stream.close();
+		}
+	}
 }