--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Tue Jan 29 15:19:43 2019 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Wed Jan 30 16:39:26 2019 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -215,33 +215,6 @@
"</tbody>\n" +
"</table>\n");
- javadoc("-d", base.toString() + "/out-html4",
- "-html4",
- "-quiet",
- "--show-module-contents", "all",
- "--module-source-path", base.toString(),
- "--module", "m");
- checkExit(Exit.OK);
-
- checkOutput("m/module-summary.html", true,
- "<div class=\"usesSummary\">\n" +
- "<table summary=\"Uses table, listing types, and an explanation\">\n" +
- "<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
- "<td class=\"colLast\"> </td>\n" +
- "</tr>\n" +
- "<tr class=\"rowColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/B.html\" title=\"class in p1\">B</a></th>\n" +
- "<td class=\"colLast\"> </td>\n" +
- "</tr>\n" +
- "</tbody>\n" +
- "</table>\n");
}
@Test
@@ -279,28 +252,6 @@
"</tbody>\n" +
"</table>\n");
- javadoc("-d", base.toString() + "/out-html4",
- "-html4",
- "-quiet",
- "--module-source-path", base.toString(),
- "--module", "m");
- checkExit(Exit.OK);
-
- checkOutput("m/module-summary.html", true,
- "<div class=\"usesSummary\">\n" +
- "<table summary=\"Uses table, listing types, and an explanation\">\n" +
- "<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
- "<td class=\"colLast\"> </td>\n" +
- "</tr>\n" +
- "</tbody>\n" +
- "</table>\n");
}
@Test
@@ -371,33 +322,6 @@
"</tr>\n" +
"</tbody>\n");
- javadoc("-d", base.toString() + "/out-html4",
- "-html4",
- "-quiet",
- "--show-module-contents", "all",
- "--module-source-path", base.toString(),
- "--module", "m");
-
- checkExit(Exit.OK);
-
- checkOutput("m/module-summary.html", true,
- "<div class=\"providesSummary\">\n" +
- "<table summary=\"Provides table, listing types, and an explanation\">\n" +
- "<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
- "<td class=\"colLast\"> <br>(<span class=\"implementationLabel\">Implementation(s):</span> <a href=\"p1/B.html\" title=\"class in p1\">B</a>)</td>\n" +
- "</tr>\n" +
- "<tr class=\"rowColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p2/A.html\" title=\"interface in p2\">A</a></th>\n" +
- "<td class=\"colLast\"> <br>(<span class=\"implementationLabel\">Implementation(s):</span> <a href=\"p2/B.html\" title=\"class in p2\">B</a>)</td>\n" +
- "</tr>\n" +
- "</tbody>\n");
}
@Test
@@ -440,30 +364,6 @@
"</tbody>\n" +
"</table>\n");
- javadoc("-d", base.toString() + "/out-html4",
- "-html4",
- "-quiet",
- "--module-source-path", base.toString(),
- "--module", "m");
-
- checkExit(Exit.OK);
-
- checkOutput("m/module-summary.html", true,
- "<div class=\"providesSummary\">\n" +
- "<table summary=\"Provides table, listing types, and an explanation\">\n" +
- "<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
- "<td class=\"colLast\">\n" +
- "<div class=\"block\">abc</div>\n</td>\n" +
- "</tr>\n" +
- "</tbody>\n" +
- "</table>\n");
}
@Test
@@ -521,45 +421,6 @@
"</tbody>\n" +
"</table>\n");
- javadoc("-d", base.toString() + "/out-html4",
- "-html4",
- "-quiet",
- "--module-source-path", base.toString(),
- "--module", "m");
-
- checkExit(Exit.OK);
-
- checkOutput("m/module-summary.html", true,
- "<div class=\"providesSummary\">\n" +
- "<table summary=\"Provides table, listing types, and an explanation\">\n" +
- "<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
- "<td class=\"colLast\">\n" +
- "<div class=\"block\">abc</div>\n</td>\n" +
- "</tr>\n" +
- "</tbody>\n" +
- "</table>",
- "<div class=\"usesSummary\">\n" +
- "<table summary=\"Uses table, listing types, and an explanation\">\n" +
- "<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
- "<tr>\n" +
- "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
- "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
- "</tr>\n" +
- "<tbody>\n" +
- "<tr class=\"altColor\">\n" +
- "<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
- "<td class=\"colLast\">\n" +
- "<div class=\"block\">def</div>\n</td>\n" +
- "</tr>\n" +
- "</tbody>\n" +
- "</table>\n");
}
}