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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
/*
* Copyright (c) 2014, 2018, 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.
*/
/**
* @test
* @library /lib/testlibrary /test/lib
* @modules jdk.jlink/jdk.tools.jmod
* jdk.compiler
* @build AddModsTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
* @run testng AddModsTest
* @summary Basic test for java --add-modules
*/
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import jdk.test.lib.compiler.CompilerUtils;
import static jdk.testlibrary.ProcessTools.*;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@Test
public class AddModsTest {
private static final String TEST_SRC = System.getProperty("test.src");
private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
private static final Path MODS1_DIR = Paths.get("mods1");
private static final Path MODS2_DIR = Paths.get("mods2");
// test module / main class
private static final String TEST_MODULE = "test";
private static final String TEST_MAIN_CLASS = "test.Main";
private static final String TEST_MID = TEST_MODULE + "/" + TEST_MAIN_CLASS;
// logger module
private static final String LOGGER_MODULE = "logger";
@BeforeTest
public void compile() throws Exception {
// javac -d mods1/test src/test/**
boolean compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST_MODULE),
MODS1_DIR.resolve(TEST_MODULE)
);
assertTrue(compiled, "test did not compile");
// javac -d mods1/logger src/logger/**
compiled= CompilerUtils.compile(
SRC_DIR.resolve(LOGGER_MODULE),
MODS2_DIR.resolve(LOGGER_MODULE)
);
assertTrue(compiled, "test did not compile");
}
/**
* Basic test of --add-modules ALL-DEFAULT. Module java.sql should be
* resolved and the types in that module should be visible.
*/
public void testAddDefaultModules1() throws Exception {
// java --add-modules ALL-DEFAULT --module-path mods1 -m test ...
int exitValue
= executeTestJava("--module-path", MODS1_DIR.toString(),
"--add-modules", "ALL-DEFAULT",
"-m", TEST_MID,
"java.sql.Connection")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
* Run test on class path to load a type in a module on the application
* module path, uses {@code --add-modules logger}.
*/
public void testRunWithAddMods() throws Exception {
// java --module-path mods --add-modules logger -cp classes test.Main
String classpath = MODS1_DIR.resolve(TEST_MODULE).toString();
String modulepath = MODS2_DIR.toString();
int exitValue
= executeTestJava("--module-path", modulepath,
"--add-modules", LOGGER_MODULE,
"-cp", classpath,
TEST_MAIN_CLASS,
"logger.Logger")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
* Run application on class path that makes use of module on the
* application module path. Does not use --add-modules and so should
* fail at run-time.
*/
public void testRunMissingAddMods() throws Exception {
// java --module-path mods -cp classes test.Main
String classpath = MODS1_DIR.resolve(TEST_MODULE).toString();
String modulepath = MODS1_DIR.toString();
int exitValue
= executeTestJava("--module-path", modulepath,
"-cp", classpath,
TEST_MAIN_CLASS,
"logger.Logger")
.outputTo(System.out)
.errorTo(System.out)
.shouldContain("ClassNotFoundException")
.getExitValue();
assertTrue(exitValue != 0);
}
/**
* Run test on class path to load a type in a module on the application
* module path, uses {@code --add-modules ALL-MODULE-PATH}.
*/
public void testAddAllModulePath() throws Exception {
// java --module-path mods --add-modules ALL-MODULE-PATH -cp classes test.Main
String classpath = MODS1_DIR.resolve(TEST_MODULE).toString();
String modulepath = MODS1_DIR.toString();
int exitValue
= executeTestJava("--module-path", modulepath,
"--add-modules", "ALL-MODULE-PATH",
"-cp", classpath,
TEST_MAIN_CLASS)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
* Test {@code --add-modules ALL-MODULE-PATH} without {@code --module-path}.
*/
public void testAddAllModulePathWithNoModulePath() throws Exception {
// java --add-modules ALL-MODULE-PATH -version
int exitValue
= executeTestJava("--add-modules", "ALL-MODULE-PATH",
"-version")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
* Tests {@code --add-modules} be specified more than once.
*/
public void testWithMultipleAddModules() throws Exception {
String modulepath = MODS1_DIR.toString() + File.pathSeparator +
MODS2_DIR.toString();
int exitValue
= executeTestJava("--module-path", modulepath,
"--add-modules", LOGGER_MODULE,
"--add-modules", TEST_MODULE,
"-m", TEST_MID,
"logger.Logger")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
* Attempt to run with a bad module name specified to --add-modules
*/
public void testRunWithBadAddMods() throws Exception {
// java --module-path mods --add-modules DoesNotExist -m test ...
int exitValue
= executeTestJava("--module-path", MODS1_DIR.toString(),
"--add-modules", "DoesNotExist",
"-m", TEST_MID)
.outputTo(System.out)
.errorTo(System.out)
.shouldContain("DoesNotExist")
.getExitValue();
assertTrue(exitValue != 0);
}
}
|
