Update TemporaryFolder.newFolder(String) to support passing in paths #1402

kcooney · 2017-01-01T23:38:42Z

that include path separator characters. The overload of newFolder() that
supports passing in multiple strings still does not allow path separators.

marcphilipp · 2017-01-02T09:36:05Z

src/main/java/org/junit/rules/TemporaryFolder.java

+        if (folder.startsWith(File.separator)) {
+            throw new IOException("Folder name cannot start with a file separator");
+        }
+        return newFolder(folder.split(FILE_SEPARATOR_REGEX));


Instead of the regex, can we use new File(folder) and call getParent() until it returns null? This way a test could use newFolder("foo/bar") and be able to run on Windows and Unix.

I didn't realize that File supported / as a path separator for Windows.

Instead of your solution, how about I rewite this method to use mkdirs()?

How would you report already existing intermediate folders (see newFolder(String[])) that way?

newFolder(String...) does not report already existing intermediate directories

From the code it looks like it does… 😯

Never mind... 🙈

Changed to use mkdirs() and added a test for paths that contain a forward slash and for paths that contain the file separator.

marcphilipp · 2017-01-02T09:36:37Z

src/test/java/org/junit/rules/TemporaryFolderUsageTest.java

        tempFolder.newFolder("temp1/temp2");
+        File temp1 = new File(tempFolder.getRoot(), "temp1");
+        assertFileIsDirectory(temp1);
+        assertFileIsDirectory(new File(temp1, "temp2"));


This test won't run on Windows, right?

kcooney · 2017-01-02T19:54:52Z

BTW, the behavior changes in 4.12 broke some of our tests. When I am back in the office tomorrow I will verify that this change resolves the problems.

kcooney · 2017-01-02T22:41:44Z

PTAL. Thanks, @marcphilipp !

marcphilipp

Thanks!

…ashes. In JUnit 4.11, newFolder(String) was changed to no longer support paths with a file separator. This has been fixed. The overload of newFolder() that supports passing in multiple strings still does not allow strings containing file separators.

kcooney · 2017-01-03T18:47:14Z

I verified that this is a regression from the behavior in JUnit 4.11 and changed the commit comment accordingly.

I also removed the use of Pattern (I forgot to remove that when I changed the code to use mkdirs).

Any objections to merging this?

Note I'm also considering changing newFolder(String...) to support paths with slashes, since the inconsistency is weird and supporting slashes would be consistent with java.nio.file.Paths.get(String, String...)

marcphilipp · 2017-01-03T19:34:01Z

src/main/java/org/junit/rules/TemporaryFolder.java

@@ -167,16 +167,27 @@ public File newFile() throws IOException {
    }

    /**
-     * Returns a new fresh folder with the given name under the temporary
+     * Returns a new fresh folder with the given path under the temporary
     * folder.
     */
    public File newFolder(String folder) throws IOException {


We should probably rename folder to path, right?

marcphilipp · 2017-01-03T19:35:08Z

src/main/java/org/junit/rules/TemporaryFolder.java

+        File file = new File(getRoot(), folder);
+        if (!file.mkdirs()) {
+            throw new IOException(
+                    "a folder with the name \'" + folder + "\' already exists");


Is this error message really accurate? I know it's the same as in the other method but I'm sure there are other reasons why a folder could not be created.

marcphilipp · 2017-01-03T19:44:02Z

I verified that this is a regression from the behavior in JUnit 4.11 and changed the commit comment accordingly.

I also removed the use of Pattern (I forgot to remove that when I changed the code to use mkdirs).

👍

Any objections to merging this?

None at all.

Note I'm also considering changing newFolder(String...) to support paths with slashes, since the inconsistency is weird and supporting slashes would be consistent with java.nio.file.Paths.get(String, String...)

I think supporting slashes is great! I've tried to find out why it was implemented that way. From #946 it seems 4.10 used only mkdir, 4.11 introduced newFolder(String...) but kept using mkdir. Supporting slashes should be okay because it would only be more tolerant than before and no existing call should break.

marcphilipp · 2017-01-04T17:11:57Z

Please add a description of this improvement to the draft of the release notes.

kcooney · 2017-01-06T17:11:40Z

@marcphilipp I updated the release notes.

Sorry, I somehow didn't see some of your comments. I'll address them soon.

marcphilipp · 2017-01-06T17:13:54Z

Thanks! And no worries about those comments. 🙂

…ashes. (junit-team#1402) In JUnit 4.11, newFolder(String) was changed to no longer support paths with a file separator. This has been fixed. The overload of newFolder() that supports passing in multiple strings still does not allow strings containing file separators.

kcooney added the 4.13 label Jan 2, 2017

marcphilipp requested changes Jan 2, 2017

View reviewed changes

kcooney force-pushed the TemporaryFolder-support-path-separator branch from 370cae0 to b94b56e Compare January 2, 2017 22:39

marcphilipp approved these changes Jan 3, 2017

View reviewed changes

kcooney force-pushed the TemporaryFolder-support-path-separator branch from b94b56e to c47bb64 Compare January 3, 2017 18:42

marcphilipp reviewed Jan 3, 2017

View reviewed changes

kcooney merged commit c85c614 into junit-team:master Jan 3, 2017

kcooney modified the milestone: 4.13 Aug 6, 2017

kcooney removed the 4.13 label Aug 6, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update TemporaryFolder.newFolder(String) to support passing in paths #1402

Update TemporaryFolder.newFolder(String) to support passing in paths #1402

kcooney commented Jan 1, 2017

marcphilipp Jan 2, 2017

kcooney Jan 2, 2017

marcphilipp Jan 2, 2017

kcooney Jan 2, 2017

marcphilipp Jan 2, 2017

marcphilipp Jan 2, 2017 •

edited

Loading

kcooney Jan 2, 2017

marcphilipp Jan 2, 2017

kcooney Jan 2, 2017

kcooney commented Jan 2, 2017

kcooney commented Jan 2, 2017

marcphilipp left a comment

kcooney commented Jan 3, 2017 •

edited

Loading

marcphilipp Jan 3, 2017

marcphilipp Jan 3, 2017

marcphilipp commented Jan 3, 2017

marcphilipp commented Jan 4, 2017

kcooney commented Jan 6, 2017

marcphilipp commented Jan 6, 2017

Update TemporaryFolder.newFolder(String) to support passing in paths #1402

Update TemporaryFolder.newFolder(String) to support passing in paths #1402

Conversation

kcooney commented Jan 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcphilipp Jan 2, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kcooney commented Jan 2, 2017

kcooney commented Jan 2, 2017

marcphilipp left a comment

Choose a reason for hiding this comment

kcooney commented Jan 3, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcphilipp commented Jan 3, 2017

marcphilipp commented Jan 4, 2017

kcooney commented Jan 6, 2017

marcphilipp commented Jan 6, 2017

marcphilipp Jan 2, 2017 •

edited

Loading

kcooney commented Jan 3, 2017 •

edited

Loading