-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8281104: jar --create should create missing parent directories
Reviewed-by: lancea
- Loading branch information
Showing
3 changed files
with
128 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /** | ||
| * @test | ||
| * @bug 8281104 | ||
| * @modules jdk.jartool | ||
| * @summary jar --create --file a/b/test.jar should create directories a/b | ||
| */ | ||
|
|
||
| import java.io.PrintWriter; | ||
| import java.io.StringWriter; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.spi.ToolProvider; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class CreateMissingParentDirectories { | ||
| private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar") | ||
| .orElseThrow(() -> | ||
| new RuntimeException("jar tool not found") | ||
| ); | ||
|
|
||
| /** | ||
| * Remove dirs & files needed for test. | ||
| */ | ||
| private static void cleanup(Path dir) { | ||
| try { | ||
| if (Files.isDirectory(dir)) { | ||
| try (Stream<Path> s = Files.list(dir)) { | ||
| s.forEach(p -> cleanup(p)); | ||
| } | ||
| } | ||
| Files.delete(dir); | ||
| } catch (Exception x) { | ||
| fail(x.toString()); | ||
| } | ||
| } | ||
|
|
||
| public static void realMain(String[] args) throws Throwable { | ||
| Path topDir = Files.createTempDirectory("delete"); | ||
| try { | ||
| Path entry = Files.writeString(topDir.resolve("test.txt"), "Some text..."); | ||
|
|
||
| doHappyPathTest(topDir.resolve("test.jar"), entry); | ||
| doHappyPathTest(topDir.resolve("a/test.jar"), entry); | ||
| doHappyPathTest(topDir.resolve("a/b/test.jar"), entry); | ||
|
|
||
| doFailingTest(topDir.toString() + "/a/*/test.jar", entry); | ||
| Path blocker = Files.writeString(topDir.resolve("blocker.txt"), "Blocked!"); | ||
| doFailingTest(topDir.resolve("blocker.txt/test.jar").toString(), entry); | ||
| } finally { | ||
| cleanup(topDir); | ||
| } | ||
| } | ||
|
|
||
| private static void doHappyPathTest(Path jar, Path entry) throws Throwable { | ||
| String[] jarArgs = new String[]{"cf", jar.toString(), entry.toString()}; | ||
| if (JAR_TOOL.run(System.out, System.err, jarArgs) != 0) { | ||
| fail("Could not create jar file: " + jar); | ||
| return; | ||
| } | ||
| pass(); | ||
| } | ||
|
|
||
| private static void doFailingTest(String jar, Path entry) throws Throwable { | ||
| StringWriter out = new StringWriter(); | ||
| StringWriter err = new StringWriter(); | ||
| String[] jarArgs = new String[]{"cf", jar, entry.toString()}; | ||
|
|
||
| if (JAR_TOOL.run(new PrintWriter(out, true), new PrintWriter(err, true), jarArgs) == 0) { | ||
| fail("Should have failed creating jar file: " + jar); | ||
| return; | ||
| } | ||
| // non-zero exit code expected, check error message contains jar file's name | ||
| check(err.toString().contains(jar)); | ||
| pass(); | ||
| } | ||
|
|
||
| //--------------------- Infrastructure --------------------------- | ||
| static volatile int passed = 0, failed = 0; | ||
| static void pass() {passed++;} | ||
| static void fail() {failed++; Thread.dumpStack();} | ||
| static void fail(String msg) {System.out.println(msg); fail();} | ||
| static void unexpected(Throwable t) {failed++; t.printStackTrace();} | ||
| static void check(boolean cond) {if (cond) pass(); else fail();} | ||
| static void equal(Object x, Object y) { | ||
| if (x == null ? y == null : x.equals(y)) pass(); | ||
| else fail(x + " not equal to " + y);} | ||
| public static void main(String[] args) throws Throwable { | ||
| try {realMain(args);} catch (Throwable t) {unexpected(t);} | ||
| System.out.println("\nPassed = " + passed + " failed = " + failed); | ||
| if (failed > 0) throw new AssertionError("Some tests failed");} | ||
| } |
92f4f40There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues