1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
/*
* Copyright (c) 2020, 2024, 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.
*/
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import jdk.jpackage.internal.AppImageFile;
import jdk.jpackage.test.HelloApp;
import jdk.jpackage.test.JavaAppDesc;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.Annotations.Parameter;
import jdk.jpackage.test.Annotations.Parameters;
import jdk.jpackage.test.Executor;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.JavaTool;
import jdk.jpackage.test.PackageType;
import jdk.jpackage.test.TKit;
import org.w3c.dom.Document;
/*
* @test
* @summary jpackage for app's module linked in external runtime
* @library /test/jdk/tools/jpackage/helpers
* @build jdk.jpackage.test.*
* @compile ModulePathTest3.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=ModulePathTest3
*/
public final class ModulePathTest3 {
public ModulePathTest3(String jlinkOutputSubdir, String runtimeSubdir) {
this.jlinkOutputSubdir = Path.of(jlinkOutputSubdir);
this.runtimeSubdir = Path.of(runtimeSubdir);
}
/**
* Test case for JDK-8248254.
* App's module in runtime directory.
*/
@Test
public void test8248254() throws XPathExpressionException, IOException {
testIt("me.mymodule/me.mymodule.Main");
}
private void testIt(String mainAppDesc) throws XPathExpressionException,
IOException {
final JavaAppDesc appDesc = JavaAppDesc.parse(mainAppDesc);
final Path moduleOutputDir = TKit.createTempDirectory("modules");
HelloApp.createBundle(appDesc, moduleOutputDir);
final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
final Path jlinkOutputDir = workDir.resolve(jlinkOutputSubdir);
Files.createDirectories(jlinkOutputDir.getParent());
new Executor()
.setToolProvider(JavaTool.JLINK)
.dumpOutput()
.addArguments(
"--add-modules", appDesc.moduleName(),
"--output", jlinkOutputDir.toString(),
"--module-path", moduleOutputDir.resolve(appDesc.jarFileName()).toString(),
"--strip-debug",
"--no-header-files",
"--no-man-pages",
"--strip-native-commands")
.execute();
JPackageCommand cmd = new JPackageCommand()
.setDefaultAppName()
.setPackageType(PackageType.IMAGE)
.setDefaultInputOutput()
.removeArgumentWithValue("--input")
.addArguments("--module", appDesc.moduleName() + "/" + appDesc.className())
.setArgumentValue("--runtime-image", workDir.resolve(runtimeSubdir));
cmd.executeAndAssertHelloAppImageCreated();
if (appDesc.moduleVersion() != null) {
Document xml = AppImageFile.readXml(cmd.outputBundle());
String actualVersion = XPathFactory.newInstance().newXPath().evaluate(
"/jpackage-state/app-version/text()", xml,
XPathConstants.STRING).toString();
TKit.assertEquals(appDesc.moduleVersion(), actualVersion,
"Check application version");
}
}
@Parameters
public static Collection data() {
final List<String[]> paths = new ArrayList<>();
paths.add(new String[] { "", "" });
if (TKit.isOSX()) {
// On OSX jpackage should accept both runtime root and runtime home
// directories.
paths.add(new String[] { "Contents/Home", "" });
}
List<Object[]> data = new ArrayList<>();
for (var pathCfg : paths) {
data.add(new Object[] { pathCfg[0], pathCfg[1] });
}
return data;
}
private final Path jlinkOutputSubdir;
private final Path runtimeSubdir;
}
|
