1.1 --- a/test/tools/javac/lambda/MethodReferenceParserTest.java Fri Oct 05 14:21:09 2012 -0700
1.2 +++ b/test/tools/javac/lambda/MethodReferenceParserTest.java Sat Oct 06 10:35:38 2012 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -42,14 +42,14 @@
1.11 static int checkCount = 0;
1.12
1.13 enum ReferenceKind {
1.14 - METHOD_REF("#Q##Gm"),
1.15 - CONSTRUCTOR_REF("#Q##Gnew"),
1.16 + METHOD_REF("#Q::#Gm"),
1.17 + CONSTRUCTOR_REF("#Q::#Gnew"),
1.18 FALSE_REF("min < max"),
1.19 - ERR_SUPER("#Q##Gsuper"),
1.20 - ERR_METH0("#Q##Gm()"),
1.21 - ERR_METH1("#Q##Gm(X)"),
1.22 - ERR_CONSTR0("#Q##Gnew()"),
1.23 - ERR_CONSTR1("#Q##Gnew(X)");
1.24 + ERR_SUPER("#Q::#Gsuper"),
1.25 + ERR_METH0("#Q::#Gm()"),
1.26 + ERR_METH1("#Q::#Gm(X)"),
1.27 + ERR_CONSTR0("#Q::#Gnew()"),
1.28 + ERR_CONSTR1("#Q::#Gnew(X)");
1.29
1.30 String referenceTemplate;
1.31
1.32 @@ -110,6 +110,8 @@
1.33 METHOD("m()"),
1.34 FIELD("a.f"),
1.35 UBOUND_SIMPLE("A"),
1.36 + UNBOUND_ARRAY1("int[]"),
1.37 + UNBOUND_ARRAY2("A<G>[][]"),
1.38 UNBOUND_GENERIC1("A<X>"),
1.39 UNBOUND_GENERIC2("A<X, Y>"),
1.40 UNBOUND_GENERIC3("A<? extends X, ? super Y>"),
1.41 @@ -125,7 +127,7 @@
1.42 }
1.43
1.44 enum ExprKind {
1.45 - NONE("#R#S"),
1.46 + NONE("#R::S"),
1.47 SINGLE_PAREN1("(#R#S)"),
1.48 SINGLE_PAREN2("(#R)#S"),
1.49 DOUBLE_PAREN1("((#R#S))"),
