diff -r f4e45397722a -r d4b3cb1ece84 test/tools/javac/lambda/MethodReferenceParserTest.java
--- a/test/tools/javac/lambda/MethodReferenceParserTest.java	Fri Oct 05 14:21:09 2012 -0700
+++ b/test/tools/javac/lambda/MethodReferenceParserTest.java	Sat Oct 06 10:35:38 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,14 +42,14 @@
     static int checkCount = 0;
 
     enum ReferenceKind {
-        METHOD_REF("#Q##Gm"),
-        CONSTRUCTOR_REF("#Q##Gnew"),
+        METHOD_REF("#Q::#Gm"),
+        CONSTRUCTOR_REF("#Q::#Gnew"),
         FALSE_REF("min < max"),
-        ERR_SUPER("#Q##Gsuper"),
-        ERR_METH0("#Q##Gm()"),
-        ERR_METH1("#Q##Gm(X)"),
-        ERR_CONSTR0("#Q##Gnew()"),
-        ERR_CONSTR1("#Q##Gnew(X)");
+        ERR_SUPER("#Q::#Gsuper"),
+        ERR_METH0("#Q::#Gm()"),
+        ERR_METH1("#Q::#Gm(X)"),
+        ERR_CONSTR0("#Q::#Gnew()"),
+        ERR_CONSTR1("#Q::#Gnew(X)");
 
         String referenceTemplate;
 
@@ -110,6 +110,8 @@
         METHOD("m()"),
         FIELD("a.f"),
         UBOUND_SIMPLE("A"),
+        UNBOUND_ARRAY1("int[]"),
+        UNBOUND_ARRAY2("A<G>[][]"),
         UNBOUND_GENERIC1("A<X>"),
         UNBOUND_GENERIC2("A<X, Y>"),
         UNBOUND_GENERIC3("A<? extends X, ? super Y>"),
@@ -125,7 +127,7 @@
     }
 
     enum ExprKind {
-        NONE("#R#S"),
+        NONE("#R::S"),
         SINGLE_PAREN1("(#R#S)"),
         SINGLE_PAREN2("(#R)#S"),
         DOUBLE_PAREN1("((#R#S))"),