--- old/test/tools/javadoc/completionFailure/CompletionFailure.java	Fri Jan 22 12:29:45 2016
+++ /dev/null	Fri Jan 22 12:29:46 2016
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002, 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 4670772 6328529
- * @summary Completion failures should be ignored in javadoc.
- * @author gafter
- * @modules jdk.javadoc
- */
-
-import com.sun.javadoc.*;
-import java.util.*;
-
-public class CompletionFailure extends Doclet
-{
-    public static void main(String[] args) {
-        // run javadoc on package pkg
-        if (com.sun.tools.javadoc.Main.execute("javadoc",
-                                               "CompletionFailure",
-                                               CompletionFailure.class.getClassLoader(),
-                                               new String[]{"pkg"}) != 0)
-            throw new Error();
-    }
-
-    public static boolean start(com.sun.javadoc.RootDoc root) {
-        ClassDoc[] classes = root.classes();
-        if (classes.length != 1)
-            throw new Error("1 " + Arrays.asList(classes));
-        return true;
-    }
-}
--- /dev/null	Fri Jan 22 12:29:46 2016
+++ new/test/jdk/javadoc/tool/completionFailure/CompletionFailure.java	Fri Jan 22 12:29:45 2016
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2002, 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 4670772 6328529
+ * @summary Completion failures should be ignored in javadoc.
+ * @author gafter
+ * @modules jdk.javadoc
+ */
+
+
+import java.io.PrintWriter;
+import java.util.*;
+
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+
+import jdk.javadoc.doclet.Doclet;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
+
+public class CompletionFailure implements Doclet {
+    public static void main(String[] args) {
+        String[] toolargs = {
+            "-doclet", "CompletionFailure",
+            "-docletpath", System.getProperty("test.classes", "."),
+            "pkg"
+        };
+        // run javadoc on package pkg
+        if (jdk.javadoc.internal.tool.Main.execute(toolargs,
+                new PrintWriter(System.err)) != 0)
+            throw new Error();
+    }
+
+    public boolean run(DocletEnvironment root) {
+        Set<TypeElement> classes = root.getIncludedClasses();
+        if (classes.size() != 1)
+            throw new Error("1 " + Arrays.asList(classes));
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "Test";
+    }
+
+    @Override
+    public Set<Option> getSupportedOptions() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
+    @Override
+    public void init(Locale locale, Reporter reporter) {
+        // do nothing
+    }
+}