equal
deleted
inserted
replaced
24 import java.io.File; |
24 import java.io.File; |
25 import java.nio.file.Files; |
25 import java.nio.file.Files; |
26 |
26 |
27 /* |
27 /* |
28 * @test |
28 * @test |
29 * @summary jpackage create image to verify --force |
29 * @summary jpackage create image to verify --overwrite |
30 * @library ../helpers |
30 * @library ../helpers |
31 * @build JPackageHelper |
31 * @build JPackageHelper |
32 * @build JPackagePath |
32 * @build JPackagePath |
33 * @modules jdk.jpackage |
33 * @modules jdk.jpackage |
34 * @run main/othervm -Xmx512m JPackageCreateImageForceTest |
34 * @run main/othervm -Xmx512m JPackageCreateImageForceTest |
41 private static final String[] CMD = { |
41 private static final String[] CMD = { |
42 "create-image", |
42 "create-image", |
43 "--input", "input", |
43 "--input", "input", |
44 "--name", "test", |
44 "--name", "test", |
45 "--main-jar", "hello.jar", |
45 "--main-jar", "hello.jar", |
46 "--class", "Hello", |
46 "--main-class", "Hello", |
47 "--files", "hello.jar", |
47 "--files", "hello.jar", |
48 "--output", "TBD"}; |
48 "--output", "TBD"}; |
49 |
49 |
50 private static final String[] CMD_FORCE = { |
50 private static final String[] CMD_FORCE = { |
51 "create-image", |
51 "create-image", |
52 "--input", "input", |
52 "--input", "input", |
53 "--name", "test", |
53 "--name", "test", |
54 "--main-jar", "hello.jar", |
54 "--main-jar", "hello.jar", |
55 "--class", "Hello", |
55 "--main-class", "Hello", |
56 "--force", |
56 "--overwrite", |
57 "--files", "hello.jar", |
57 "--files", "hello.jar", |
58 "--output", "TBD"}; |
58 "--output", "TBD"}; |
59 |
59 |
60 private static void validateResult(String[] result) throws Exception { |
60 private static void validateResult(String[] result) throws Exception { |
61 if (result.length != 2) { |
61 if (result.length != 2) { |
73 } |
73 } |
74 |
74 |
75 private static void validate(String result) throws Exception { |
75 private static void validate(String result) throws Exception { |
76 if (!result.contains("java.io.IOException") && |
76 if (!result.contains("java.io.IOException") && |
77 !result.contains("already exists") && |
77 !result.contains("already exists") && |
78 !result.contains("--force is not specified")) { |
78 !result.contains("--overwrite is not specified")) { |
79 System.err.println(result); |
79 System.err.println(result); |
80 throw new AssertionError("Unexpected error message"); |
80 throw new AssertionError("Unexpected error message"); |
81 } |
81 } |
82 } |
82 } |
83 |
83 |