Merge pull request junit-team#428 from shs96c/master

Allow users to define the parent directory used by the TemporaryFolder
piaofengsong · May 22, 2012 · c77cf4d · c77cf4d
2 parents 1e391af + ecf0ea1
commit c77cf4d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/org/junit/rules/TemporaryFolder.java b/src/main/java/org/junit/rules/TemporaryFolder.java
@@ -25,8 +25,17 @@
  * </pre>
  */
 public class TemporaryFolder extends ExternalResource {
+        private final File parentFolder;
 	private File folder;
 
+        public TemporaryFolder() {
+                this(null);
+        }
+
+        public TemporaryFolder(File parentFolder) {
+                this.parentFolder = parentFolder;
+        }
+
 	@Override
 	protected void before() throws Throwable {
 		create();
@@ -42,7 +51,7 @@ protected void after() {
 	 * for testing purposes only. Do not use.
 	 */
 	public void create() throws IOException {
-		folder= createTemporaryFolderIn(null);
+	        folder = createTemporaryFolderIn(parentFolder);
 	}
 
 	/**

diff --git a/src/test/java/org/junit/tests/experimental/rules/TemporaryFolderUsageTest.java b/src/test/java/org/junit/tests/experimental/rules/TemporaryFolderUsageTest.java
@@ -119,7 +119,24 @@ public void newNestedFoldersCreatedUnderRootFolder() throws IOException {
 				.getParentFile());
 	}
 
-	private void assertFileDoesNotExist(File file) {
+        @Test
+        public void canSetTheBaseFileForATemporaryFolder() throws IOException {
+                File tempDir = createTemporaryFolder();
+
+                TemporaryFolder folder = new TemporaryFolder(tempDir);
+                folder.create();
+
+                assertThat(tempDir, is(folder.getRoot().getParentFile()));
+        }
+
+        private File createTemporaryFolder() throws IOException {
+                File tempDir = File.createTempFile("junit", "tempFolder");
+                assertTrue("Unable to delete temporary file", tempDir.delete());
+                assertTrue("Unable to create temp directory", tempDir.mkdir());
+                return tempDir;
+        }
+
+        private void assertFileDoesNotExist(File file) {
 		checkFileExists("exists", file, false);
 	}