--- old/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java Fri Jan 22 12:21:58 2016
+++ /dev/null Fri Jan 22 12:21:58 2016
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2012, 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 8004891
- * @summary Make sure that the abstract method is identified correctly
- * if the abstract modifier is present explicitly or implicitly.
- * @author bpatel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestAbstractMethod
- */
-
-public class TestAbstractMethod extends JavadocTester {
-
- public static void main(String... args) throws Exception {
- TestAbstractMethod tester = new TestAbstractMethod();
- tester.runTests();
- }
-
- @Test
- void test() {
- javadoc("-d", "out",
- "-sourcepath", testSrc,
- "pkg");
- checkExit(Exit.OK);
-
- checkOutput("pkg/A.html", true,
- "default void | ",
- ""
- + "All Methods "
- + ""
- + "Instance Methods"
- + " "
- + "Abstract Methods "
- + ""
- + "Default Methods"
- + " ");
-
- checkOutput("pkg/B.html", true,
- ""
- + "All Methods "
- + ""
- + "Instance Methods"
- + " Abstract "
- + "Methods "
- + ""
- + "Concrete Methods"
- + " ",
- "abstract void | ");
-
- checkOutput("pkg/C.html", true,
- ""
- + "All Methods "
- + ""
- + "Instance Methods"
- + " "
- + ""
- + "Default Methods"
- + " ",
- "default void | ");
-
- checkOutput("pkg/A.html", false,
- "abstract void | ");
-
- checkOutput("pkg/B.html", false,
- "Default Methods"
- + " ",
- "default void | ");
-
- checkOutput("pkg/C.html", false,
- "Abstract Methods"
- + " ");
- }
-}
--- /dev/null Fri Jan 22 12:21:58 2016
+++ new/test/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java Fri Jan 22 12:21:58 2016
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2012, 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 8004891
+ * @summary Make sure that the abstract method is identified correctly
+ * if the abstract modifier is present explicitly or implicitly.
+ * @author bpatel
+ * @library ../lib
+ * @modules jdk.javadoc
+ * @build JavadocTester
+ * @run main TestAbstractMethod
+ */
+
+public class TestAbstractMethod extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestAbstractMethod tester = new TestAbstractMethod();
+ tester.runTests();
+ }
+
+ @Test
+ void test() {
+ javadoc("-d", "out",
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/A.html", true,
+ "default void | ",
+ ""
+ + "All Methods "
+ + ""
+ + "Instance Methods"
+ + " "
+ + "Abstract Methods "
+ + ""
+ + "Default Methods"
+ + " ");
+
+ checkOutput("pkg/B.html", true,
+ ""
+ + "All Methods "
+ + ""
+ + "Instance Methods"
+ + " Abstract "
+ + "Methods "
+ + ""
+ + "Concrete Methods"
+ + " ",
+ "abstract void | ");
+
+ checkOutput("pkg/C.html", true,
+ ""
+ + "All Methods "
+ + ""
+ + "Instance Methods"
+ + " "
+ + ""
+ + "Default Methods"
+ + " ",
+ "default void | ");
+
+ checkOutput("pkg/A.html", false,
+ "abstract void | ");
+
+ checkOutput("pkg/B.html", false,
+ "Default Methods"
+ + " ",
+ "default void | ");
+
+ checkOutput("pkg/C.html", false,
+ "Abstract Methods"
+ + " ");
+ }
+}