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
139
140
141
142
143
144
145
|
/*
* Copyright (c) 2019, 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.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.jpackage.test.TKit;
import jdk.jpackage.test.JavaAppDesc;
import jdk.jpackage.test.HelloApp;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.PackageType;
import jdk.jpackage.test.Annotations.Parameter;
import jdk.jpackage.test.Annotations.Parameters;
import jdk.jpackage.test.Annotations.Test;
/*
* @test
* @summary jpackage with --module-path testing
* @library /test/jdk/tools/jpackage/helpers
* @build jdk.jpackage.test.*
* @compile ModulePathTest.java
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
* --jpt-run=ModulePathTest
*/
public final class ModulePathTest {
@Parameters
public static Collection data() {
return List.of(new String[][]{
{GOOD_PATH, EMPTY_DIR, NON_EXISTING_DIR},
{EMPTY_DIR, NON_EXISTING_DIR, GOOD_PATH},
{GOOD_PATH + "/a/b/c/d", GOOD_PATH},
{String.join(File.pathSeparator, EMPTY_DIR, NON_EXISTING_DIR,
GOOD_PATH)},
{String.join(File.pathSeparator, EMPTY_DIR, NON_EXISTING_DIR),
String.join(File.pathSeparator, EMPTY_DIR, NON_EXISTING_DIR,
GOOD_PATH)},
{},
{EMPTY_DIR}
});
}
public ModulePathTest(String... modulePathArgs) {
this.modulePathArgs = List.of(modulePathArgs);
}
@Test
@Parameter("benvenuto.jar:com.jar.foo/com.jar.foo.Hello")
@Parameter("benvenuto.jmod:com.jmod.foo/com.jmod.foo.JModHello")
public void test(String javaAppDesc) throws IOException {
JavaAppDesc appDesc = JavaAppDesc.parse(javaAppDesc);
Path goodModulePath = TKit.createTempDirectory("modules");
Path appBundle = HelloApp.createBundle(appDesc, goodModulePath);
JPackageCommand cmd = new JPackageCommand()
.setArgumentValue("--dest", TKit.workDir().resolve("output"))
.setDefaultAppName()
.setPackageType(PackageType.IMAGE);
if (TKit.isWindows()) {
cmd.addArguments("--win-console");
}
cmd.addArguments("--module", String.join("/", appDesc.moduleName(),
appDesc.className()));
// Ignore runtime that can be set for all tests. Usually if default
// runtime is set, it is fake one to save time on running jlink and
// copying megabytes of data from Java home to application image.
// We need proper runtime for this test.
cmd.ignoreDefaultRuntime(true);
Path emptyDir = TKit.createTempDirectory("empty-dir");
Path nonExistingDir = TKit.withTempDirectory("non-existing-dir", x -> {});
Function<String, String> substitute = str -> {
String v = str;
v = v.replace(GOOD_PATH, goodModulePath.toString());
v = v.replace(EMPTY_DIR, emptyDir.toString());
v = v.replace(NON_EXISTING_DIR, nonExistingDir.toString());
return v;
};
boolean withGoodPath = modulePathArgs.stream().anyMatch(
s -> s.contains(GOOD_PATH));
cmd.addArguments(modulePathArgs.stream().map(arg -> Stream.of(
"--module-path", substitute.apply(arg))).flatMap(s -> s).collect(
Collectors.toList()));
if (withGoodPath) {
cmd.executeAndAssertHelloAppImageCreated();
} else {
final String expectedErrorMessage;
if (modulePathArgs.isEmpty()) {
expectedErrorMessage = "Error: Missing argument: --runtime-image or --module-path";
} else {
expectedErrorMessage = String.format(
"Failed to find %s module in module path", appDesc.moduleName());
}
List<String> output = cmd
.saveConsoleOutput(true)
.execute(1)
.getOutput();
TKit.assertTextStream(expectedErrorMessage).apply(output.stream());
}
}
private final List<String> modulePathArgs;
private final static String GOOD_PATH = "@GoodPath@";
private final static String EMPTY_DIR = "@EmptyDir@";
private final static String NON_EXISTING_DIR = "@NonExistingDir@";
}
|
