--- old/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Fri Jan 22 12:23:17 2016
+++ /dev/null	Fri Jan 22 12:23:17 2016
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4934778 4777599 6553182
- * @summary  Make sure that the -help option works properly.  Make sure
- *           the help link appears in the documentation.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester TestHelpOption
- * @run main TestHelpOption
- */
-
-public class TestHelpOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHelpOption tester = new TestHelpOption();
-        tester.runTests();
-    }
-
-    @Test
-    void testWithOption() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                "-help",
-                testSrc("TestHelpOption.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(true);
-    }
-
-    @Test
-    void testWithoutOption() {
-        javadoc("-d", "out2",
-                "-sourcepath", testSrc,
-                testSrc("TestHelpOption.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(false);
-    }
-
-    private void checkOutput(boolean withOption) {
-        checkOutput(Output.STDOUT, withOption,
-                "-d ",
-                "-use ",
-                "-version ",
-                "-author ",
-                "-docfilessubdirs ",
-                "-splitindex ",
-                "-windowtitle ",
-                "-doctitle ",
-                "-header ",
-                "-footer ",
-                "-bottom ",
-                "-link ",
-                "-linkoffline ",
-                "-excludedocfilessubdir ",
-                "-group ",
-                "-nocomment ",
-                "-nodeprecated ",
-                "-noqualifier ",
-                "-nosince ",
-                "-notimestamp ",
-                "-nodeprecatedlist ",
-                "-notree ",
-                "-noindex ",
-                "-nohelp ",
-                "-nonavbar ",
-                "-serialwarn ",
-                "-tag ",
-                "-taglet ",
-                "-tagletpath ",
-                "-charset ",
-                "-helpfile ",
-                "-linksource ",
-                "-sourcetab ",
-                "-keywords ",
-                "-stylesheetfile ",
-                "-docencoding ");
-
-        checkOutput("TestHelpOption.html", !withOption,
-                "<li><a href=\"help-doc.html\">Help</a></li>");
-    }
-}
--- /dev/null	Fri Jan 22 12:23:17 2016
+++ new/test/jdk/javadoc/doclet/testHelpOption/TestHelpOption.java	Fri Jan 22 12:23:17 2016
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2003, 2015, 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      4934778 4777599 6553182
+ * @summary  Make sure that the -help option works properly.  Make sure
+ *           the help link appears in the documentation.
+ * @author   jamieh
+ * @library ../lib
+ * @modules jdk.javadoc
+ * @build    JavadocTester TestHelpOption
+ * @run main TestHelpOption
+ */
+
+public class TestHelpOption extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        TestHelpOption tester = new TestHelpOption();
+        tester.runTests();
+    }
+
+    @Test
+    void testWithOption() {
+        javadoc("-d", "out1",
+                "-sourcepath", testSrc,
+                "-help",
+                testSrc("TestHelpOption.java"));
+        checkExit(Exit.OK);
+
+        checkOutput(true);
+    }
+
+    @Test
+    void testWithoutOption() {
+        javadoc("-d", "out2",
+                "-sourcepath", testSrc,
+                testSrc("TestHelpOption.java"));
+        checkExit(Exit.OK);
+
+        checkOutput(false);
+    }
+
+    private void checkOutput(boolean withOption) {
+        checkOutput(Output.OUT, withOption,
+                "-d ",
+                "-use ",
+                "-version ",
+                "-author ",
+                "-docfilessubdirs ",
+                "-splitindex ",
+                "-windowtitle ",
+                "-doctitle ",
+                "-header ",
+                "-footer ",
+                "-bottom ",
+                "-link ",
+                "-linkoffline ",
+                "-excludedocfilessubdir ",
+                "-group ",
+                "-nocomment ",
+                "-nodeprecated ",
+                "-noqualifier ",
+                "-nosince ",
+                "-notimestamp ",
+                "-nodeprecatedlist ",
+                "-notree ",
+                "-noindex ",
+                "-nohelp ",
+                "-nonavbar ",
+                "-serialwarn ",
+                "-tag ",
+                "-taglet ",
+                "-tagletpath ",
+                "-charset ",
+                "-helpfile ",
+                "-linksource ",
+                "-sourcetab ",
+                "-keywords ",
+                "-stylesheetfile ",
+                "-docencoding ");
+
+        checkOutput("TestHelpOption.html", !withOption,
+                "<li><a href=\"help-doc.html\">Help</a></li>");
+    }
+}