--- old/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java	Fri Jan 22 12:24:37 2016
+++ /dev/null	Fri Jan 22 12:24:37 2016
@@ -1,58 +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 4625883
- * @summary Make sure that bad -link arguments trigger warnings.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestBadLinkOption
- */
-
-public class TestBadLinkOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBadLinkOption tester = new TestBadLinkOption();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String out = "out";
-        javadoc("-d", out,
-                "-sourcepath", testSrc,
-                "-link", out,
-                "pkg");
-        checkExit(Exit.OK);
-
-        // TODO: the file it is trying to read, out/out/package-list, warrants investigation
-        checkOutput(Output.WARNING, true,
-                "Error reading file:");
-
-        checkOutput(Output.ERROR, false,
-                "Error reading file:");
-    }
-}
--- /dev/null	Fri Jan 22 12:24:37 2016
+++ new/test/jdk/javadoc/doclet/testLinkOption/TestBadLinkOption.java	Fri Jan 22 12:24:37 2016
@@ -0,0 +1,55 @@
+/*
+ * 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 4625883
+ * @summary Make sure that bad -link arguments trigger warnings.
+ * @author jamieh
+ * @library ../lib
+ * @modules jdk.javadoc
+ * @build JavadocTester
+ * @run main TestBadLinkOption
+ */
+
+public class TestBadLinkOption extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        TestBadLinkOption tester = new TestBadLinkOption();
+        tester.runTests();
+    }
+
+    @Test
+    void test() {
+        String out = "out";
+        javadoc("-d", out,
+                "-sourcepath", testSrc,
+                "-link", out,
+                "pkg");
+        checkExit(Exit.OK);
+
+        // TODO: the file it is trying to read, out/out/package-list, warrants investigation
+        checkOutput(Output.OUT, true,
+                "Error reading file:");
+    }
+}