author | jlahoda |
Mon, 21 Oct 2019 15:38:26 +0200 | |
changeset 58713 | ad69fd32778e |
permissions | -rw-r--r-- |
58713
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
1 |
/* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
4 |
* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
8 |
* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
13 |
* accompanied this code). |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
14 |
* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
18 |
* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
21 |
* questions. |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
22 |
*/ |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
23 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
24 |
/* |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
25 |
* @test |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
26 |
* @bug 8226585 |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
27 |
* @summary Verify behavior w.r.t. preview feature API errors and warnings |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
28 |
* @library /tools/lib /tools/javac/lib |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
29 |
* @modules |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
30 |
* java.base/jdk.internal |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.api |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
32 |
* jdk.compiler/com.sun.tools.javac.file |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
33 |
* jdk.compiler/com.sun.tools.javac.main |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
34 |
* jdk.compiler/com.sun.tools.javac.util |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
35 |
* @build toolbox.ToolBox toolbox.JavacTask |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
36 |
* @build combo.ComboTestHelper |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
37 |
* @compile --enable-preview -source ${jdk.version} PreviewErrors.java |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
38 |
* @run main/othervm --enable-preview PreviewErrors |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
39 |
*/ |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
40 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
41 |
import java.io.IOException; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
42 |
import java.nio.file.Files; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
43 |
import java.nio.file.Path; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
44 |
import java.nio.file.Paths; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
45 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
46 |
import combo.ComboInstance; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
47 |
import combo.ComboParameter; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
48 |
import combo.ComboTask; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
49 |
import combo.ComboTestHelper; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
50 |
import java.util.Arrays; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
51 |
import java.util.Set; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
52 |
import java.util.stream.Collectors; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
53 |
import javax.tools.Diagnostic; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
54 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
55 |
import jdk.internal.PreviewFeature; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
56 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
57 |
import toolbox.JavacTask; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
58 |
import toolbox.ToolBox; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
59 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
60 |
public class PreviewErrors extends ComboInstance<PreviewErrors> { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
61 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
62 |
protected ToolBox tb; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
63 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
64 |
PreviewErrors() { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
65 |
super(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
66 |
tb = new ToolBox(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
67 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
68 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
69 |
public static void main(String... args) throws Exception { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
70 |
new ComboTestHelper<PreviewErrors>() |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
71 |
.withDimension("ESSENTIAL", (x, essential) -> x.essential = essential, EssentialAPI.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
72 |
.withDimension("PREVIEW", (x, preview) -> x.preview = preview, Preview.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
73 |
.withDimension("LINT", (x, lint) -> x.lint = lint, Lint.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
74 |
.withDimension("SUPPRESS", (x, suppress) -> x.suppress = suppress, Suppress.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
75 |
.withDimension("FROM", (x, from) -> x.from = from, PreviewFrom.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
76 |
.run(PreviewErrors::new); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
77 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
78 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
79 |
private EssentialAPI essential; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
80 |
private Preview preview; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
81 |
private Lint lint; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
82 |
private Suppress suppress; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
83 |
private PreviewFrom from; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
84 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
85 |
@Override |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
86 |
public void doWork() throws IOException { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
87 |
Path base = Paths.get("."); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
88 |
Path src = base.resolve("src"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
89 |
Path srcJavaBase = src.resolve("java.base"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
90 |
Path classes = base.resolve("classes"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
91 |
Path classesJavaBase = classes.resolve("java.base"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
92 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
93 |
Files.createDirectories(classesJavaBase); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
94 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
95 |
String previewAPI = """ |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
96 |
package preview.api; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
97 |
public class Extra { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
98 |
@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
99 |
${essential}) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
100 |
public static void test() { } |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
101 |
@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
102 |
${essential}) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
103 |
public static class Clazz {} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
104 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
105 |
""".replace("${preview}", PreviewFeature.Feature.values()[0].name()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
106 |
.replace("${essential}", essential.expand(null)); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
107 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
108 |
if (from == PreviewFrom.CLASS) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
109 |
tb.writeJavaFiles(srcJavaBase, previewAPI); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
110 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
111 |
new JavacTask(tb) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
112 |
.outdir(classesJavaBase) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
113 |
.options("--patch-module", "java.base=" + srcJavaBase.toString()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
114 |
.files(tb.findJavaFiles(srcJavaBase)) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
115 |
.run() |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
116 |
.writeAll(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
117 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
118 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
119 |
ComboTask task = newCompilationTask() |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
120 |
.withSourceFromTemplate(""" |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
121 |
package test; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
122 |
public class Test { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
123 |
#{SUPPRESS} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
124 |
public void test() { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
125 |
preview.api.Extra.test(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
126 |
preview.api.Extra.Clazz c; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
127 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
128 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
129 |
""") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
130 |
.withOption("-XDrawDiagnostics") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
131 |
.withOption("-source") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
132 |
.withOption(String.valueOf(Runtime.version().feature())); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
133 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
134 |
if (from == PreviewFrom.CLASS) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
135 |
task.withOption("--patch-module") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
136 |
.withOption("java.base=" + classesJavaBase.toString()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
137 |
.withOption("--add-exports") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
138 |
.withOption("java.base/preview.api=ALL-UNNAMED"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
139 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
140 |
task.withSourceFromTemplate("Extra", previewAPI) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
141 |
.withOption("--add-exports") |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
142 |
.withOption("java.base/jdk.internal=ALL-UNNAMED"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
143 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
144 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
145 |
if (preview.expand(null)!= null) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
146 |
task = task.withOption(preview.expand(null)); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
147 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
148 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
149 |
if (lint.expand(null) != null) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
150 |
task = task.withOption(lint.expand(null)); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
151 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
152 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
153 |
task.generate(result -> { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
154 |
Set<String> actual = Arrays.stream(Diagnostic.Kind.values()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
155 |
.flatMap(kind -> result.diagnosticsForKind(kind).stream()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
156 |
.map(d -> d.getLineNumber() + ":" + d.getColumnNumber() + ":" + d.getCode()) |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
157 |
.collect(Collectors.toSet()); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
158 |
Set<String> expected; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
159 |
boolean ok; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
160 |
if (essential == EssentialAPI.YES) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
161 |
if (preview == Preview.YES) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
162 |
if (suppress == Suppress.YES) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
163 |
expected = Set.of(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
164 |
} else if (lint == Lint.ENABLE_PREVIEW) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
165 |
expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
166 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
167 |
expected = Set.of("-1:-1:compiler.note.preview.filename", |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
168 |
"-1:-1:compiler.note.preview.recompile"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
169 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
170 |
ok = true; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
171 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
172 |
expected = Set.of("5:26:compiler.err.is.preview", "6:26:compiler.err.is.preview"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
173 |
ok = false; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
174 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
175 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
176 |
if (suppress == Suppress.YES) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
177 |
expected = Set.of(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
178 |
} else if ((preview == Preview.YES && (lint == Lint.NONE || lint == Lint.DISABLE_PREVIEW)) || |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
179 |
(preview == Preview.NO && lint == Lint.DISABLE_PREVIEW)) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
180 |
expected = Set.of("-1:-1:compiler.note.preview.filename", |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
181 |
"-1:-1:compiler.note.preview.recompile"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
182 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
183 |
expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
184 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
185 |
ok = true; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
186 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
187 |
if (ok) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
188 |
if (!result.get().iterator().hasNext()) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
189 |
throw new IllegalStateException("Did not succeed as expected." + actual); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
190 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
191 |
} else { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
192 |
if (result.get().iterator().hasNext()) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
193 |
throw new IllegalStateException("Succeed unexpectedly."); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
194 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
195 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
196 |
if (!expected.equals(actual)) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
197 |
throw new IllegalStateException("Unexpected output for " + essential + ", " + preview + ", " + lint + ", " + suppress + ", " + from + ": actual: \"" + actual + "\", expected: \"" + expected + "\""); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
198 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
199 |
}); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
200 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
201 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
202 |
public enum EssentialAPI implements ComboParameter { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
203 |
YES(", essentialAPI=true"), |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
204 |
NO(", essentialAPI=false"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
205 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
206 |
private final String code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
207 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
208 |
private EssentialAPI(String code) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
209 |
this.code = code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
210 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
211 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
212 |
public String expand(String optParameter) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
213 |
return code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
214 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
215 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
216 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
217 |
public enum Preview implements ComboParameter { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
218 |
YES("--enable-preview"), |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
219 |
NO(null); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
220 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
221 |
private final String opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
222 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
223 |
private Preview(String opt) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
224 |
this.opt = opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
225 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
226 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
227 |
public String expand(String optParameter) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
228 |
return opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
229 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
230 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
231 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
232 |
public enum Lint implements ComboParameter { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
233 |
NONE(null), |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
234 |
ENABLE_PREVIEW("-Xlint:preview"), |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
235 |
DISABLE_PREVIEW("-Xlint:-preview"); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
236 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
237 |
private final String opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
238 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
239 |
private Lint(String opt) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
240 |
this.opt = opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
241 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
242 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
243 |
public String expand(String optParameter) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
244 |
return opt; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
245 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
246 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
247 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
248 |
public enum Suppress implements ComboParameter { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
249 |
YES("@SuppressWarnings(\"preview\")"), |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
250 |
NO(""); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
251 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
252 |
private final String code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
253 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
254 |
private Suppress(String code) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
255 |
this.code = code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
256 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
257 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
258 |
public String expand(String optParameter) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
259 |
return code; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
260 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
261 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
262 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
263 |
public enum PreviewFrom implements ComboParameter { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
264 |
CLASS, |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
265 |
SOURCE; |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
266 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
267 |
private PreviewFrom() { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
268 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
269 |
|
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
270 |
public String expand(String optParameter) { |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
271 |
throw new IllegalStateException(); |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
272 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
273 |
} |
ad69fd32778e
8226585: Improve javac messages for using a preview API
jlahoda
parents:
diff
changeset
|
274 |
} |