Repository: incubator-taverna-language Updated Branches: refs/heads/master 97052ae28 -> 8b09ece25
TAVERNA-1043: Don't expect folder/ bug in JDK9 Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/273939be Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/273939be Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/273939be Branch: refs/heads/master Commit: 273939be45edbca591c9154f4c3f88586e37c003 Parents: 97052ae Author: Stian Soiland-Reyes <[email protected]> Authored: Wed Apr 18 14:36:28 2018 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Wed Apr 18 14:37:59 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/taverna/robundle/fs/TestZipFS.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/273939be/taverna-robundle/src/test/java/org/apache/taverna/robundle/fs/TestZipFS.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/fs/TestZipFS.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/fs/TestZipFS.java index 95939a8..fe4cab4 100644 --- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/fs/TestZipFS.java +++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/fs/TestZipFS.java @@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class TestZipFS { @@ -95,7 +96,10 @@ public class TestZipFS { /** * Verifies http://stackoverflow.com/questions/16588321/ as both ZIP format * and Java 7 ZIPFS allows a folder and file to have the same name. - * + * <p> + * This JDK bug is fixed in JDK9, which throws + * FileAlreadyExistsException as expected + * (this test returns early if that is the case). */ @Test public void directoryOrFile() throws Exception { @@ -113,8 +117,10 @@ public class TestZipFS { System.out.println(folder + " " + folderCreated); // Disable for now, just to see where this leads - // fail("Should have thrown FileAlreadyExistsException"); + //fail("Should have thrown FileAlreadyExistsException"); } catch (FileAlreadyExistsException ex) { + // Bug was fixed in JDK9, no need to test this anymore + return; } // For some reason the second createDirectory() fails correctly
