Wed, 15 Oct 2008 17:23:55 +0100
6759682: APT: compiler message file broken after refactoring of com.sun.tools.javac.util.Message
Summary: JavacMessages should refresh its own bundle cache when a new resource bundle is added by APT
Reviewed-by: jjg
duke@1 | 1 | /* |
duke@1 | 2 | * Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
duke@1 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 21 | * have any questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | |
duke@1 | 25 | /* |
duke@1 | 26 | * @test |
duke@1 | 27 | * @bug 4853450 5009360 5055963 |
duke@1 | 28 | * @summary ClassType tests |
duke@1 | 29 | * @library ../../lib |
jjg@132 | 30 | * @run main/othervm ClassTyp |
duke@1 | 31 | */ |
duke@1 | 32 | |
duke@1 | 33 | |
duke@1 | 34 | import java.util.*; |
duke@1 | 35 | import com.sun.mirror.declaration.*; |
duke@1 | 36 | import com.sun.mirror.type.*; |
duke@1 | 37 | import com.sun.mirror.util.*; |
duke@1 | 38 | |
duke@1 | 39 | |
duke@1 | 40 | public class ClassTyp<T1,T2> extends Tester { |
duke@1 | 41 | |
duke@1 | 42 | public static void main(String[] args) { |
duke@1 | 43 | (new ClassTyp()).run(); |
duke@1 | 44 | } |
duke@1 | 45 | |
duke@1 | 46 | |
duke@1 | 47 | // Declarations used by tests |
duke@1 | 48 | |
duke@1 | 49 | static class C1<S> extends AbstractSet<S> implements Set<S> { |
duke@1 | 50 | class C2<R> { |
duke@1 | 51 | } |
duke@1 | 52 | |
duke@1 | 53 | static class C3<R> { |
duke@1 | 54 | class C4<Q> { |
duke@1 | 55 | } |
duke@1 | 56 | } |
duke@1 | 57 | |
duke@1 | 58 | public Iterator<S> iterator() { |
duke@1 | 59 | return null; |
duke@1 | 60 | } |
duke@1 | 61 | |
duke@1 | 62 | public int size() { |
duke@1 | 63 | return 0; |
duke@1 | 64 | } |
duke@1 | 65 | } |
duke@1 | 66 | |
duke@1 | 67 | |
duke@1 | 68 | // Generate some class types to test. |
duke@1 | 69 | private C1<T1> f0; |
duke@1 | 70 | private C1<String> f1; |
duke@1 | 71 | private C1 f2; |
duke@1 | 72 | private C1.C3<T2> f3; |
duke@1 | 73 | private C1<T1>.C2<T2> f4; |
duke@1 | 74 | private C1.C2 f5; |
duke@1 | 75 | private C1<T1> f6; |
duke@1 | 76 | private C1.C3<T2>.C4<T1> f7; |
duke@1 | 77 | private static final int NUMTYPES = 8; |
duke@1 | 78 | |
duke@1 | 79 | // Type mirrors corresponding to the types of the above fields |
duke@1 | 80 | private ClassType[] t = new ClassType[NUMTYPES]; |
duke@1 | 81 | |
duke@1 | 82 | // One more type: our own. |
duke@1 | 83 | private ClassTyp<T1,T2> me = this; |
duke@1 | 84 | |
duke@1 | 85 | |
duke@1 | 86 | protected void init() { |
duke@1 | 87 | for (int i = 0; i < t.length; i++) { |
duke@1 | 88 | t[i] = (ClassType) getField("f"+i).getType(); |
duke@1 | 89 | } |
duke@1 | 90 | } |
duke@1 | 91 | |
duke@1 | 92 | |
duke@1 | 93 | // TypeMirror methods |
duke@1 | 94 | |
duke@1 | 95 | @Test(result="class") |
duke@1 | 96 | Collection<String> accept() { |
duke@1 | 97 | final Collection<String> res = new ArrayList<String>(); |
duke@1 | 98 | |
duke@1 | 99 | t[0].accept(new SimpleTypeVisitor() { |
duke@1 | 100 | public void visitReferenceType(ReferenceType t) { |
duke@1 | 101 | res.add("ref type"); |
duke@1 | 102 | } |
duke@1 | 103 | public void visitClassType(ClassType t) { |
duke@1 | 104 | res.add("class"); |
duke@1 | 105 | } |
duke@1 | 106 | public void visitInterfaceType(InterfaceType t) { |
duke@1 | 107 | res.add("interface"); |
duke@1 | 108 | } |
duke@1 | 109 | }); |
duke@1 | 110 | return res; |
duke@1 | 111 | } |
duke@1 | 112 | |
duke@1 | 113 | @Test(result="true") |
duke@1 | 114 | boolean equals1() { |
duke@1 | 115 | return t[0].equals(t[0]); |
duke@1 | 116 | } |
duke@1 | 117 | |
duke@1 | 118 | @Test(result="false") |
duke@1 | 119 | boolean equals2() { |
duke@1 | 120 | return t[0].equals(t[1]); |
duke@1 | 121 | } |
duke@1 | 122 | |
duke@1 | 123 | // Raw type is not same as type instantiated with unbounded type var. |
duke@1 | 124 | @Test(result="false") |
duke@1 | 125 | boolean equals3() { |
duke@1 | 126 | return t[0].equals(t[2]); |
duke@1 | 127 | } |
duke@1 | 128 | |
duke@1 | 129 | // C1<T1> is same type as C1<T1> |
duke@1 | 130 | @Test(result="true") |
duke@1 | 131 | boolean equals4() { |
duke@1 | 132 | return t[0].equals(t[6]); |
duke@1 | 133 | } |
duke@1 | 134 | |
duke@1 | 135 | @Test(result={ |
duke@1 | 136 | "ClassTyp.C1<T1>", |
duke@1 | 137 | "ClassTyp.C1<java.lang.String>", |
duke@1 | 138 | "ClassTyp.C1", |
duke@1 | 139 | "ClassTyp.C1.C3<T2>", |
duke@1 | 140 | "ClassTyp.C1<T1>.C2<T2>", |
duke@1 | 141 | "ClassTyp.C1.C2", |
duke@1 | 142 | "ClassTyp.C1<T1>", |
duke@1 | 143 | "ClassTyp.C1.C3<T2>.C4<T1>" |
duke@1 | 144 | }, |
duke@1 | 145 | ordered=true) |
duke@1 | 146 | Collection<String> toStringTests() { |
duke@1 | 147 | Collection<String> res = new ArrayList<String>(); |
duke@1 | 148 | for (ClassType c : t) { |
duke@1 | 149 | res.add(c.toString()); |
duke@1 | 150 | } |
duke@1 | 151 | return res; |
duke@1 | 152 | } |
duke@1 | 153 | |
duke@1 | 154 | |
duke@1 | 155 | // DeclaredType methods |
duke@1 | 156 | |
duke@1 | 157 | @Test(result={"T1"}) |
duke@1 | 158 | Collection<TypeMirror> getActualTypeArguments1() { |
duke@1 | 159 | return t[0].getActualTypeArguments(); |
duke@1 | 160 | } |
duke@1 | 161 | |
duke@1 | 162 | @Test(result={}) |
duke@1 | 163 | Collection<TypeMirror> getActualTypeArguments2() { |
duke@1 | 164 | return t[2].getActualTypeArguments(); |
duke@1 | 165 | } |
duke@1 | 166 | |
duke@1 | 167 | @Test(result={"T2"}) |
duke@1 | 168 | Collection<TypeMirror> getActualTypeArguments3() { |
duke@1 | 169 | return t[3].getActualTypeArguments(); |
duke@1 | 170 | } |
duke@1 | 171 | |
duke@1 | 172 | @Test(result="null") |
duke@1 | 173 | DeclaredType getContainingType1() { |
duke@1 | 174 | ClassType thisType = (ClassType) getField("me").getType(); |
duke@1 | 175 | return thisType.getContainingType(); |
duke@1 | 176 | } |
duke@1 | 177 | |
duke@1 | 178 | @Test(result="ClassTyp") |
duke@1 | 179 | DeclaredType getContainingType2() { |
duke@1 | 180 | return t[0].getContainingType(); |
duke@1 | 181 | } |
duke@1 | 182 | |
duke@1 | 183 | @Test(result="ClassTyp.C1") |
duke@1 | 184 | DeclaredType getContainingType3() { |
duke@1 | 185 | return t[3].getContainingType(); |
duke@1 | 186 | } |
duke@1 | 187 | |
duke@1 | 188 | @Test(result="ClassTyp.C1<T1>") |
duke@1 | 189 | DeclaredType getContainingType4() { |
duke@1 | 190 | return t[4].getContainingType(); |
duke@1 | 191 | } |
duke@1 | 192 | |
duke@1 | 193 | @Test(result={"java.util.Set<T1>"}) |
duke@1 | 194 | Collection<InterfaceType> getSuperinterfaces() { |
duke@1 | 195 | return t[0].getSuperinterfaces(); |
duke@1 | 196 | } |
duke@1 | 197 | |
duke@1 | 198 | |
duke@1 | 199 | // ClassType methods |
duke@1 | 200 | |
duke@1 | 201 | @Test(result="ClassTyp.C1<S>") |
duke@1 | 202 | ClassDeclaration getDeclaration1() { |
duke@1 | 203 | return t[0].getDeclaration(); |
duke@1 | 204 | } |
duke@1 | 205 | |
duke@1 | 206 | @Test(result="ClassTyp.C1.C3<R>") |
duke@1 | 207 | ClassDeclaration getDeclaration2() { |
duke@1 | 208 | return t[3].getDeclaration(); |
duke@1 | 209 | } |
duke@1 | 210 | |
duke@1 | 211 | @Test(result="ClassTyp.C1<S>.C2<R>") |
duke@1 | 212 | ClassDeclaration getDeclaration3a() { |
duke@1 | 213 | return t[4].getDeclaration(); |
duke@1 | 214 | } |
duke@1 | 215 | |
duke@1 | 216 | @Test(result="ClassTyp.C1<S>.C2<R>") |
duke@1 | 217 | ClassDeclaration getDeclaration3b() { |
duke@1 | 218 | return t[5].getDeclaration(); |
duke@1 | 219 | } |
duke@1 | 220 | |
duke@1 | 221 | @Test(result="true") |
duke@1 | 222 | boolean getDeclarationEq() { |
duke@1 | 223 | return t[0].getDeclaration() == t[6].getDeclaration(); |
duke@1 | 224 | } |
duke@1 | 225 | |
duke@1 | 226 | @Test(result="java.util.AbstractSet<T1>") |
duke@1 | 227 | ClassType getSuperclass1() { |
duke@1 | 228 | return t[0].getSuperclass(); |
duke@1 | 229 | } |
duke@1 | 230 | |
duke@1 | 231 | @Test(result="java.lang.Object") |
duke@1 | 232 | ClassType getSuperclass2() { |
duke@1 | 233 | return t[4].getSuperclass(); |
duke@1 | 234 | } |
duke@1 | 235 | |
duke@1 | 236 | @Test(result="null") |
duke@1 | 237 | ClassType getSuperclassOfObject() { |
duke@1 | 238 | return t[4].getSuperclass().getSuperclass(); |
duke@1 | 239 | } |
duke@1 | 240 | } |