--- old/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Fri Jan 22 12:23:39 2016
+++ /dev/null Fri Jan 22 12:23:39 2016
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 2009, 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 6786688 8008164
- * @summary HTML tables should have table summary, caption and table headers.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlTableTags
- */
-
-public class TestHtmlTableTags extends JavadocTester {
-
- //Javadoc arguments.
- private static final String[] ARGS = new String[] {
-
- };
-
-
- public static void main(String... args) throws Exception {
- TestHtmlTableTags tester = new TestHtmlTableTags();
- tester.runTests();
- }
-
- @Test
- void test() {
- javadoc("-d", "out",
- "-sourcepath", testSrc,
- "-use",
- "pkg1", "pkg2");
- checkExit(Exit.OK);
-
- checkHtmlTableSummaries();
- checkHtmlTableCaptions();
- checkHtmlTableHeaders();
- }
-
- /*
- * Tests for validating summary for HTML tables
- */
- void checkHtmlTableSummaries() {
- //Package summary
- checkOutput("pkg1/package-summary.html", true,
- "",
- "");
-
- checkOutput("pkg2/package-summary.html", true,
- "",
- "");
-
- // Class documentation
- checkOutput("pkg1/C1.html", true,
- "",
- "");
-
- checkOutput("pkg2/C2.html", true,
- "",
- "");
-
- checkOutput("pkg2/C2.ModalExclusionType.html", true,
- "");
-
- checkOutput("pkg2/C3.html", true,
- "");
-
- checkOutput("pkg2/C4.html", true,
- "");
-
- // Class use documentation
- checkOutput("pkg1/class-use/I1.html", true,
- "");
-
- checkOutput("pkg1/class-use/C1.html", true,
- "",
- "");
-
- checkOutput("pkg2/class-use/C2.html", true,
- "",
- "");
-
- checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
- "");
-
- checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
- "");
-
- // Package use documentation
- checkOutput("pkg1/package-use.html", true,
- "",
- "");
-
- checkOutput("pkg2/package-use.html", true,
- "",
- "");
-
- // Deprecated
- checkOutput("deprecated-list.html", true,
- "",
- "");
-
- // Constant values
- checkOutput("constant-values.html", true,
- "");
-
- // Overview Summary
- checkOutput("overview-summary.html", true,
- "");
- }
-
- /*
- * Tests for validating caption for HTML tables
- */
- void checkHtmlTableCaptions() {
- //Package summary
- checkOutput("pkg1/package-summary.html", true,
- "Class Summary"
- + " ",
- "Interface Summary"
- + " ");
-
- checkOutput("pkg2/package-summary.html", true,
- "Enum Summary"
- + " ",
- "Annotation Types Summary"
- + " ");
-
- // Class documentation
- checkOutput("pkg1/C1.html", true,
- "Fields ",
- "All "
- + "Methods "
- + ""
- + "Instance Methods "
- + ""
- + "Concrete Methods "
- + ""
- + "Deprecated Methods "
- + "");
-
- checkOutput("pkg2/C2.html", true,
- "Nested Classes ",
- "Constructors ");
-
- checkOutput("pkg2/C2.ModalExclusionType.html", true,
- "Enum Constants ");
-
- checkOutput("pkg2/C3.html", true,
- "Required Elements "
- + "");
-
- checkOutput("pkg2/C4.html", true,
- "Optional Elements "
- + "");
-
- // Class use documentation
- checkOutput("pkg1/class-use/I1.html", true,
- "Packages that use I1"
- + " ");
-
- checkOutput("pkg1/class-use/C1.html", true,
- "Fields in "
- + "pkg2 declared as C1 "
- + "",
- "Methods in "
- + "pkg2 that return C1"
- + " ");
-
- checkOutput("pkg2/class-use/C2.html", true,
- "Fields in "
- + "pkg1 declared as C2"
- + " ",
- "Methods in "
- + "pkg1 that return C2"
- + " ");
-
- checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
- "Methods in "
- + "pkg2 that return C2.ModalExclusionType"
- + " ");
-
- // Package use documentation
- checkOutput("pkg1/package-use.html", true,
- "Packages that use "
- + "pkg1 ",
- "Classes in "
- + "pkg1 used by pkg1"
- + " ");
-
- checkOutput("pkg2/package-use.html", true,
- "Packages that use "
- + "pkg2 ",
- "Classes in "
- + "pkg2 used by pkg1"
- + " ");
-
- // Deprecated
- checkOutput("deprecated-list.html", true,
- "Deprecated Fields"
- + " ",
- "Deprecated Methods"
- + " ");
-
- // Constant values
- checkOutput("constant-values.html", true,
- "pkg1."
- + "C1 ");
-
- // Overview Summary
- checkOutput("overview-summary.html", true,
- "Packages ");
- }
-
- /*
- * Test for validating headers for HTML tables
- */
- void checkHtmlTableHeaders() {
- //Package summary
- checkOutput("pkg1/package-summary.html", true,
- "| "
- + "Class | \n"
- + "Description | ",
- ""
- + "Interface | \n"
- + "Description | ");
-
- checkOutput("pkg2/package-summary.html", true,
- ""
- + "Enum | \n"
- + "Description | ",
- ""
- + "Annotation Type | \n"
- + "Description | ");
-
- // Class documentation
- checkOutput("pkg1/C1.html", true,
- "Modifier and Type | \n"
- + "Field and Description | ",
- "Modifier and Type | \n"
- + "Method and Description | ");
-
- checkOutput("pkg2/C2.html", true,
- "Modifier and Type | \n"
- + "Class and Description | ",
- "Constructor and Description | ");
-
- checkOutput("pkg2/C2.ModalExclusionType.html", true,
- "Enum Constant and Description | ");
-
- checkOutput("pkg2/C3.html", true,
- "Modifier and Type | \n"
- + "Required Element and Description | ");
-
- checkOutput("pkg2/C4.html", true,
- "Modifier and Type | \n"
- + "Optional Element and Description | ");
-
- // Class use documentation
- checkOutput("pkg1/class-use/I1.html", true,
- "Package | \n"
- + "Description | ");
-
- checkOutput("pkg1/class-use/C1.html", true,
- "Modifier and Type | \n"
- + "Field and Description | ",
- "Modifier and Type | \n"
- + "Method and Description | ");
-
- checkOutput("pkg2/class-use/C2.html", true,
- "Modifier and Type | \n"
- + "Field and Description | ",
- "Modifier and Type | \n"
- + "Method and Description | ");
-
- checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
- "Package | \n"
- + "Description | ",
- "Modifier and Type | \n"
- + "Method and Description | ");
-
- // Package use documentation
- checkOutput("pkg1/package-use.html", true,
- "Package | \n"
- + "Description | ",
- "Class and Description | ");
-
- checkOutput("pkg2/package-use.html", true,
- "Package | \n"
- + "Description | ",
- "Class and Description | ");
-
- // Deprecated
- checkOutput("deprecated-list.html", true,
- "Field and Description | ",
- "Method and Description | ");
-
- // Constant values
- checkOutput("constant-values.html", true,
- ""
- + "Modifier and Type | \n"
- + "Constant Field\n"
- + "Value | ");
-
- // Overview Summary
- checkOutput("overview-summary.html", true,
- ""
- + "Package | \n"
- + "Description | ");
- }
-}
--- /dev/null Fri Jan 22 12:23:39 2016
+++ new/test/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java Fri Jan 22 12:23:39 2016
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2009, 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 6786688 8008164
+ * @summary HTML tables should have table summary, caption and table headers.
+ * @author Bhavesh Patel
+ * @library ../lib
+ * @modules jdk.javadoc
+ * @build JavadocTester
+ * @run main TestHtmlTableTags
+ */
+
+public class TestHtmlTableTags extends JavadocTester {
+
+ //Javadoc arguments.
+ private static final String[] ARGS = new String[] {
+
+ };
+
+
+ public static void main(String... args) throws Exception {
+ TestHtmlTableTags tester = new TestHtmlTableTags();
+ tester.runTests();
+ }
+
+ @Test
+ void test() {
+ javadoc("-d", "out",
+ "-sourcepath", testSrc,
+ "-use",
+ "pkg1", "pkg2");
+ checkExit(Exit.OK);
+
+ checkHtmlTableSummaries();
+ checkHtmlTableCaptions();
+ checkHtmlTableHeaders();
+ }
+
+ /*
+ * Tests for validating summary for HTML tables
+ */
+ void checkHtmlTableSummaries() {
+ //Package summary
+ checkOutput("pkg1/package-summary.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/package-summary.html", true,
+ "",
+ "");
+
+ // Class documentation
+ checkOutput("pkg1/C1.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/C2.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/C2.ModalExclusionType.html", true,
+ "");
+
+ checkOutput("pkg2/C3.html", true,
+ "");
+
+ checkOutput("pkg2/C4.html", true,
+ "");
+
+ // Class use documentation
+ checkOutput("pkg1/class-use/I1.html", true,
+ "");
+
+ checkOutput("pkg1/class-use/C1.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/class-use/C2.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+ "");
+
+ checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+ "");
+
+ // Package use documentation
+ checkOutput("pkg1/package-use.html", true,
+ "",
+ "");
+
+ checkOutput("pkg2/package-use.html", true,
+ "",
+ "");
+
+ // Deprecated
+ checkOutput("deprecated-list.html", true,
+ "",
+ "");
+
+ // Constant values
+ checkOutput("constant-values.html", true,
+ "");
+
+ // Overview Summary
+ checkOutput("overview-summary.html", true,
+ "");
+ }
+
+ /*
+ * Tests for validating caption for HTML tables
+ */
+ void checkHtmlTableCaptions() {
+ //Package summary
+ checkOutput("pkg1/package-summary.html", true,
+ "Class Summary"
+ + " ",
+ "Interface Summary"
+ + " ");
+
+ checkOutput("pkg2/package-summary.html", true,
+ "Enum Summary"
+ + " ",
+ "Annotation Types Summary"
+ + " ");
+
+ // Class documentation
+ checkOutput("pkg1/C1.html", true,
+ "Fields ",
+ "All "
+ + "Methods "
+ + ""
+ + "Instance Methods "
+ + ""
+ + "Concrete Methods "
+ + ""
+ + "Deprecated Methods "
+ + "");
+
+ checkOutput("pkg2/C2.html", true,
+ "Nested Classes ",
+ "Constructors ");
+
+ checkOutput("pkg2/C2.ModalExclusionType.html", true,
+ "Enum Constants ");
+
+ checkOutput("pkg2/C3.html", true,
+ "Required Elements "
+ + "");
+
+ checkOutput("pkg2/C4.html", true,
+ "Optional Elements "
+ + "");
+
+ // Class use documentation
+ checkOutput("pkg1/class-use/I1.html", true,
+ "Packages that use I1"
+ + " ");
+
+ checkOutput("pkg1/class-use/C1.html", true,
+ "Fields in "
+ + "pkg2 declared as C1 "
+ + "",
+ "Methods in "
+ + "pkg2 that return C1"
+ + " ");
+
+ checkOutput("pkg2/class-use/C2.html", true,
+ "Fields in "
+ + "pkg1 declared as C2"
+ + " ",
+ "Methods in "
+ + "pkg1 that return C2"
+ + " ");
+
+ checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+ "Methods in "
+ + "pkg2 that return C2.ModalExclusionType"
+ + " ");
+
+ // Package use documentation
+ checkOutput("pkg1/package-use.html", true,
+ "Packages that use "
+ + "pkg1 ",
+ "Classes in "
+ + "pkg1 used by pkg1"
+ + " ");
+
+ checkOutput("pkg2/package-use.html", true,
+ "Packages that use "
+ + "pkg2 ",
+ "Classes in "
+ + "pkg2 used by pkg1"
+ + " ");
+
+ // Deprecated
+ checkOutput("deprecated-list.html", true,
+ "Deprecated Fields"
+ + " ",
+ "Deprecated Methods"
+ + " ");
+
+ // Constant values
+ checkOutput("constant-values.html", true,
+ "pkg1."
+ + "C1 ");
+
+ // Overview Summary
+ checkOutput("overview-summary.html", true,
+ "Packages ");
+ }
+
+ /*
+ * Test for validating headers for HTML tables
+ */
+ void checkHtmlTableHeaders() {
+ //Package summary
+ checkOutput("pkg1/package-summary.html", true,
+ "| "
+ + "Class | \n"
+ + "Description | ",
+ ""
+ + "Interface | \n"
+ + "Description | ");
+
+ checkOutput("pkg2/package-summary.html", true,
+ ""
+ + "Enum | \n"
+ + "Description | ",
+ ""
+ + "Annotation Type | \n"
+ + "Description | ");
+
+ // Class documentation
+ checkOutput("pkg1/C1.html", true,
+ "Modifier and Type | \n"
+ + "Field and Description | ",
+ "Modifier and Type | \n"
+ + "Method and Description | ");
+
+ checkOutput("pkg2/C2.html", true,
+ "Modifier and Type | \n"
+ + "Class and Description | ",
+ "Constructor and Description | ");
+
+ checkOutput("pkg2/C2.ModalExclusionType.html", true,
+ "Enum Constant and Description | ");
+
+ checkOutput("pkg2/C3.html", true,
+ "Modifier and Type | \n"
+ + "Required Element and Description | ");
+
+ checkOutput("pkg2/C4.html", true,
+ "Modifier and Type | \n"
+ + "Optional Element and Description | ");
+
+ // Class use documentation
+ checkOutput("pkg1/class-use/I1.html", true,
+ "Package | \n"
+ + "Description | ");
+
+ checkOutput("pkg1/class-use/C1.html", true,
+ "Modifier and Type | \n"
+ + "Field and Description | ",
+ "Modifier and Type | \n"
+ + "Method and Description | ");
+
+ checkOutput("pkg2/class-use/C2.html", true,
+ "Modifier and Type | \n"
+ + "Field and Description | ",
+ "Modifier and Type | \n"
+ + "Method and Description | ");
+
+ checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+ "Package | \n"
+ + "Description | ",
+ "Modifier and Type | \n"
+ + "Method and Description | ");
+
+ // Package use documentation
+ checkOutput("pkg1/package-use.html", true,
+ "Package | \n"
+ + "Description | ",
+ "Class and Description | ");
+
+ checkOutput("pkg2/package-use.html", true,
+ "Package | \n"
+ + "Description | ",
+ "Class and Description | ");
+
+ // Deprecated
+ checkOutput("deprecated-list.html", true,
+ "Field and Description | ",
+ "Method and Description | ");
+
+ // Constant values
+ checkOutput("constant-values.html", true,
+ ""
+ + "Modifier and Type | \n"
+ + "Constant Field\n"
+ + "Value | ");
+
+ // Overview Summary
+ checkOutput("overview-summary.html", true,
+ ""
+ + "Package | \n"
+ + "Description | ");
+ }
+}