author | herrick |
Fri, 08 Nov 2019 14:53:03 -0500 | |
branch | JDK-8200758-branch |
changeset 58994 | b09ba68c6a19 |
parent 58993 | b5e1baa9d2c3 |
permissions | -rw-r--r-- |
57307 | 1 |
/* |
2 |
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. |
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
58346
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
24 |
import java.util.ArrayList; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
25 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
26 |
/* |
57307 | 27 |
* @test |
28 |
* @summary jpackage create image with additional launcher test |
|
29 |
* @library ../helpers |
|
30 |
* @build JPackageHelper |
|
31 |
* @build JPackagePath |
|
57446 | 32 |
* @build AddLauncherBase |
58994
b09ba68c6a19
8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents:
58993
diff
changeset
|
33 |
* @modules jdk.incubator.jpackage |
57446 | 34 |
* @run main/othervm -Xmx512m AddLauncherTest |
57307 | 35 |
*/ |
57446 | 36 |
public class AddLauncherTest { |
57307 | 37 |
private static final String OUTPUT = "output"; |
38 |
private static final String [] CMD = { |
|
58993
b5e1baa9d2c3
8233592: change --package-type option name to --type and allow -t short form
herrick
parents:
58346
diff
changeset
|
39 |
"--type", "app-image", |
57307 | 40 |
"--input", "input", |
58147
45a9084fe981
8230521: rename --output/-o option and add default value (".")
herrick
parents:
58114
diff
changeset
|
41 |
"--dest", OUTPUT, |
57307 | 42 |
"--name", "test", |
43 |
"--main-jar", "hello.jar", |
|
44 |
"--main-class", "Hello", |
|
57330
a30edd277572
8222733: Modify jpackage option --add-launcher synta
herrick
parents:
57307
diff
changeset
|
45 |
"--add-launcher", "test2=sl.properties"}; |
57307 | 46 |
|
58346
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
47 |
private final static String OPT1 = "-Dparam1=xxx"; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
48 |
private final static String OPT2 = "-Dparam2=yyy"; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
49 |
private final static String OPT3 = "-Dparam3=zzz"; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
50 |
private final static String ARG1 = "original-argument"; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
51 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
52 |
private static final String [] CMD1 = { |
58993
b5e1baa9d2c3
8233592: change --package-type option name to --type and allow -t short form
herrick
parents:
58346
diff
changeset
|
53 |
"--type", "app-image", |
58346
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
54 |
"--input", "input", |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
55 |
"--dest", OUTPUT, |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
56 |
"--name", "test", |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
57 |
"--main-jar", "hello.jar", |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
58 |
"--main-class", "Hello", |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
59 |
"--java-options", OPT1, |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
60 |
"--java-options", OPT2, |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
61 |
"--java-options", OPT3, |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
62 |
"--arguments", ARG1, |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
63 |
"--add-launcher", "test4=sl.properties"}; |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
64 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
65 |
|
57307 | 66 |
public static void main(String[] args) throws Exception { |
67 |
JPackageHelper.createHelloImageJar(); |
|
57446 | 68 |
AddLauncherBase.createSLProperties(); |
69 |
AddLauncherBase.testCreateAppImage(CMD); |
|
58346
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
70 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
71 |
ArrayList <String> argList = new ArrayList <String> (); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
72 |
argList.add(ARG1); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
73 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
74 |
ArrayList <String> optList = new ArrayList <String> (); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
75 |
optList.add(OPT1); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
76 |
optList.add(OPT2); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
77 |
optList.add(OPT3); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
78 |
|
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
79 |
JPackageHelper.deleteOutputFolder(OUTPUT); |
d5a3cd78e560
8230927: Wrong arguments set for additional launchers
herrick
parents:
58147
diff
changeset
|
80 |
AddLauncherBase.testCreateAppImage(CMD1, argList, optList); |
57307 | 81 |
} |
82 |
||
83 |
} |