author | darcy |
Tue, 11 Jun 2019 16:45:20 -0700 | |
changeset 55382 | 30b1b7b4dd86 |
parent 53023 | 6879069d9d94 |
permissions | -rw-r--r-- |
25448 | 1 |
/* |
55382 | 2 |
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. |
25448 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
/* |
|
25 |
* @test |
|
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50949
diff
changeset
|
26 |
* @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563 |
25448 | 27 |
* @summary Check interpretation of -target and -source options |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27319
diff
changeset
|
28 |
* @modules java.compiler |
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27319
diff
changeset
|
29 |
* jdk.compiler |
25448 | 30 |
* @run main Versions |
31 |
*/ |
|
32 |
||
33 |
import java.io.*; |
|
34 |
import java.nio.*; |
|
35 |
import java.nio.channels.*; |
|
36 |
||
37 |
import javax.tools.JavaCompiler; |
|
38 |
import javax.tools.ToolProvider; |
|
39 |
import javax.tools.JavaFileObject; |
|
40 |
import javax.tools.StandardJavaFileManager; |
|
41 |
import java.util.List; |
|
42 |
import java.util.ArrayList; |
|
43 |
import java.util.Arrays; |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
44 |
import java.util.Set; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
45 |
import java.util.function.BiConsumer; |
25448 | 46 |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
47 |
/* |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
48 |
* If not explicitly specified the latest source and latest target |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
49 |
* values are the defaults. If explicitly specified, the target value |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
50 |
* has to be greater than or equal to the source value. |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
51 |
*/ |
25448 | 52 |
public class Versions { |
53 |
||
54 |
protected JavaCompiler javacompiler; |
|
55 |
protected int failedCases; |
|
56 |
||
57 |
public Versions() throws IOException { |
|
58 |
javacompiler = ToolProvider.getSystemJavaCompiler(); |
|
59 |
genSourceFiles(); |
|
60 |
failedCases = 0; |
|
61 |
} |
|
62 |
||
63 |
public static void main(String... args) throws IOException { |
|
64 |
Versions versions = new Versions(); |
|
65 |
versions.run(); |
|
66 |
} |
|
67 |
||
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
68 |
public static final Set<String> RETIRED_SOURCES = |
51047
860a3648c494
8028563: Remove javac support for 6/1.6 source and target values
darcy
parents:
50949
diff
changeset
|
69 |
Set.of("1.2", "1.3", "1.4", "1.5", "1.6"); |
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
70 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
71 |
public static final Set<String> VALID_SOURCES = |
55382 | 72 |
Set.of("1.7", "1.8", "1.9", "1.10", "11", "12", "13", "14"); |
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
73 |
|
55382 | 74 |
public static final String LATEST_MAJOR_VERSION = "58.0"; |
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
75 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
76 |
static enum SourceTarget { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
77 |
SEVEN(true, "51.0", "7", Versions::checksrc17), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
78 |
EIGHT(true, "52.0", "8", Versions::checksrc18), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
79 |
NINE(true, "53.0", "9", Versions::checksrc19), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
80 |
TEN(true, "54.0", "10", Versions::checksrc110), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
81 |
ELEVEN(false, "55.0", "11", Versions::checksrc111), |
53023 | 82 |
TWELVE(false, "56.0", "12", Versions::checksrc112), |
55382 | 83 |
THIRTEEN(false, "57.0", "13", Versions::checksrc113), |
84 |
FOURTEEN(false, "58.0", "14", Versions::checksrc114); |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
85 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
86 |
private final boolean dotOne; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
87 |
private final String classFileVer; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
88 |
private final String target; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
89 |
private final BiConsumer<Versions, String[]> checker; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
90 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
91 |
private SourceTarget(boolean dotOne, String classFileVer, String target, |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
92 |
BiConsumer<Versions, String[]> checker) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
93 |
this.dotOne = dotOne; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
94 |
this.classFileVer = classFileVer; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
95 |
this.target = target; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
96 |
this.checker = checker; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
97 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
98 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
99 |
public void checksrc(Versions version, String... args) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
100 |
checker.accept(version, args); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
101 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
102 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
103 |
public boolean dotOne() { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
104 |
return dotOne; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
105 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
106 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
107 |
public String classFileVer() { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
108 |
return classFileVer; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
109 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
110 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
111 |
public String target() { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
112 |
return target; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
113 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
114 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
115 |
|
25448 | 116 |
void run() { |
117 |
String TC = ""; |
|
118 |
System.out.println("Version.java: Starting"); |
|
119 |
||
50892 | 120 |
check(LATEST_MAJOR_VERSION); |
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
121 |
for (String source : VALID_SOURCES) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
122 |
check(LATEST_MAJOR_VERSION, "-source " + source); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
123 |
} |
25448 | 124 |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
125 |
// Verify that a -source value less than a -target value is |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
126 |
// accepted and that the resulting class files are dependent |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
127 |
// on the target setting alone. |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
128 |
SourceTarget[] sourceTargets = SourceTarget.values(); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
129 |
for (int i = 0; i < sourceTargets.length; i++) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
130 |
SourceTarget st = sourceTargets[i]; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
131 |
String classFileVer = st.classFileVer(); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
132 |
String target = st.target(); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
133 |
boolean dotOne = st.dotOne(); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
134 |
check_source_target(dotOne, classFileVer, target, target); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
135 |
for (int j = i; j > 0; j--) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
136 |
String source = sourceTargets[j].target(); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
137 |
check_source_target(dotOne, classFileVer, source, target); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
138 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
139 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
140 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
141 |
// Verify acceptance of different combinations of -source N, |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
142 |
// -target M; N <= M |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
143 |
for (int i = 0; i < sourceTargets.length; i++) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
144 |
SourceTarget st = sourceTargets[i]; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
145 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
146 |
st.checksrc(this, "-source " + st.target()); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
147 |
st.checksrc(this, "-source " + st.target(), "-target " + st.target()); |
25448 | 148 |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
149 |
if (st.dotOne()) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
150 |
st.checksrc(this, "-source 1." + st.target()); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
151 |
st.checksrc(this, "-source 1." + st.target(), "-target 1." + st.target()); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
152 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
153 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
154 |
if (i == sourceTargets.length) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
155 |
// Can use -target without -source setting only for |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
156 |
// most recent target since the most recent source is |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
157 |
// the default. |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
158 |
st.checksrc(this, "-target " + st.target()); |
25448 | 159 |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
160 |
if (!st.classFileVer().equals(LATEST_MAJOR_VERSION)) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
161 |
throw new RuntimeException(st + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
162 |
"does not have class file version" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
163 |
LATEST_MAJOR_VERSION); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
164 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
165 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
166 |
} |
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
167 |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
168 |
// Verify that -source N -target (N-1) is rejected |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
169 |
for (int i = 1 /* Skip zeroth value */; i < sourceTargets.length; i++) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
170 |
fail("-source " + sourceTargets[i].target(), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
171 |
"-target " + sourceTargets[i-1].target(), |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
172 |
"Base.java"); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
173 |
} |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
174 |
|
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
175 |
// Previously supported source/target values |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
176 |
for (String source : RETIRED_SOURCES) { |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
177 |
fail("-source " + source, "-target " + source, "Base.java"); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
178 |
} |
25448 | 179 |
|
180 |
if (failedCases > 0) { |
|
181 |
System.err.println("failedCases = " + String.valueOf(failedCases)); |
|
182 |
throw new Error("Test failed"); |
|
183 |
} |
|
184 |
||
185 |
} |
|
186 |
||
187 |
protected void printargs(String fname,String... args) { |
|
188 |
System.out.printf("test: %s", fname); |
|
189 |
for (String onearg : args) { |
|
190 |
System.out.printf(" %s", onearg); |
|
191 |
} |
|
192 |
System.out.printf("\n", fname); |
|
193 |
} |
|
194 |
||
48343 | 195 |
protected void check_source_target(boolean dotOne, String... args) { |
25448 | 196 |
printargs("check_source_target", args); |
48343 | 197 |
check_target(dotOne, args[0], args[1], args[2]); |
198 |
if (dotOne) { |
|
199 |
check_target(dotOne, args[0], "1." + args[1], args[2]); |
|
200 |
} |
|
25448 | 201 |
} |
202 |
||
48343 | 203 |
protected void check_target(boolean dotOne, String... args) { |
25448 | 204 |
check(args[0], "-source " + args[1], "-target " + args[2]); |
48343 | 205 |
if (dotOne) { |
206 |
check(args[0], "-source " + args[1], "-target 1." + args[2]); |
|
207 |
} |
|
25448 | 208 |
} |
209 |
||
210 |
protected void check(String major, String... args) { |
|
211 |
printargs("check", args); |
|
48343 | 212 |
List<String> jcargs = new ArrayList<>(); |
25448 | 213 |
jcargs.add("-Xlint:-options"); |
214 |
||
215 |
// add in args conforming to List requrements of JavaCompiler |
|
216 |
for (String onearg : args) { |
|
217 |
String[] fields = onearg.split(" "); |
|
218 |
for (String onefield : fields) { |
|
219 |
jcargs.add(onefield); |
|
220 |
} |
|
221 |
} |
|
222 |
||
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
223 |
boolean creturn = compile("Base.java", jcargs); |
25448 | 224 |
if (!creturn) { |
225 |
// compilation errors note and return.. assume no class file |
|
226 |
System.err.println("check: Compilation Failed"); |
|
227 |
System.err.println("\t classVersion:\t" + major); |
|
228 |
System.err.println("\t arguments:\t" + jcargs); |
|
229 |
failedCases++; |
|
230 |
||
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
231 |
} else if (!checkClassFileVersion("Base.class", major)) { |
25448 | 232 |
failedCases++; |
233 |
} |
|
234 |
} |
|
235 |
||
236 |
protected void checksrc17(String... args) { |
|
237 |
printargs("checksrc17", args); |
|
238 |
int asize = args.length; |
|
239 |
String[] newargs = new String[asize+1]; |
|
240 |
System.arraycopy(args, 0, newargs,0 , asize); |
|
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
241 |
newargs[asize] = "New17.java"; |
25448 | 242 |
pass(newargs); |
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
243 |
newargs[asize] = "New18.java"; |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
244 |
fail(newargs); |
25448 | 245 |
} |
246 |
||
247 |
protected void checksrc18(String... args) { |
|
248 |
printargs("checksrc18", args); |
|
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
249 |
int asize = args.length; |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
250 |
String[] newargs = new String[asize+1]; |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
251 |
System.arraycopy(args, 0, newargs,0 , asize); |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
252 |
newargs[asize] = "New17.java"; |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
253 |
pass(newargs); |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
254 |
newargs[asize] = "New18.java"; |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
255 |
pass(newargs); |
48343 | 256 |
newargs[asize] = "New110.java"; |
257 |
fail(newargs); |
|
25448 | 258 |
} |
259 |
||
260 |
protected void checksrc19(String... args) { |
|
261 |
printargs("checksrc19", args); |
|
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
262 |
checksrc18(args); |
25448 | 263 |
} |
264 |
||
43646 | 265 |
protected void checksrc110(String... args) { |
266 |
printargs("checksrc110", args); |
|
48343 | 267 |
int asize = args.length; |
268 |
String[] newargs = new String[asize+1]; |
|
269 |
System.arraycopy(args, 0, newargs,0 , asize); |
|
270 |
newargs[asize] = "New17.java"; |
|
271 |
pass(newargs); |
|
272 |
newargs[asize] = "New18.java"; |
|
273 |
pass(newargs); |
|
274 |
newargs[asize] = "New110.java"; |
|
275 |
pass(newargs); |
|
276 |
} |
|
277 |
||
278 |
protected void checksrc111(String... args) { |
|
279 |
printargs("checksrc111", args); |
|
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
280 |
int asize = args.length; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
281 |
String[] newargs = new String[asize+1]; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
282 |
System.arraycopy(args, 0, newargs,0 , asize); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
283 |
newargs[asize] = "New17.java"; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
284 |
pass(newargs); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
285 |
newargs[asize] = "New18.java"; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
286 |
pass(newargs); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
287 |
newargs[asize] = "New110.java"; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
288 |
pass(newargs); |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
289 |
newargs[asize] = "New111.java"; |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
290 |
pass(newargs); |
43646 | 291 |
} |
292 |
||
50892 | 293 |
protected void checksrc112(String... args) { |
294 |
printargs("checksrc112", args); |
|
295 |
checksrc111(args); |
|
296 |
} |
|
297 |
||
53023 | 298 |
protected void checksrc113(String... args) { |
299 |
printargs("checksrc113", args); |
|
300 |
checksrc111(args); |
|
301 |
} |
|
302 |
||
55382 | 303 |
protected void checksrc114(String... args) { |
304 |
printargs("checksrc114", args); |
|
305 |
checksrc111(args); |
|
306 |
} |
|
307 |
||
25448 | 308 |
protected void pass(String... args) { |
309 |
printargs("pass", args); |
|
310 |
||
311 |
List<String> jcargs = new ArrayList<String>(); |
|
312 |
jcargs.add("-Xlint:-options"); |
|
313 |
||
314 |
// add in args conforming to List requrements of JavaCompiler |
|
315 |
for (String onearg : args) { |
|
316 |
String[] fields = onearg.split(" "); |
|
317 |
for (String onefield : fields) { |
|
318 |
jcargs.add(onefield); |
|
319 |
} |
|
320 |
} |
|
321 |
||
322 |
// empty list is error |
|
323 |
if (jcargs.isEmpty()) { |
|
324 |
System.err.println("error: test error in pass() - No arguments"); |
|
325 |
System.err.println("\t arguments:\t" + jcargs); |
|
326 |
failedCases++; |
|
327 |
return; |
|
328 |
} |
|
329 |
||
330 |
// the last argument is the filename *.java |
|
331 |
String filename = jcargs.get(jcargs.size() - 1); |
|
332 |
jcargs.remove(jcargs.size() - 1); |
|
333 |
||
334 |
boolean creturn = compile(filename, jcargs); |
|
335 |
// expect a compilation failure, failure if otherwise |
|
336 |
if (!creturn) { |
|
337 |
System.err.println("pass: Compilation erroneously failed"); |
|
338 |
System.err.println("\t arguments:\t" + jcargs); |
|
339 |
System.err.println("\t file :\t" + filename); |
|
340 |
failedCases++; |
|
341 |
||
342 |
} |
|
343 |
||
344 |
} |
|
345 |
||
346 |
protected void fail(String... args) { |
|
347 |
printargs("fail", args); |
|
348 |
||
349 |
List<String> jcargs = new ArrayList<String>(); |
|
350 |
jcargs.add("-Xlint:-options"); |
|
351 |
||
352 |
// add in args conforming to List requrements of JavaCompiler |
|
353 |
for (String onearg : args) { |
|
354 |
String[] fields = onearg.split(" "); |
|
355 |
for (String onefield : fields) { |
|
356 |
jcargs.add(onefield); |
|
357 |
} |
|
358 |
} |
|
359 |
||
360 |
// empty list is error |
|
361 |
if (jcargs.isEmpty()) { |
|
362 |
System.err.println("error: test error in fail()- No arguments"); |
|
363 |
System.err.println("\t arguments:\t" + jcargs); |
|
364 |
failedCases++; |
|
365 |
return; |
|
366 |
} |
|
367 |
||
368 |
// the last argument is the filename *.java |
|
369 |
String filename = jcargs.get(jcargs.size() - 1); |
|
370 |
jcargs.remove(jcargs.size() - 1); |
|
371 |
||
372 |
boolean creturn = compile(filename, jcargs); |
|
373 |
// expect a compilation failure, failure if otherwise |
|
374 |
if (creturn) { |
|
375 |
System.err.println("fail: Compilation erroneously succeeded"); |
|
376 |
System.err.println("\t arguments:\t" + jcargs); |
|
377 |
System.err.println("\t file :\t" + filename); |
|
378 |
failedCases++; |
|
379 |
} |
|
380 |
} |
|
381 |
||
382 |
protected boolean compile(String sourceFile, List<String>options) { |
|
383 |
JavaCompiler.CompilationTask jctask; |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
384 |
try (StandardJavaFileManager fm = javacompiler.getStandardFileManager(null, null, null)) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
385 |
Iterable<? extends JavaFileObject> files = fm.getJavaFileObjects(sourceFile); |
25448 | 386 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
387 |
jctask = javacompiler.getTask( |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
388 |
null, // Writer |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
389 |
fm, // JavaFileManager |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
390 |
null, // DiagnosticListener |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
391 |
options, // Iterable<String> |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
392 |
null, // Iterable<String> classes |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
393 |
files); // Iterable<? extends JavaFileObject> |
26264
a09fedde76be
8044859: javac duplicates option processing when using Compiler API
jjg
parents:
25448
diff
changeset
|
394 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
395 |
try { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
396 |
return jctask.call(); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
397 |
} catch (IllegalStateException e) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
398 |
System.err.println(e); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
399 |
return false; |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
400 |
} |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
401 |
} catch (IOException e) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
26782
diff
changeset
|
402 |
throw new Error(e); |
26264
a09fedde76be
8044859: javac duplicates option processing when using Compiler API
jjg
parents:
25448
diff
changeset
|
403 |
} |
25448 | 404 |
} |
405 |
||
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
406 |
protected void writeSourceFile(String fileName, String body) throws IOException{ |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
407 |
try (Writer fw = new FileWriter(fileName)) { |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
408 |
fw.write(body); |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
409 |
} |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
410 |
} |
25448 | 411 |
|
412 |
protected void genSourceFiles() throws IOException{ |
|
413 |
/* Create a file that executes with all supported versions. */ |
|
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
414 |
writeSourceFile("Base.java","public class Base { }\n"); |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
415 |
|
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
416 |
/* |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
417 |
* Create a file with a new feature in 1.7, not in 1.6 : "<>" |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
418 |
*/ |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
419 |
writeSourceFile("New17.java", |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
420 |
"import java.util.List;\n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
421 |
"import java.util.ArrayList;\n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
422 |
"class New17 { List<String> s = new ArrayList<>(); }\n" |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
423 |
); |
25448 | 424 |
|
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
425 |
/* |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
426 |
* Create a file with a new feature in 1.8, not in 1.7 : lambda |
25448 | 427 |
*/ |
26782
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
428 |
writeSourceFile("New18.java", |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
429 |
"public class New18 { \n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
430 |
" void m() { \n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
431 |
" new Thread(() -> { }); \n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
432 |
" } \n" + |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
433 |
"} \n" |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
434 |
); |
6c1bac8138d8
8050117: add to javac test Versions.java tests that show correct operation for source/target options pre 1.9
ntoda
parents:
26264
diff
changeset
|
435 |
|
48343 | 436 |
/* |
437 |
* Create a file with a new feature in 1.10, not in 1.9 : var |
|
438 |
*/ |
|
439 |
writeSourceFile("New110.java", |
|
440 |
"public class New110 { \n" + |
|
441 |
" void m() { \n" + |
|
442 |
" var tmp = new Thread(() -> { }); \n" + |
|
443 |
" } \n" + |
|
444 |
"} \n" |
|
445 |
); |
|
446 |
||
50934
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
447 |
/* |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
448 |
* Create a file with a new feature in 11, not in 10 : var for lambda parameters |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
449 |
*/ |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
450 |
writeSourceFile("New111.java", |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
451 |
"public class New111 { \n" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
452 |
" static java.util.function.Function<String,String> f = (var x) -> x.substring(0);\n" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
453 |
" void m(String name) { \n" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
454 |
" var tmp = new Thread(() -> { }, f.apply(name)); \n" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
455 |
" } \n" + |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
456 |
"} \n" |
ab998c2bd38f
8206085: Refactor langtools/tools/javac/versions/Versions.java
darcy
parents:
50892
diff
changeset
|
457 |
); |
25448 | 458 |
} |
459 |
||
460 |
protected boolean checkClassFileVersion |
|
461 |
(String filename,String classVersionNumber) { |
|
462 |
ByteBuffer bb = ByteBuffer.allocate(1024); |
|
463 |
try (FileChannel fc = new FileInputStream(filename).getChannel()) { |
|
464 |
bb.clear(); |
|
465 |
if (fc.read(bb) < 0) |
|
466 |
throw new IOException("Could not read from file : " + filename); |
|
467 |
bb.flip(); |
|
468 |
int minor = bb.getShort(4); |
|
469 |
int major = bb.getShort(6); |
|
470 |
String fileVersion = major + "." + minor; |
|
471 |
if (fileVersion.equals(classVersionNumber)) { |
|
472 |
return true; |
|
473 |
} else { |
|
474 |
System.err.println("checkClassFileVersion : Failed"); |
|
475 |
System.err.println("\tclassfile version mismatch"); |
|
476 |
System.err.println("\texpected : " + classVersionNumber); |
|
477 |
System.err.println("\tfound : " + fileVersion); |
|
478 |
return false; |
|
479 |
} |
|
480 |
} |
|
481 |
catch (IOException e) { |
|
482 |
System.err.println("checkClassFileVersion : Failed"); |
|
483 |
System.err.println("\terror :\t" + e.getMessage()); |
|
484 |
System.err.println("\tfile:\tfilename"); |
|
485 |
} |
|
486 |
return false; |
|
487 |
} |
|
488 |
} |
|
489 |