diff -r 000000000000 -r 959103a6100f test/com/sun/javadoc/testPackagePage/TestPackagePage.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Wed Apr 27 01:34:52 2016 +0800
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2002, 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
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4492643 4689286
+ * @summary Test that a package page is properly generated when a .java file
+ * passed to Javadoc.  Also test that the proper package links are generated
+ * when single or multiple packages are documented.
+ * @author jamieh
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestPackagePage
+ * @run main TestPackagePage
+ */
+
+public class TestPackagePage extends JavadocTester {
+
+    private static final String BUG_ID = "4492643-4689286";
+    private static final String[][] TEST1 = {
+        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-summary.html",
+            "This is a package page."
+        },
+        //With just one package, all general pages link to the single package page.
+        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "C.html",
+            "<a href=\"../../com/pkg/package-summary.html\">Package</a>"
+        },
+        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-tree.html",
+            "<li><a href=\"../../com/pkg/package-summary.html\">Package</a></li>"
+        },
+        {BUG_ID + "-1" + FS + "deprecated-list.html",
+            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
+        },
+        {BUG_ID + "-1" + FS + "index-all.html",
+            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
+        },
+        {BUG_ID + "-1" + FS + "help-doc.html",
+            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
+        },
+    };
+
+    private static final String[][] TEST2 = {
+        //With multiple packages, there is no package link in general pages.
+        {BUG_ID + "-2" + FS + "deprecated-list.html",
+            "<li>Package</li>"
+        },
+        {BUG_ID + "-2" + FS + "index-all.html",
+            "<li>Package</li>"
+        },
+        {BUG_ID + "-2" + FS + "help-doc.html",
+            "<li>Package</li>"
+        },
+    };
+
+    private static final String[] ARGS1 =
+        new String[] {
+            "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
+            SRC_DIR + FS + "com" + FS + "pkg" + FS + "C.java"
+        };
+
+    private static final String[] ARGS2 =
+        new String[] {
+            "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR,
+            "com.pkg", "pkg2"
+        };
+
+    /**
+     * The entry point of the test.
+     * @param args the array of command line arguments.
+     */
+    public static void main(String[] args) {
+        TestPackagePage tester = new TestPackagePage();
+        run(tester, ARGS1, TEST1, NO_TEST);
+        run(tester, ARGS2, TEST2, NO_TEST);
+        tester.printSummary();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugId() {
+        return BUG_ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugName() {
+        return getClass().getName();
+    }
+}