diff -r 000000000000 -r 9a66ca7c79fa test/tools/apt/mirror/type/ArrayTyp.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/apt/mirror/type/ArrayTyp.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2004-2007 Sun Microsystems, Inc.  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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug 4853450 5009357
+ * @summary ArrayType tests
+ * @library ../../lib
+ * @compile -source 1.5 ArrayTyp.java
+ * @run main ArrayTyp
+ */
+
+
+import java.util.*;
+import com.sun.mirror.declaration.*;
+import com.sun.mirror.type.*;
+import com.sun.mirror.util.*;
+
+
+public class ArrayTyp extends Tester {
+
+    public static void main(String[] args) {
+        (new ArrayTyp()).run();
+    }
+
+
+    // Declaration used by tests
+
+    private boolean[] bs;
+    private String[][] bss;
+
+
+    private ArrayType arr;              // an array type
+    private ArrayType arrarr;           // a multi-dimensional array type
+
+    protected void init() {
+        arr = (ArrayType) getField("bs").getType();
+        arrarr = (ArrayType) getField("bss").getType();
+    }
+
+
+    // TypeMirror methods
+
+    @Test(result="array")
+    Collection<String> accept() {
+        final Collection<String> res = new ArrayList<String>();
+
+        arr.accept(new SimpleTypeVisitor() {
+            public void visitTypeMirror(TypeMirror t) {
+                res.add("type");
+            }
+            public void visitArrayType(ArrayType t) {
+                res.add("array");
+            }
+            public void visitReferenceType(ReferenceType t) {
+                res.add("ref type");
+            }
+        });
+        return res;
+    }
+
+    @Test(result="boolean[]")
+    String toStringTest() {
+        return arr.toString();
+    }
+
+    @Test(result="java.lang.String[][]")
+    String toStringTestMulti() {
+        return arrarr.toString();
+    }
+
+
+    // ArrayType method
+
+    @Test(result="boolean")
+    TypeMirror getComponentType() {
+        return (PrimitiveType) arr.getComponentType();
+    }
+
+    @Test(result="java.lang.String[]")
+    TypeMirror getComponentTypeMulti() {
+        return (ArrayType) arrarr.getComponentType();
+    }
+}