author | mchung |
Wed, 27 May 2015 13:25:18 -0700 | |
changeset 30846 | 2b3f379840f0 |
parent 30730 | d3ce7619db2c |
child 35426 | 374342e56a56 |
permissions | -rw-r--r-- |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
1 |
/* |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27579
diff
changeset
|
2 |
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
4 |
* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
8 |
* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
13 |
* accompanied this code). |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
14 |
* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
18 |
* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
21 |
* questions. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
22 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
23 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
24 |
/* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
25 |
* @test |
8637
be1b564b50aa
6980021: javac should document @file command line option
jjg
parents:
6144
diff
changeset
|
26 |
* @bug 6964768 6964461 6964469 6964487 6964460 6964481 6980021 |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
27 |
* @summary need test program to validate javac resource bundles |
30846 | 28 |
* @modules jdk.jdeps/com.sun.tools.classfile |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27579
diff
changeset
|
29 |
* jdk.compiler/com.sun.tools.javac.code |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
30 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
31 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
32 |
import java.io.*; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
33 |
import java.util.*; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
34 |
import javax.tools.*; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
35 |
import com.sun.tools.classfile.*; |
23114 | 36 |
import com.sun.tools.javac.code.Lint.LintCategory; |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
37 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
38 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
39 |
* Compare string constants in javac classes against keys in javac resource bundles. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
40 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
41 |
public class CheckResourceKeys { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
42 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
43 |
* Main program. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
44 |
* Options: |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
45 |
* -finddeadkeys |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
46 |
* look for keys in resource bundles that are no longer required |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
47 |
* -findmissingkeys |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
48 |
* look for keys in resource bundles that are missing |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
49 |
* |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
50 |
* @throws Exception if invoked by jtreg and errors occur |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
51 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
52 |
public static void main(String... args) throws Exception { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
53 |
CheckResourceKeys c = new CheckResourceKeys(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
54 |
if (c.run(args)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
55 |
return; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
56 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
57 |
if (is_jtreg()) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
58 |
throw new Exception(c.errors + " errors occurred"); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
59 |
else |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
60 |
System.exit(1); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
61 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
62 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
63 |
static boolean is_jtreg() { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
64 |
return (System.getProperty("test.src") != null); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
65 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
66 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
67 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
68 |
* Main entry point. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
69 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
70 |
boolean run(String... args) throws Exception { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
71 |
boolean findDeadKeys = false; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
72 |
boolean findMissingKeys = false; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
73 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
74 |
if (args.length == 0) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
75 |
if (is_jtreg()) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
76 |
findDeadKeys = true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
77 |
findMissingKeys = true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
78 |
} else { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
79 |
System.err.println("Usage: java CheckResourceKeys <options>"); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
80 |
System.err.println("where options include"); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
81 |
System.err.println(" -finddeadkeys find keys in resource bundles which are no longer required"); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
82 |
System.err.println(" -findmissingkeys find keys in resource bundles that are required but missing"); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
83 |
return true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
84 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
85 |
} else { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
86 |
for (String arg: args) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
87 |
if (arg.equalsIgnoreCase("-finddeadkeys")) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
88 |
findDeadKeys = true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
89 |
else if (arg.equalsIgnoreCase("-findmissingkeys")) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
90 |
findMissingKeys = true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
91 |
else |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
92 |
error("bad option: " + arg); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
93 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
94 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
95 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
96 |
if (errors > 0) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
97 |
return false; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
98 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
99 |
Set<String> codeStrings = getCodeStrings(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
100 |
Set<String> resourceKeys = getResourceKeys(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
101 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
102 |
if (findDeadKeys) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
103 |
findDeadKeys(codeStrings, resourceKeys); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
104 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
105 |
if (findMissingKeys) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
106 |
findMissingKeys(codeStrings, resourceKeys); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
107 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
108 |
return (errors == 0); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
109 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
110 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
111 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
112 |
* Find keys in resource bundles which are probably no longer required. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
113 |
* A key is probably required if there is a string fragment in the code |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
114 |
* that is part of the resource key, or if the key is well-known |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
115 |
* according to various pragmatic rules. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
116 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
117 |
void findDeadKeys(Set<String> codeStrings, Set<String> resourceKeys) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
118 |
String[] prefixes = { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
119 |
"compiler.err.", "compiler.warn.", "compiler.note.", "compiler.misc.", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
120 |
"javac." |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
121 |
}; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
122 |
for (String rk: resourceKeys) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
123 |
// some keys are used directly, without a prefix. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
124 |
if (codeStrings.contains(rk)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
125 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
126 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
127 |
// remove standard prefix |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
128 |
String s = null; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
129 |
for (int i = 0; i < prefixes.length && s == null; i++) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
130 |
if (rk.startsWith(prefixes[i])) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
131 |
s = rk.substring(prefixes[i].length()); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
132 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
133 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
134 |
if (s == null) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
135 |
error("Resource key does not start with a standard prefix: " + rk); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
136 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
137 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
138 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
139 |
if (codeStrings.contains(s)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
140 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
141 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
142 |
// keys ending in .1 are often synthesized |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
143 |
if (s.endsWith(".1") && codeStrings.contains(s.substring(0, s.length() - 2))) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
144 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
145 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
146 |
// verbose keys are generated by ClassReader.printVerbose |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
147 |
if (s.startsWith("verbose.") && codeStrings.contains(s.substring(8))) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
148 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
149 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
150 |
// mandatory warning messages are synthesized with no characteristic substring |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
151 |
if (isMandatoryWarningString(s)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
152 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
153 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
154 |
// check known (valid) exceptions |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
155 |
if (knownRequired.contains(rk)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
156 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
157 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
158 |
// check known suspects |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
159 |
if (needToInvestigate.contains(rk)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
160 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
161 |
|
23114 | 162 |
//check lint description keys: |
163 |
if (s.startsWith("opt.Xlint.desc.")) { |
|
164 |
String option = s.substring(15); |
|
165 |
boolean found = false; |
|
166 |
||
167 |
for (LintCategory lc : LintCategory.values()) { |
|
168 |
if (option.equals(lc.option)) |
|
169 |
found = true; |
|
170 |
} |
|
171 |
||
172 |
if (found) |
|
173 |
continue; |
|
174 |
} |
|
175 |
||
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
176 |
error("Resource key not found in code: " + rk); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
177 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
178 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
179 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
180 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
181 |
* The keys for mandatory warning messages are all synthesized and do not |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
182 |
* have a significant recognizable substring to look for. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
183 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
184 |
private boolean isMandatoryWarningString(String s) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
185 |
String[] bases = { "deprecated", "unchecked", "varargs", "sunapi" }; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
186 |
String[] tails = { ".filename", ".filename.additional", ".plural", ".plural.additional", ".recompile" }; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
187 |
for (String b: bases) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
188 |
if (s.startsWith(b)) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
189 |
String tail = s.substring(b.length()); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
190 |
for (String t: tails) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
191 |
if (tail.equals(t)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
192 |
return true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
193 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
194 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
195 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
196 |
return false; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
197 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
198 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
199 |
Set<String> knownRequired = new TreeSet<String>(Arrays.asList( |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
200 |
// See Resolve.getErrorKey |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
201 |
"compiler.err.cant.resolve.args", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
202 |
"compiler.err.cant.resolve.args.params", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
203 |
"compiler.err.cant.resolve.location.args", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
204 |
"compiler.err.cant.resolve.location.args.params", |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
12213
diff
changeset
|
205 |
"compiler.misc.cant.resolve.location.args", |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
12213
diff
changeset
|
206 |
"compiler.misc.cant.resolve.location.args.params", |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
207 |
// JavaCompiler, reports #errors and #warnings |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
208 |
"compiler.misc.count.error", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
209 |
"compiler.misc.count.error.plural", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
210 |
"compiler.misc.count.warn", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
211 |
"compiler.misc.count.warn.plural", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
212 |
// Used for LintCategory |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
213 |
"compiler.warn.lintOption", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
214 |
// Other |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
215 |
"compiler.misc.base.membership" // (sic) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
216 |
)); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
217 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
218 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
219 |
Set<String> needToInvestigate = new TreeSet<String>(Arrays.asList( |
15385 | 220 |
"compiler.misc.fatal.err.cant.close.loader", // Supressed by JSR308 |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
221 |
"compiler.err.cant.read.file", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
222 |
"compiler.err.illegal.self.ref", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
223 |
"compiler.err.io.exception", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
224 |
"compiler.err.limit.pool.in.class", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
225 |
"compiler.err.name.reserved.for.internal.use", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
226 |
"compiler.err.no.match.entry", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
227 |
"compiler.err.not.within.bounds.explain", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
228 |
"compiler.err.signature.doesnt.match.intf", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
229 |
"compiler.err.signature.doesnt.match.supertype", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
230 |
"compiler.err.type.var.more.than.once", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
231 |
"compiler.err.type.var.more.than.once.in.result", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
232 |
"compiler.misc.ccf.found.later.version", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
233 |
"compiler.misc.non.denotable.type", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
234 |
"compiler.misc.unnamed.package", // should be required, CR 6964147 |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
235 |
"compiler.misc.verbose.retro", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
236 |
"compiler.misc.verbose.retro.with", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
237 |
"compiler.misc.verbose.retro.with.list", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
238 |
"compiler.warn.proc.type.already.exists", // TODO in JavacFiler |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
239 |
"javac.err.invalid.arg", // UNUSED ?? |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
240 |
"javac.opt.arg.class", // UNUSED ?? |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
241 |
"javac.opt.arg.pathname", // UNUSED ?? |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
242 |
"javac.opt.moreinfo", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
243 |
"javac.opt.nogj", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
244 |
"javac.opt.printflat", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
245 |
"javac.opt.printsearch", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
246 |
"javac.opt.prompt", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
247 |
"javac.opt.retrofit", // UNUSED |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
248 |
"javac.opt.s", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
249 |
"javac.opt.scramble", // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
250 |
"javac.opt.scrambleall" // option commented out |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
251 |
)); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
252 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
253 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
254 |
* For all strings in the code that look like they might be fragments of |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
255 |
* a resource key, verify that a key exists. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
256 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
257 |
void findMissingKeys(Set<String> codeStrings, Set<String> resourceKeys) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
258 |
for (String cs: codeStrings) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
259 |
if (cs.matches("[A-Za-z][^.]*\\..*")) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
260 |
// ignore filenames (i.e. in SourceFile attribute |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
261 |
if (cs.matches(".*\\.java")) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
262 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
263 |
// ignore package and class names |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
264 |
if (cs.matches("(com|java|javax|sun)\\.[A-Za-z.]+")) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
265 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
266 |
// explicit known exceptions |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
267 |
if (noResourceRequired.contains(cs)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
268 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
269 |
// look for matching resource |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
270 |
if (hasMatch(resourceKeys, cs)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
271 |
continue; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
272 |
error("no match for \"" + cs + "\""); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
273 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
274 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
275 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
276 |
// where |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
277 |
private Set<String> noResourceRequired = new HashSet<String>(Arrays.asList( |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
278 |
// system properties |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
279 |
"application.home", // in Paths.java |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
280 |
"env.class.path", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
281 |
"line.separator", |
12213
516b112d6c68
7150368: javac should include basic ability to generate native headers
jjg
parents:
9087
diff
changeset
|
282 |
"os.name", |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
283 |
"user.dir", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
284 |
// file names |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
285 |
"ct.sym", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
286 |
"rt.jar", |
27579 | 287 |
"jfxrt.jar", |
288 |
"bootmodules.jimage", |
|
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
289 |
// -XD option names |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
290 |
"process.packages", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
291 |
"ignore.symbol.file", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
292 |
// prefix/embedded strings |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
293 |
"compiler.", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
294 |
"compiler.misc.", |
23114 | 295 |
"opt.Xlint.desc.", |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
296 |
"count.", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
297 |
"illegal.", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
298 |
"javac.", |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
299 |
"verbose." |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
300 |
)); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
301 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
302 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
303 |
* Look for a resource that ends in this string fragment. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
304 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
305 |
boolean hasMatch(Set<String> resourceKeys, String s) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
306 |
for (String rk: resourceKeys) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
307 |
if (rk.endsWith(s)) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
308 |
return true; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
309 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
310 |
return false; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
311 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
312 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
313 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
314 |
* Get the set of strings from (most of) the javac classfiles. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
315 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
316 |
Set<String> getCodeStrings() throws IOException { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
317 |
Set<String> results = new TreeSet<String>(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
318 |
JavaCompiler c = ToolProvider.getSystemJavaCompiler(); |
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
319 |
try (JavaFileManager fm = c.getStandardFileManager(null, null, null)) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
320 |
JavaFileManager.Location javacLoc = findJavacLocation(fm); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
321 |
String[] pkgs = { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
322 |
"javax.annotation.processing", |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
323 |
"javax.lang.model", |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
324 |
"javax.tools", |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
325 |
"com.sun.source", |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
326 |
"com.sun.tools.javac" |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
327 |
}; |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
328 |
for (String pkg: pkgs) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
329 |
for (JavaFileObject fo: fm.list(javacLoc, |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
330 |
pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
331 |
String name = fo.getName(); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
332 |
// ignore resource files, and files which are not really part of javac |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
333 |
if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*") |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
334 |
|| name.matches(".*CreateSymbols\\.class.*")) |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
335 |
continue; |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
336 |
scan(fo, results); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
337 |
} |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
338 |
} |
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
23114
diff
changeset
|
339 |
return results; |
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
340 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
341 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
342 |
|
6144
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
343 |
// depending on how the test is run, javac may be on bootclasspath or classpath |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
344 |
JavaFileManager.Location findJavacLocation(JavaFileManager fm) { |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
345 |
JavaFileManager.Location[] locns = |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
346 |
{ StandardLocation.PLATFORM_CLASS_PATH, StandardLocation.CLASS_PATH }; |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
347 |
try { |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
348 |
for (JavaFileManager.Location l: locns) { |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
349 |
JavaFileObject fo = fm.getJavaFileForInput(l, |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
350 |
"com.sun.tools.javac.Main", JavaFileObject.Kind.CLASS); |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
351 |
if (fo != null) |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
352 |
return l; |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
353 |
} |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
354 |
} catch (IOException e) { |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
355 |
throw new Error(e); |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
356 |
} |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
357 |
throw new IllegalStateException("Cannot find javac"); |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
358 |
} |
12fbc9782944
6968434: test CheckResourceKeys fails on control builds
jjg
parents:
6031
diff
changeset
|
359 |
|
6031
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
360 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
361 |
* Get the set of strings from a class file. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
362 |
* Only strings that look like they might be a resource key are returned. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
363 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
364 |
void scan(JavaFileObject fo, Set<String> results) throws IOException { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
365 |
InputStream in = fo.openInputStream(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
366 |
try { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
367 |
ClassFile cf = ClassFile.read(in); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
368 |
for (ConstantPool.CPInfo cpinfo: cf.constant_pool.entries()) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
369 |
if (cpinfo.getTag() == ConstantPool.CONSTANT_Utf8) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
370 |
String v = ((ConstantPool.CONSTANT_Utf8_info) cpinfo).value; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
371 |
if (v.matches("[A-Za-z0-9-_.]+")) |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
372 |
results.add(v); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
373 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
374 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
375 |
} catch (ConstantPoolException ignore) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
376 |
} finally { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
377 |
in.close(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
378 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
379 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
380 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
381 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
382 |
* Get the set of keys from the javac resource bundles. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
383 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
384 |
Set<String> getResourceKeys() { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
385 |
Set<String> results = new TreeSet<String>(); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
386 |
for (String name : new String[]{"javac", "compiler"}) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
387 |
ResourceBundle b = |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
388 |
ResourceBundle.getBundle("com.sun.tools.javac.resources." + name); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
389 |
results.addAll(b.keySet()); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
390 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
391 |
return results; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
392 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
393 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
394 |
/** |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
395 |
* Report an error. |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
396 |
*/ |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
397 |
void error(String msg) { |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
398 |
System.err.println("Error: " + msg); |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
399 |
errors++; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
400 |
} |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
401 |
|
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
402 |
int errors; |
50004868a787
6964768: need test program to validate javac resource bundles
jjg
parents:
diff
changeset
|
403 |
} |