Mon, 21 Jan 2013 11:16:28 -0800
Merge
mcimadamore@1145 | 1 | /* |
vromero@1482 | 2 | * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
mcimadamore@1145 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
mcimadamore@1145 | 4 | * |
mcimadamore@1145 | 5 | * This code is free software; you can redistribute it and/or modify it |
mcimadamore@1145 | 6 | * under the terms of the GNU General Public License version 2 only, as |
mcimadamore@1145 | 7 | * published by the Free Software Foundation. |
mcimadamore@1145 | 8 | * |
mcimadamore@1145 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
mcimadamore@1145 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
mcimadamore@1145 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
mcimadamore@1145 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
mcimadamore@1145 | 13 | * accompanied this code). |
mcimadamore@1145 | 14 | * |
mcimadamore@1145 | 15 | * You should have received a copy of the GNU General Public License version |
mcimadamore@1145 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
mcimadamore@1145 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
mcimadamore@1145 | 18 | * |
mcimadamore@1145 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
mcimadamore@1145 | 20 | * or visit www.oracle.com if you need additional information or have any |
mcimadamore@1145 | 21 | * questions. |
mcimadamore@1145 | 22 | */ |
mcimadamore@1145 | 23 | |
mcimadamore@1145 | 24 | /* |
mcimadamore@1145 | 25 | * @test |
mcimadamore@1145 | 26 | * @bug 7115052 |
mcimadamore@1415 | 27 | * @bug 8003280 |
mcimadamore@1415 | 28 | * @summary Add lambda tests |
mcimadamore@1415 | 29 | * Add parser support for method references |
vromero@1482 | 30 | * @library ../lib |
vromero@1482 | 31 | * @build JavacTestingAbstractThreadedTest |
vromero@1482 | 32 | * @run main MethodReferenceParserTest |
mcimadamore@1145 | 33 | */ |
mcimadamore@1145 | 34 | |
mcimadamore@1145 | 35 | import java.net.URI; |
mcimadamore@1145 | 36 | import java.util.Arrays; |
mcimadamore@1145 | 37 | import javax.tools.Diagnostic; |
mcimadamore@1145 | 38 | import javax.tools.JavaFileObject; |
mcimadamore@1145 | 39 | import javax.tools.SimpleJavaFileObject; |
vromero@1482 | 40 | import com.sun.source.util.JavacTask; |
mcimadamore@1145 | 41 | |
vromero@1482 | 42 | public class MethodReferenceParserTest |
vromero@1482 | 43 | extends JavacTestingAbstractThreadedTest |
vromero@1482 | 44 | implements Runnable { |
mcimadamore@1145 | 45 | |
mcimadamore@1145 | 46 | enum ReferenceKind { |
mcimadamore@1352 | 47 | METHOD_REF("#Q::#Gm"), |
mcimadamore@1352 | 48 | CONSTRUCTOR_REF("#Q::#Gnew"), |
mcimadamore@1165 | 49 | FALSE_REF("min < max"), |
mcimadamore@1352 | 50 | ERR_SUPER("#Q::#Gsuper"), |
mcimadamore@1352 | 51 | ERR_METH0("#Q::#Gm()"), |
mcimadamore@1352 | 52 | ERR_METH1("#Q::#Gm(X)"), |
mcimadamore@1352 | 53 | ERR_CONSTR0("#Q::#Gnew()"), |
mcimadamore@1352 | 54 | ERR_CONSTR1("#Q::#Gnew(X)"); |
mcimadamore@1145 | 55 | |
mcimadamore@1145 | 56 | String referenceTemplate; |
mcimadamore@1145 | 57 | |
mcimadamore@1145 | 58 | ReferenceKind(String referenceTemplate) { |
mcimadamore@1145 | 59 | this.referenceTemplate = referenceTemplate; |
mcimadamore@1145 | 60 | } |
mcimadamore@1145 | 61 | |
mcimadamore@1145 | 62 | String getReferenceString(QualifierKind qk, GenericKind gk) { |
mcimadamore@1145 | 63 | return referenceTemplate |
mcimadamore@1145 | 64 | .replaceAll("#Q", qk.qualifier) |
mcimadamore@1145 | 65 | .replaceAll("#G", gk.typeParameters); |
mcimadamore@1145 | 66 | } |
mcimadamore@1145 | 67 | |
mcimadamore@1145 | 68 | boolean erroneous() { |
mcimadamore@1145 | 69 | switch (this) { |
mcimadamore@1145 | 70 | case ERR_SUPER: |
mcimadamore@1145 | 71 | case ERR_METH0: |
mcimadamore@1145 | 72 | case ERR_METH1: |
mcimadamore@1145 | 73 | case ERR_CONSTR0: |
mcimadamore@1145 | 74 | case ERR_CONSTR1: |
mcimadamore@1145 | 75 | return true; |
mcimadamore@1145 | 76 | default: return false; |
mcimadamore@1145 | 77 | } |
mcimadamore@1145 | 78 | } |
mcimadamore@1145 | 79 | } |
mcimadamore@1145 | 80 | |
mcimadamore@1165 | 81 | enum ContextKind { |
mcimadamore@1165 | 82 | ASSIGN("SAM s = #E;"), |
mcimadamore@1165 | 83 | METHOD("m(#E, i);"); |
mcimadamore@1165 | 84 | |
mcimadamore@1165 | 85 | String contextTemplate; |
mcimadamore@1165 | 86 | |
mcimadamore@1165 | 87 | ContextKind(String contextTemplate) { |
mcimadamore@1165 | 88 | this.contextTemplate = contextTemplate; |
mcimadamore@1165 | 89 | } |
mcimadamore@1165 | 90 | |
vromero@1482 | 91 | String contextString(ExprKind ek, ReferenceKind rk, QualifierKind qk, |
vromero@1482 | 92 | GenericKind gk, SubExprKind sk) { |
mcimadamore@1165 | 93 | return contextTemplate.replaceAll("#E", ek.expressionString(rk, qk, gk, sk)); |
mcimadamore@1165 | 94 | } |
mcimadamore@1165 | 95 | } |
mcimadamore@1165 | 96 | |
mcimadamore@1145 | 97 | enum GenericKind { |
mcimadamore@1145 | 98 | NONE(""), |
mcimadamore@1145 | 99 | ONE("<X>"), |
mcimadamore@1145 | 100 | TWO("<X,Y>"); |
mcimadamore@1145 | 101 | |
mcimadamore@1145 | 102 | String typeParameters; |
mcimadamore@1145 | 103 | |
mcimadamore@1145 | 104 | GenericKind(String typeParameters) { |
mcimadamore@1145 | 105 | this.typeParameters = typeParameters; |
mcimadamore@1145 | 106 | } |
mcimadamore@1145 | 107 | } |
mcimadamore@1145 | 108 | |
mcimadamore@1145 | 109 | enum QualifierKind { |
mcimadamore@1145 | 110 | THIS("this"), |
mcimadamore@1145 | 111 | SUPER("super"), |
mcimadamore@1145 | 112 | NEW("new Foo()"), |
mcimadamore@1145 | 113 | METHOD("m()"), |
mcimadamore@1145 | 114 | FIELD("a.f"), |
mcimadamore@1145 | 115 | UBOUND_SIMPLE("A"), |
mcimadamore@1352 | 116 | UNBOUND_ARRAY1("int[]"), |
mcimadamore@1352 | 117 | UNBOUND_ARRAY2("A<G>[][]"), |
mcimadamore@1145 | 118 | UNBOUND_GENERIC1("A<X>"), |
mcimadamore@1145 | 119 | UNBOUND_GENERIC2("A<X, Y>"), |
mcimadamore@1165 | 120 | UNBOUND_GENERIC3("A<? extends X, ? super Y>"), |
mcimadamore@1165 | 121 | UNBOUND_GENERIC4("A<int[], short[][]>"), |
mcimadamore@1165 | 122 | NESTED_GENERIC1("A<A<X,Y>, A<X,Y>>"), |
mcimadamore@1165 | 123 | NESTED_GENERIC2("A<A<A<X,Y>,A<X,Y>>, A<A<X,Y>,A<X,Y>>>"); |
mcimadamore@1145 | 124 | |
mcimadamore@1145 | 125 | String qualifier; |
mcimadamore@1145 | 126 | |
mcimadamore@1145 | 127 | QualifierKind(String qualifier) { |
mcimadamore@1145 | 128 | this.qualifier = qualifier; |
mcimadamore@1145 | 129 | } |
mcimadamore@1145 | 130 | } |
mcimadamore@1145 | 131 | |
mcimadamore@1145 | 132 | enum ExprKind { |
mcimadamore@1352 | 133 | NONE("#R::S"), |
mcimadamore@1145 | 134 | SINGLE_PAREN1("(#R#S)"), |
mcimadamore@1145 | 135 | SINGLE_PAREN2("(#R)#S"), |
mcimadamore@1145 | 136 | DOUBLE_PAREN1("((#R#S))"), |
mcimadamore@1145 | 137 | DOUBLE_PAREN2("((#R)#S)"), |
mcimadamore@1145 | 138 | DOUBLE_PAREN3("((#R))#S"); |
mcimadamore@1145 | 139 | |
mcimadamore@1145 | 140 | String expressionTemplate; |
mcimadamore@1145 | 141 | |
mcimadamore@1145 | 142 | ExprKind(String expressionTemplate) { |
mcimadamore@1145 | 143 | this.expressionTemplate = expressionTemplate; |
mcimadamore@1145 | 144 | } |
mcimadamore@1145 | 145 | |
mcimadamore@1145 | 146 | String expressionString(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk) { |
mcimadamore@1145 | 147 | return expressionTemplate |
mcimadamore@1145 | 148 | .replaceAll("#R", rk.getReferenceString(qk, gk)) |
mcimadamore@1145 | 149 | .replaceAll("#S", sk.subExpression); |
mcimadamore@1145 | 150 | } |
mcimadamore@1145 | 151 | } |
mcimadamore@1145 | 152 | |
mcimadamore@1145 | 153 | enum SubExprKind { |
mcimadamore@1145 | 154 | NONE(""), |
mcimadamore@1145 | 155 | SELECT_FIELD(".f"), |
mcimadamore@1145 | 156 | SELECT_METHOD(".f()"), |
mcimadamore@1145 | 157 | SELECT_NEW(".new Foo()"), |
mcimadamore@1145 | 158 | POSTINC("++"), |
mcimadamore@1145 | 159 | POSTDEC("--"); |
mcimadamore@1145 | 160 | |
mcimadamore@1145 | 161 | String subExpression; |
mcimadamore@1145 | 162 | |
mcimadamore@1145 | 163 | SubExprKind(String subExpression) { |
mcimadamore@1145 | 164 | this.subExpression = subExpression; |
mcimadamore@1145 | 165 | } |
mcimadamore@1145 | 166 | } |
mcimadamore@1145 | 167 | |
mcimadamore@1145 | 168 | public static void main(String... args) throws Exception { |
mcimadamore@1145 | 169 | for (ReferenceKind rk : ReferenceKind.values()) { |
mcimadamore@1145 | 170 | for (QualifierKind qk : QualifierKind.values()) { |
mcimadamore@1145 | 171 | for (GenericKind gk : GenericKind.values()) { |
mcimadamore@1145 | 172 | for (SubExprKind sk : SubExprKind.values()) { |
mcimadamore@1145 | 173 | for (ExprKind ek : ExprKind.values()) { |
mcimadamore@1165 | 174 | for (ContextKind ck : ContextKind.values()) { |
vromero@1482 | 175 | pool.execute(new MethodReferenceParserTest(rk, qk, gk, sk, ek, ck)); |
mcimadamore@1165 | 176 | } |
mcimadamore@1145 | 177 | } |
mcimadamore@1145 | 178 | } |
mcimadamore@1145 | 179 | } |
mcimadamore@1145 | 180 | } |
mcimadamore@1145 | 181 | } |
vromero@1482 | 182 | |
vromero@1482 | 183 | checkAfterExec(); |
mcimadamore@1145 | 184 | } |
mcimadamore@1145 | 185 | |
mcimadamore@1145 | 186 | ReferenceKind rk; |
mcimadamore@1145 | 187 | QualifierKind qk; |
mcimadamore@1145 | 188 | GenericKind gk; |
mcimadamore@1145 | 189 | SubExprKind sk; |
mcimadamore@1145 | 190 | ExprKind ek; |
mcimadamore@1165 | 191 | ContextKind ck; |
mcimadamore@1145 | 192 | JavaSource source; |
mcimadamore@1145 | 193 | DiagnosticChecker diagChecker; |
mcimadamore@1145 | 194 | |
mcimadamore@1165 | 195 | MethodReferenceParserTest(ReferenceKind rk, QualifierKind qk, GenericKind gk, SubExprKind sk, ExprKind ek, ContextKind ck) { |
mcimadamore@1145 | 196 | this.rk = rk; |
mcimadamore@1145 | 197 | this.qk = qk; |
mcimadamore@1145 | 198 | this.gk = gk; |
mcimadamore@1145 | 199 | this.sk = sk; |
mcimadamore@1145 | 200 | this.ek = ek; |
mcimadamore@1165 | 201 | this.ck = ck; |
mcimadamore@1145 | 202 | this.source = new JavaSource(); |
mcimadamore@1145 | 203 | this.diagChecker = new DiagnosticChecker(); |
mcimadamore@1145 | 204 | } |
mcimadamore@1145 | 205 | |
mcimadamore@1145 | 206 | class JavaSource extends SimpleJavaFileObject { |
mcimadamore@1145 | 207 | |
mcimadamore@1145 | 208 | String template = "class Test {\n" + |
mcimadamore@1165 | 209 | " void test() {\n" + |
mcimadamore@1165 | 210 | " #C\n" + |
mcimadamore@1165 | 211 | " }" + |
mcimadamore@1145 | 212 | "}"; |
mcimadamore@1145 | 213 | |
mcimadamore@1145 | 214 | String source; |
mcimadamore@1145 | 215 | |
mcimadamore@1145 | 216 | public JavaSource() { |
mcimadamore@1145 | 217 | super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
mcimadamore@1165 | 218 | source = template.replaceAll("#C", ck.contextString(ek, rk, qk, gk, sk)); |
mcimadamore@1145 | 219 | } |
mcimadamore@1145 | 220 | |
mcimadamore@1145 | 221 | @Override |
mcimadamore@1145 | 222 | public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
mcimadamore@1145 | 223 | return source; |
mcimadamore@1145 | 224 | } |
mcimadamore@1145 | 225 | } |
mcimadamore@1145 | 226 | |
vromero@1482 | 227 | @Override |
vromero@1482 | 228 | public void run() { |
vromero@1482 | 229 | JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), diagChecker, |
mcimadamore@1415 | 230 | null, null, Arrays.asList(source)); |
mcimadamore@1145 | 231 | try { |
mcimadamore@1145 | 232 | ct.parse(); |
mcimadamore@1145 | 233 | } catch (Throwable ex) { |
vromero@1482 | 234 | processException(ex); |
vromero@1482 | 235 | return; |
mcimadamore@1145 | 236 | } |
mcimadamore@1145 | 237 | check(); |
mcimadamore@1145 | 238 | } |
mcimadamore@1145 | 239 | |
mcimadamore@1145 | 240 | void check() { |
vromero@1482 | 241 | checkCount.incrementAndGet(); |
mcimadamore@1145 | 242 | |
mcimadamore@1145 | 243 | if (diagChecker.errorFound != rk.erroneous()) { |
mcimadamore@1145 | 244 | throw new Error("invalid diagnostics for source:\n" + |
mcimadamore@1145 | 245 | source.getCharContent(true) + |
mcimadamore@1145 | 246 | "\nFound error: " + diagChecker.errorFound + |
mcimadamore@1145 | 247 | "\nExpected error: " + rk.erroneous()); |
mcimadamore@1145 | 248 | } |
mcimadamore@1145 | 249 | } |
mcimadamore@1145 | 250 | |
mcimadamore@1145 | 251 | static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { |
mcimadamore@1145 | 252 | |
mcimadamore@1145 | 253 | boolean errorFound; |
mcimadamore@1145 | 254 | |
mcimadamore@1145 | 255 | public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
mcimadamore@1145 | 256 | if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { |
mcimadamore@1145 | 257 | errorFound = true; |
mcimadamore@1145 | 258 | } |
mcimadamore@1145 | 259 | } |
mcimadamore@1145 | 260 | } |
vromero@1482 | 261 | |
mcimadamore@1145 | 262 | } |