jdk-sandbox: comparison test/langtools/jdk/javadoc/doclet/testModules/TestModules.java

equal deleted inserted replaced

-:1d683e243d8d
+:cc705c956798
 /*
 * @test
 * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
 *      8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
 *      8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
-8164407 8192007 8182765 8196200
+8164407 8192007 8182765 8196200 8196201
 * @summary Test modules support in javadoc.
 * @author bpatel
 * @library ../lib
 * @modules jdk.javadoc/jdk.javadoc.internal.tool
 * @build JavadocTester
 checkModuleClickThroughLinks();
 checkModuleClickThrough(true);
 checkModuleFilesAndLinks(true);
 checkModulesInSearch(true);
 checkOverviewFrame(true);
+checkAllPkgsAllClasses(false);
 }
 /**
 * Test generated module pages for HTML 5.
 */
 checkModuleClickThroughLinks();
 checkModuleClickThrough(true);
 checkModuleFilesAndLinks(true);
 checkModulesInSearch(true);
 checkOverviewFrame(true);
+checkAllPkgsAllClasses(true);
 }
 /**
 * Test generated module pages for HTML 4 with -nocomment option.
 */
 + "\">moduleA</a></li>",
 "<li><a href=\"moduleB/module-frame.html\" target=\"packageListFrame\" "
 + "onclick=\"updateModuleFrame('moduleB/module-type-frame.html','moduleB/module-summary.html');"
 + "\">moduleB</a></li>");
 checkOutput("script.js", true,
-"function updateModuleFrame(pFrame, cFrame)\n"
+"function updateModuleFrame(pFrame, cFrame) {\n"
-+ "{\n"
 + "    top.packageFrame.location = pFrame;\n"
 + "    top.classFrame.location = cFrame;\n"
 + "}");
 }
 + "<td class=\"colLast\"><a href=\"../moduleC/testpkgmdlC/package-summary.html\">testpkgmdlC</a></td>",
 "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
 + "<td class=\"colSecond\">All Modules</td>\n"
 + "<td class=\"colLast\">&nbsp;</td>",
 "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Packages</span><span class=\"tabEnd\">&nbsp;</span></span>"
-+ "<span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:showPkgs(1);\">Exports</a></span>"
++ "<span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">Exports</a></span>"
-+ "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:showPkgs(4);\">"
++ "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
 + "Concealed</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
 "<th class=\"colFirst\" scope=\"row\"><a href=\"concealedpkgmdlA/package-summary.html\">concealedpkgmdlA</a></th>\n"
 + "<td class=\"colSecond\">None</td>\n"
 + "<td class=\"colLast\">&nbsp;</td>");
 checkOutput("moduleB/module-summary.html", found,
 + "title=\"class in testpkgmdlB\">TestClass2InModuleB</a>)</td>",
 "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterfaceInModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterfaceInModuleB</a></th>\n"
 + "<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClassInModuleB.html\" "
 + "title=\"class in testpkgmdlB\">TestClassInModuleB</a>)</td>",
 "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Packages</span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t1\" class=\"tableTab\"><span>"
-+ "<a href=\"javascript:showPkgs(1);\">Exports</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span>"
++ "<a href=\"javascript:show(1);\">Exports</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span>"
-+ "<a href=\"javascript:showPkgs(2);\">Opens</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>");
++ "<a href=\"javascript:show(2);\">Opens</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>");
 checkOutput("moduleC/module-summary.html", found,
 "<caption><span>Exports</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
 + "<tr>\n"
 + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
 + "<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n"
 void checkGroupOption() {
 checkOutput("overview-summary.html", true,
 "<div class=\"contentContainer\">\n"
 + "<table class=\"overviewSummary\">\n"
 + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Modules</span><span class=\"tabEnd\">&nbsp;"
-+ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:showGroups(1);\">"
++ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">"
 + "Module Group A</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" class=\"tableTab\">"
-+ "<span><a href=\"javascript:showGroups(2);\">Module Group B &amp; C</a></span><span class=\"tabEnd\">"
++ "<span><a href=\"javascript:show(2);\">Module Group B &amp; C</a></span><span class=\"tabEnd\">"
-+ "&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:showGroups(4);\">"
++ "&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
 + "Other Modules</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
-"var groups = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
+"var data = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
 + "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n"
 + "var altColor = \"altColor\";\n"
 + "var rowColor = \"rowColor\";\n"
 + "var tableTab = \"tableTab\";\n"
 + "var activeTableTab = \"activeTableTab\";");
 void checkGroupOption_html4() {
 checkOutput("overview-summary.html", true,
 "<div class=\"contentContainer\">\n"
 + "<table class=\"overviewSummary\" summary=\"Module Summary table, listing modules, and an explanation\">\n"
 + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Modules</span><span class=\"tabEnd\">&nbsp;"
-+ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:showGroups(1);\">"
++ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">"
 + "Module Group A</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" class=\"tableTab\">"
-+ "<span><a href=\"javascript:showGroups(2);\">Module Group B &amp; C</a></span><span class=\"tabEnd\">"
++ "<span><a href=\"javascript:show(2);\">Module Group B &amp; C</a></span><span class=\"tabEnd\">"
-+ "&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:showGroups(4);\">"
++ "&nbsp;</span></span><span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
 + "Other Modules</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
-"var groups = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
+"var data = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
 + "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n"
 + "var altColor = \"altColor\";\n"
 + "var rowColor = \"rowColor\";\n"
 + "var tableTab = \"tableTab\";\n"
 + "var activeTableTab = \"activeTableTab\";");
 void checkGroupOptionOrdering() {
 checkOutput("overview-summary.html", true,
 "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Modules</span><span "
 + "class=\"tabEnd\">&nbsp;</span></span><span id=\"t1\" class=\"tableTab\"><span>"
-+ "<a href=\"javascript:showGroups(1);\">B Group</a></span><span class=\"tabEnd\">"
++ "<a href=\"javascript:show(1);\">B Group</a></span><span class=\"tabEnd\">"
-+ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:showGroups(2);\">"
++ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
 + "C Group</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t4\" class=\"tableTab\">"
-+ "<span><a href=\"javascript:showGroups(4);\">A Group</a></span><span class=\"tabEnd\">&nbsp;</span>"
++ "<span><a href=\"javascript:show(4);\">A Group</a></span><span class=\"tabEnd\">&nbsp;</span>"
-+ "</span><span id=\"t8\" class=\"tableTab\"><span><a href=\"javascript:showGroups(8);\">Other Modules"
++ "</span><span id=\"t8\" class=\"tableTab\"><span><a href=\"javascript:show(8);\">Other Modules"
 + "</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
 "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"B Group\"],2:[\"t2\",\"C Group\"],"
 + "4:[\"t4\",\"A Group\"],8:[\"t8\",\"Other Modules\"]};");
 checkOutput("overview-summary.html", false,
 "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Modules</span><span "
 + "class=\"tabEnd\">&nbsp;</span></span><span id=\"t1\" class=\"tableTab\"><span>"
-+ "<a href=\"javascript:showGroups(1);\">A Group</a></span><span class=\"tabEnd\">"
++ "<a href=\"javascript:show(1);\">A Group</a></span><span class=\"tabEnd\">"
-+ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:showGroups(2);\">"
++ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
 + "B Group</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t4\" class=\"tableTab\">"
-+ "<span><a href=\"javascript:showGroups(4);\">C Group</a></span><span class=\"tabEnd\">&nbsp;</span>"
++ "<span><a href=\"javascript:show(4);\">C Group</a></span><span class=\"tabEnd\">&nbsp;</span>"
-+ "</span><span id=\"t8\" class=\"tableTab\"><span><a href=\"javascript:showGroups(8);\">Other Modules"
++ "</span><span id=\"t8\" class=\"tableTab\"><span><a href=\"javascript:show(8);\">Other Modules"
 + "</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
 "Java SE Modules");
 }
 void checkUnnamedModuleGroupOption() {
 + "<div class=\"block\">The overview summary page header.</div>\n"
 + "</div>\n"
 + "<div class=\"contentContainer\">\n"
 + "<table class=\"overviewSummary\">\n"
 + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Packages</span><span class=\"tabEnd\">&nbsp;"
-+ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:showGroups(1);\">"
++ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">"
 + "Package Group 0</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" "
-+ "class=\"tableTab\"><span><a href=\"javascript:showGroups(2);\">Package Group 1</a></span>"
++ "class=\"tableTab\"><span><a href=\"javascript:show(2);\">Package Group 1</a></span>"
 + "<span class=\"tabEnd\">&nbsp;</span></span></caption>",
-"var groups = {\"i0\":1,\"i1\":2};\n"
+"var data = {\"i0\":1,\"i1\":2};\n"
 + "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Package Group 0\"],2:[\"t2\",\"Package Group 1\"]};\n"
 + "var altColor = \"altColor\";\n"
 + "var rowColor = \"rowColor\";\n"
 + "var tableTab = \"tableTab\";\n"
 + "var activeTableTab = \"activeTableTab\";");
 + "<div class=\"block\">The overview summary page header.</div>\n"
 + "</div>\n"
 + "<div class=\"contentContainer\">\n"
 + "<table class=\"overviewSummary\" summary=\"Package Summary table, listing packages, and an explanation\">\n"
 + "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Packages</span><span class=\"tabEnd\">&nbsp;"
-+ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:showGroups(1);\">"
++ "</span></span><span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">"
 + "Package Group 0</a></span><span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" "
-+ "class=\"tableTab\"><span><a href=\"javascript:showGroups(2);\">Package Group 1</a></span>"
++ "class=\"tableTab\"><span><a href=\"javascript:show(2);\">Package Group 1</a></span>"
 + "<span class=\"tabEnd\">&nbsp;</span></span></caption>");
 }
 void checkGroupOptionPackageOrdering() {
 checkOutput("overview-summary.html", true,
 "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Packages</span><span "
 + "class=\"tabEnd\">&nbsp;</span></span><span id=\"t1\" class=\"tableTab\"><span>"
-+ "<a href=\"javascript:showGroups(1);\">Z Group</a></span><span class=\"tabEnd\">"
++ "<a href=\"javascript:show(1);\">Z Group</a></span><span class=\"tabEnd\">"
-+ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:showGroups(2);\">"
++ "&nbsp;</span></span><span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
 + "A Group</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>",
 "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Z Group\"],2:[\"t2\",\"A Group\"]};");
 }
 void checkGroupOptionSingleModule() {
 + "class=\"externalLink\"><code>Link to java.lang package</code></a>");
 checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
 "<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/module-summary.html?is-external=true\" "
 + "class=\"externalLink\"><code>Link to java.base module</code></a>");
 }
+void checkAllPkgsAllClasses(boolean found) {
+checkOutput("allclasses-index.html", true,
+"<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Classes</span>"
++ "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t2\" class=\"tableTab\">"
++ "<span><a href=\"javascript:show(2);\">Class Summary</a></span><span class=\"tabEnd\">"
++ "&nbsp;</span></span><span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
++ "Annotation Types Summary</a></span><span class=\"tabEnd\">&nbsp;</span></span></caption>\n"
++ "<tr>\n"
++ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
++ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
++ "</tr>");
+checkOutput("allpackages-index.html", true,
+"<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
++ "<tr>\n"
++ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
++ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
++ "</tr>\n");
+checkOutput("allclasses-index.html", found,
+"<table class=\"typeSummary\">\n");
+checkOutput("allpackages-index.html", found,
+"<table class=\"packagesSummary\">\n");
+checkOutput("allclasses-index.html", !found,
+"<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">");
+checkOutput("allpackages-index.html", !found,
+"<table class=\"packagesSummary\" summary=\"Package Summary table, listing packages, and an explanation\">");
+checkOutput("type-search-index.js", true,
+"{\"l\":\"All Classes\",\"url\":\"allclasses-index.html\"}");
+checkOutput("package-search-index.js", true,
+"{\"l\":\"All Packages\",\"url\":\"allpackages-index.html\"}");
+checkOutput("index-all.html", true,
+"<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>&nbsp;"
++ "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
 }
+}

changeset 50167	cc705c956798
parent 50118	919c36db208c
child 50293	edfb87b2520e