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
227
228
229
230
231
232
233
234
235
|
/*
* Copyright (c) 2016, 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
* @bug 8168836
* @summary Basic argument validation for --add-exports
* @library /lib/testlibrary /test/lib
* @modules jdk.compiler
* @build jdk.test.lib.compiler.ModuleInfoMaker
* jdk.test.lib.compiler.CompilerUtils
* jdk.testlibrary.*
* @run testng AddExportsTestWarningError
*/
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.stream.Stream;
import jdk.test.lib.compiler.ModuleInfoMaker;
import jdk.testlibrary.OutputAnalyzer;
import static jdk.testlibrary.ProcessTools.*;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@Test
public class AddExportsTestWarningError {
private static final Path MODS_DIR = Paths.get("mods");
private static final Path SRC_DIR = Paths.get("src");
private static final String M1_MAIN = "m1/p1.C1";
private static final String M3_MAIN = "m3/p3.C3";
@BeforeTest
public void setup() throws Exception {
ModuleInfoMaker builder = new ModuleInfoMaker(SRC_DIR);
builder.writeJavaFiles("m1",
"module m1 { }",
"package p1; public class C1 { " +
" public static void main(String... args) {}" +
"}");
builder.writeJavaFiles("m2",
"module m2 { requires m1; exports p2; }",
"package p2; public class C2 { private p1.C1 c1; }");
builder.writeJavaFiles("m3",
"module m3 { requires m2; }",
"package p3; class C3 { " +
" p1.C1 c; " +
" public static void main(String... args) { new p2.C2(); }" +
"}");
builder.compile("m1", MODS_DIR);
builder.compile("m2", MODS_DIR, "--add-exports", "m1/p1=m2");
builder.compile("m3", MODS_DIR, "--add-exports", "m1/p1=m3", "--add-reads", "m3=m1");
}
@DataProvider(name = "goodcases")
public Object[][] goodCases() {
return new Object[][]{
// empty items
{ "m1/p1=,m2,m3", null },
{ "m1/p1=m2,,m3", null },
{ "m1/p1=m2,m3,", null },
// duplicates
{ "m1/p1=m2,m2,m3,,", null },
};
}
@Test(dataProvider = "goodcases")
public void test(String value, String ignore) throws Exception {
testNoWarning(value);
}
@DataProvider(name = "illFormedAddExports")
public Object[][] illFormedAddExports() {
return new Object[][]{
{ "m1", "Unable to parse --add-exports <module>=<value>: m1"},
// missing source part
{ "=m2", "Unable to parse --add-exports <module>=<value>: =m2"},
{ "/=m2", "Unable to parse --add-exports <module>/<package>: /" },
{ "m1=m2", "Unable to parse --add-exports <module>/<package>: m1" },
{ "/p1=m2", "Unable to parse --add-exports <module>/<package>: /p1" },
{ "m1p1=m2", "Unable to parse --add-exports <module>/<package>: m1p1" },
// empty list, missing target
{ "m1/p1=", "Unable to parse --add-exports <module>=<value>: m1/p1=" },
{ "m1/p1=,,", "Target must be specified: --add-exports m1/p1=,," },
};
}
@Test(dataProvider = "illFormedAddExports")
public void testIllFormedAddExports(String value, String msg) throws Exception {
testError(value, msg);
}
@DataProvider(name = "unknownNames")
public Object[][] unknownNames() {
return new Object[][]{
// source not found
{"DoesNotExist/p=m1", "WARNING: Unknown module: DoesNotExist specified to --add-exports"},
{"m1/DoesNotExist=m2", "WARNING: package DoesNotExist not in m1"},
// target not found
{"m1/p1=DoesNotExist", "WARNING: Unknown module: DoesNotExist specified to --add-exports"},
// bad names
{"m*/p1=m2", "WARNING: Unknown module: m* specified to --add-exports"},
{"m1/p!=m2", "WARNING: package p! not in m1"},
{"m1/p1=m!", "WARNING: Unknown module: m! specified to --add-exports"},
};
}
@Test(dataProvider = "unknownNames")
public void testUnknownNames(String value, String msg) throws Exception {
testWarning(value, msg);
}
@DataProvider(name = "missingArguments")
public Object[][] missingArguments() {
return new Object[][]{
{ new String[] { "--add-exports" },
"Error: --add-exports requires modules to be specified"},
{ new String[] { "--add-exports=" },
"Error: --add-exports= requires modules to be specified" },
{ new String[] { "--add-exports", "" },
"Error: --add-exports requires modules to be specified"}
};
}
@Test(dataProvider = "missingArguments")
public void testMissingArguments(String[] options, String msg) throws Exception {
String[] args = Stream.concat(Arrays.stream(options),
Stream.of("-version"))
.toArray(String[]::new);
int exitValue = executeTestJava(args)
.outputTo(System.out)
.errorTo(System.out)
.shouldContain(msg)
.getExitValue();
assertTrue(exitValue != 0);
}
private void testWarning(String value, String msg) throws Exception {
int exitValue =
executeTestJava("--add-exports", value,
"--module-path", MODS_DIR.toString(),
"-m", M1_MAIN)
.outputTo(System.out)
.errorTo(System.out)
.shouldContain(msg)
.getExitValue();
assertTrue(exitValue == 0);
}
private void testError(String value, String msg) throws Exception {
int exitValue =
executeTestJava("--add-exports", value,
"--module-path", MODS_DIR.toString(),
"-m", M1_MAIN)
.outputTo(System.out)
.errorTo(System.out)
.shouldContain(msg)
.getExitValue();
assertTrue(exitValue != 0);
}
private void testNoWarning(String value) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(new BufferedOutputStream(baos));
OutputAnalyzer outputAnalyzer =
executeTestJava("--add-exports", value,
"--module-path", MODS_DIR.toString(),
"-m", M3_MAIN)
.outputTo(ps)
.errorTo(ps);
assertTrue(outputAnalyzer.getExitValue() == 0);
System.out.println(baos.toString());
String[] output = baos.toString().split("\\R");
assertFalse(Arrays.stream(output)
.filter(s -> !s.matches("WARNING: Module name .* may soon be illegal"))
.filter(s -> s.startsWith("WARNING:"))
.findAny().isPresent());
}
}
|
