author | jlahoda |
Mon, 16 Jul 2018 16:31:33 +0200 | |
changeset 51123 | d7c4c42ab260 |
parent 47216 | 71c04702a3d5 |
child 51675 | b487c1e914d0 |
permissions | -rw-r--r-- |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
1 |
/* |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
4 |
* |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
8 |
* |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
13 |
* accompanied this code). |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
14 |
* |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
18 |
* |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
21 |
* questions. |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
22 |
*/ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
23 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
24 |
/** |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
25 |
* @test |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
26 |
* @bug 8168836 |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
27 |
* @summary Basic argument validation for --add-exports |
45191
ba48b1679390
8180724: move ModuleInfoMaker to the top level testlibrary
iignatyev
parents:
44359
diff
changeset
|
28 |
* @library /lib/testlibrary /test/lib |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
29 |
* @modules jdk.compiler |
45467
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45191
diff
changeset
|
30 |
* @build jdk.test.lib.compiler.ModuleInfoMaker |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45191
diff
changeset
|
31 |
* jdk.test.lib.compiler.CompilerUtils |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45191
diff
changeset
|
32 |
* jdk.testlibrary.* |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
33 |
* @run testng AddExportsTestWarningError |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
34 |
*/ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
35 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
36 |
import java.io.BufferedOutputStream; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
37 |
import java.io.ByteArrayOutputStream; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
38 |
import java.io.PrintStream; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
39 |
import java.nio.file.Path; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
40 |
import java.nio.file.Paths; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
41 |
import java.util.Arrays; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
42 |
import java.util.stream.Stream; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
43 |
|
45191
ba48b1679390
8180724: move ModuleInfoMaker to the top level testlibrary
iignatyev
parents:
44359
diff
changeset
|
44 |
import jdk.test.lib.compiler.ModuleInfoMaker; |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
45 |
import jdk.testlibrary.OutputAnalyzer; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
46 |
import static jdk.testlibrary.ProcessTools.*; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
47 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
48 |
import org.testng.annotations.BeforeTest; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
49 |
import org.testng.annotations.DataProvider; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
50 |
import org.testng.annotations.Test; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
51 |
import static org.testng.Assert.*; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
52 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
53 |
@Test |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
54 |
public class AddExportsTestWarningError { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
55 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
56 |
private static final Path MODS_DIR = Paths.get("mods"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
57 |
private static final Path SRC_DIR = Paths.get("src"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
58 |
private static final String M1_MAIN = "m1/p1.C1"; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
59 |
private static final String M3_MAIN = "m3/p3.C3"; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
60 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
61 |
@BeforeTest |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
62 |
public void setup() throws Exception { |
42993
d761de69e27f
8172215: java launcher no longer accepts -cp "" empty string
mchung
parents:
42774
diff
changeset
|
63 |
ModuleInfoMaker builder = new ModuleInfoMaker(SRC_DIR); |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
64 |
builder.writeJavaFiles("m1", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
65 |
"module m1 { }", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
66 |
"package p1; public class C1 { " + |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
67 |
" public static void main(String... args) {}" + |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
68 |
"}"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
69 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
70 |
builder.writeJavaFiles("m2", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
71 |
"module m2 { requires m1; exports p2; }", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
72 |
"package p2; public class C2 { private p1.C1 c1; }"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
73 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
74 |
builder.writeJavaFiles("m3", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
75 |
"module m3 { requires m2; }", |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
76 |
"package p3; class C3 { " + |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
77 |
" p1.C1 c; " + |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
78 |
" public static void main(String... args) { new p2.C2(); }" + |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
79 |
"}"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
80 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
81 |
builder.compile("m1", MODS_DIR); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
82 |
builder.compile("m2", MODS_DIR, "--add-exports", "m1/p1=m2"); |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
47216
diff
changeset
|
83 |
builder.compile("m3", MODS_DIR, "--add-exports", "m1/p1=m3", "--add-reads", "m3=m1"); |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
84 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
85 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
86 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
87 |
@DataProvider(name = "goodcases") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
88 |
public Object[][] goodCases() { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
89 |
return new Object[][]{ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
90 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
91 |
// empty items |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
92 |
{ "m1/p1=,m2,m3", null }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
93 |
{ "m1/p1=m2,,m3", null }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
94 |
{ "m1/p1=m2,m3,", null }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
95 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
96 |
// duplicates |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
97 |
{ "m1/p1=m2,m2,m3,,", null }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
98 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
99 |
}; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
100 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
101 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
102 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
103 |
@Test(dataProvider = "goodcases") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
104 |
public void test(String value, String ignore) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
105 |
testNoWarning(value); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
106 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
107 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
108 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
109 |
@DataProvider(name = "illFormedAddExports") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
110 |
public Object[][] illFormedAddExports() { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
111 |
return new Object[][]{ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
112 |
{ "m1", "Unable to parse --add-exports <module>=<value>: m1"}, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
113 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
114 |
// missing source part |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
115 |
{ "=m2", "Unable to parse --add-exports <module>=<value>: =m2"}, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
116 |
{ "/=m2", "Unable to parse --add-exports <module>/<package>: /" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
117 |
{ "m1=m2", "Unable to parse --add-exports <module>/<package>: m1" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
118 |
{ "/p1=m2", "Unable to parse --add-exports <module>/<package>: /p1" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
119 |
{ "m1p1=m2", "Unable to parse --add-exports <module>/<package>: m1p1" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
120 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
121 |
// empty list, missing target |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
122 |
{ "m1/p1=", "Unable to parse --add-exports <module>=<value>: m1/p1=" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
123 |
{ "m1/p1=,,", "Target must be specified: --add-exports m1/p1=,," }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
124 |
}; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
125 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
126 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
127 |
@Test(dataProvider = "illFormedAddExports") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
128 |
public void testIllFormedAddExports(String value, String msg) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
129 |
testError(value, msg); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
130 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
131 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
132 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
133 |
@DataProvider(name = "unknownNames") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
134 |
public Object[][] unknownNames() { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
135 |
return new Object[][]{ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
136 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
137 |
// source not found |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
42993
diff
changeset
|
138 |
{"DoesNotExist/p=m1", "WARNING: Unknown module: DoesNotExist specified to --add-exports"}, |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
139 |
{"m1/DoesNotExist=m2", "WARNING: package DoesNotExist not in m1"}, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
140 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
141 |
// target not found |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
42993
diff
changeset
|
142 |
{"m1/p1=DoesNotExist", "WARNING: Unknown module: DoesNotExist specified to --add-exports"}, |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
143 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
144 |
// bad names |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
42993
diff
changeset
|
145 |
{"m*/p1=m2", "WARNING: Unknown module: m* specified to --add-exports"}, |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
146 |
{"m1/p!=m2", "WARNING: package p! not in m1"}, |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
42993
diff
changeset
|
147 |
{"m1/p1=m!", "WARNING: Unknown module: m! specified to --add-exports"}, |
42774
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
148 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
149 |
}; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
150 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
151 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
152 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
153 |
@Test(dataProvider = "unknownNames") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
154 |
public void testUnknownNames(String value, String msg) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
155 |
testWarning(value, msg); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
156 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
157 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
158 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
159 |
@DataProvider(name = "missingArguments") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
160 |
public Object[][] missingArguments() { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
161 |
return new Object[][]{ |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
162 |
{ new String[] { "--add-exports" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
163 |
"Error: --add-exports requires modules to be specified"}, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
164 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
165 |
{ new String[] { "--add-exports=" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
166 |
"Error: --add-exports= requires modules to be specified" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
167 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
168 |
{ new String[] { "--add-exports", "" }, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
169 |
"Error: --add-exports requires modules to be specified"} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
170 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
171 |
}; |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
172 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
173 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
174 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
175 |
@Test(dataProvider = "missingArguments") |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
176 |
public void testMissingArguments(String[] options, String msg) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
177 |
String[] args = Stream.concat(Arrays.stream(options), |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
178 |
Stream.of("-version")) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
179 |
.toArray(String[]::new); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
180 |
int exitValue = executeTestJava(args) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
181 |
.outputTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
182 |
.errorTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
183 |
.shouldContain(msg) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
184 |
.getExitValue(); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
185 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
186 |
assertTrue(exitValue != 0); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
187 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
188 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
189 |
private void testWarning(String value, String msg) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
190 |
int exitValue = |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
191 |
executeTestJava("--add-exports", value, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
192 |
"--module-path", MODS_DIR.toString(), |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
193 |
"-m", M1_MAIN) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
194 |
.outputTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
195 |
.errorTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
196 |
.shouldContain(msg) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
197 |
.getExitValue(); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
198 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
199 |
assertTrue(exitValue == 0); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
200 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
201 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
202 |
private void testError(String value, String msg) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
203 |
int exitValue = |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
204 |
executeTestJava("--add-exports", value, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
205 |
"--module-path", MODS_DIR.toString(), |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
206 |
"-m", M1_MAIN) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
207 |
.outputTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
208 |
.errorTo(System.out) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
209 |
.shouldContain(msg) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
210 |
.getExitValue(); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
211 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
212 |
assertTrue(exitValue != 0); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
213 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
214 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
215 |
private void testNoWarning(String value) throws Exception { |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
216 |
ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
217 |
PrintStream ps = new PrintStream(new BufferedOutputStream(baos)); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
218 |
OutputAnalyzer outputAnalyzer = |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
219 |
executeTestJava("--add-exports", value, |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
220 |
"--module-path", MODS_DIR.toString(), |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
221 |
"-m", M3_MAIN) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
222 |
.outputTo(ps) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
223 |
.errorTo(ps); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
224 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
225 |
assertTrue(outputAnalyzer.getExitValue() == 0); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
226 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
227 |
System.out.println(baos.toString()); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
228 |
String[] output = baos.toString().split("\\R"); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
229 |
assertFalse(Arrays.stream(output) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
230 |
.filter(s -> !s.matches("WARNING: Module name .* may soon be illegal")) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
231 |
.filter(s -> s.startsWith("WARNING:")) |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
232 |
.findAny().isPresent()); |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
233 |
|
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
234 |
} |
74bcf37d15d8
8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff
changeset
|
235 |
} |