author | herrick |
Fri, 08 Nov 2019 14:53:03 -0500 | |
branch | JDK-8200758-branch |
changeset 58994 | b09ba68c6a19 |
parent 58993 | b5e1baa9d2c3 |
permissions | -rw-r--r-- |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
1 |
/* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
2 |
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
4 |
* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
8 |
* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
13 |
* accompanied this code). |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
14 |
* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
18 |
* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
21 |
* questions. |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
22 |
*/ |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
23 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
24 |
import java.io.File; |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
25 |
import java.nio.file.Files; |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
26 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
27 |
/* |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
28 |
* @test |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
29 |
* @summary jpackage create image with --java-options test |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
30 |
* @library ../helpers |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
31 |
* @build JPackageHelper |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
32 |
* @build JPackagePath |
57446 | 33 |
* @build JavaOptionsBase |
58994
b09ba68c6a19
8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents:
58993
diff
changeset
|
34 |
* @modules jdk.incubator.jpackage |
57446 | 35 |
* @run main/othervm -Xmx512m JavaOptionsEqualsTest |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
36 |
*/ |
57446 | 37 |
public class JavaOptionsEqualsTest { |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
38 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
39 |
private static final String app = JPackagePath.getApp(); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
40 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
41 |
private static final String OUTPUT = "output"; |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
42 |
|
57455
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
43 |
private static final String WARNING_1 |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
44 |
= "WARNING: Unknown module: me.mymodule.foo"; |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
45 |
|
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
46 |
private static final String WARNING_2 |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
47 |
= "WARNING: Unknown module: other.mod.bar"; |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
48 |
|
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
49 |
private static final String[] CMD = { |
58993
b5e1baa9d2c3
8233592: change --package-type option name to --type and allow -t short form
herrick
parents:
58147
diff
changeset
|
50 |
"--type", "app-image", |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
51 |
"--input", "input", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
52 |
"--description", "the two options below should cause two app execution " |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
53 |
+ "Warnings with two lines output saying: " |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
54 |
+ "WARNING: Unknown module: <module-name>", |
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58114
diff
changeset
|
55 |
"--dest", OUTPUT, |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
56 |
"--name", "test", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
57 |
"--main-jar", "hello.jar", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
58 |
"--main-class", "Hello", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
59 |
"--java-options", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
60 |
"--add-exports=java.base/sun.util=me.mymodule.foo,ALL-UNNAMED", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
61 |
"--java-options", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
62 |
"--add-exports=java.base/sun.security.util=other.mod.bar,ALL-UNNAMED", |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
63 |
}; |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
64 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
65 |
private static void validate() throws Exception { |
57445
405ddd80496e
8226904: current working directory wrong running jpackage app
herrick
parents:
57419
diff
changeset
|
66 |
File outfile = new File("app.out"); |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
67 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
68 |
int retVal = JPackageHelper.execute(outfile, app); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
69 |
if (retVal != 0) { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
70 |
throw new AssertionError( |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
71 |
"Test application exited with error: " + retVal); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
72 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
73 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
74 |
if (!outfile.exists()) { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
75 |
throw new AssertionError( |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
76 |
"outfile: " + outfile + " was not created"); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
77 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
78 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
79 |
String output = Files.readString(outfile.toPath()); |
57455
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
80 |
System.out.println("App output:"); |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
81 |
System.out.print(output); |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
82 |
|
57419
44c2481650ce
8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents:
57414
diff
changeset
|
83 |
String[] result = JPackageHelper.splitAndFilter(output); |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
84 |
if (result.length != 4) { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
85 |
throw new AssertionError( |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
86 |
"Unexpected number of lines: " + result.length |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
87 |
+ " - output: " + output); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
88 |
} |
57419
44c2481650ce
8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents:
57414
diff
changeset
|
89 |
|
57455
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
90 |
String nextWarning = WARNING_1; |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
91 |
if (!result[0].startsWith(nextWarning)){ |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
92 |
nextWarning = WARNING_2; |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
93 |
if (!result[0].startsWith(WARNING_2)){ |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
94 |
throw new AssertionError("Unexpected result[0]: " + result[0]); |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
95 |
} else { |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
96 |
nextWarning = WARNING_1; |
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
97 |
} |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
98 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
99 |
|
57455
f1290ca0fee6
8227058: Regressions related to no longer setting user.dir
herrick
parents:
57446
diff
changeset
|
100 |
if (!result[1].startsWith(nextWarning)) { |
57395
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
101 |
throw new AssertionError("Unexpected result[1]: " + result[1]); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
102 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
103 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
104 |
if (!result[2].trim().endsWith("jpackage test application")) { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
105 |
throw new AssertionError("Unexpected result[2]: " + result[2]); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
106 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
107 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
108 |
if (!result[3].trim().equals("args.length: 0")) { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
109 |
throw new AssertionError("Unexpected result[3]: " + result[3]); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
110 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
111 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
112 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
113 |
public static void main(String[] args) throws Exception { |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
114 |
JPackageHelper.createHelloImageJar(); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
115 |
String output = JPackageHelper.executeCLI(true, CMD); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
116 |
validate(); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
117 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
118 |
JPackageHelper.deleteOutputFolder(OUTPUT); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
119 |
output = JPackageHelper.executeToolProvider(true, CMD); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
120 |
validate(); |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
121 |
} |
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
122 |
|
521c02b9eed0
8224130: create additional automated tests for create-app-image
herrick
parents:
diff
changeset
|
123 |
} |