--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Mon Apr 09 04:43:03 2018 -0700
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Mon Apr 09 09:45:51 2018 -0700
@@ -26,7 +26,7 @@
* @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
+ 8164407 8192007 8182765 8196200
* @summary Test modules support in javadoc.
* @author bpatel
* @library ../lib
@@ -940,9 +940,10 @@
checkOutput("moduleA/module-summary.html", true,
"<ul class=\"subNavList\">\n"
+ "<li>Module: </li>\n"
- + "<li><a href=\"#module.description\">Description</a> | <a "
- + "href=\"#modules.summary\">Modules</a> | <a href=\"#packages.summary\">"
- + "Packages</a> | Services</li>\n"
+ + "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li><a href=\"#modules.summary\">Modules</a> | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li>Services</li>\n"
+ "</ul>",
"<!-- ============ MODULES SUMMARY =========== -->\n"
+ "<a id=\"modules.summary\">\n"
@@ -964,9 +965,10 @@
+ "</td>\n"
+ "</tr>");
checkOutput("moduleB/module-summary.html", true,
- "<li><a href=\"#module.description\">Description</a> | Modules | "
- + "<a href=\"#packages.summary\">Packages</a> | <a href=\"#services.summary\">"
- + "Services</a></li>",
+ "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li>Modules | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li><a href=\"#services.summary\">Services</a></li>",
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
+ "<a id=\"packages.summary\">\n"
+ "<!-- -->\n"
@@ -1180,8 +1182,10 @@
+ " Package Link: <a href=\"moduletags/testpkgmdltags/package-summary.html\"><code>testpkgmdltags</code></a>.<br></div>\n"
+ "</td>");
checkOutput("moduleA/module-summary.html", true,
- "<li><a href=\"#module.description\">Description</a> | <a href=\"#modules.summary\">"
- + "Modules</a> | <a href=\"#packages.summary\">Packages</a> | Services</li>",
+ "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li><a href=\"#modules.summary\">Modules</a> | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li>Services</li>",
"<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+ "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
checkOutput("moduleB/module-summary.html", true,
@@ -1189,8 +1193,10 @@
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n");
checkOutput("moduletags/module-summary.html", true,
- "<li><a href=\"#module.description\">Description</a> | <a href=\"#modules.summary\">Modules"
- + "</a> | <a href=\"#packages.summary\">Packages</a> | Services</li>",
+ "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li><a href=\"#modules.summary\">Modules</a> | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li>Services</li>",
"<table class=\"requiresSummary\">\n"
+ "<caption><span>Indirect Requires</span><span class=\"tabEnd\"> </span></caption>",
"<td class=\"colFirst\">transitive</td>\n"
@@ -1267,8 +1273,10 @@
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+ "<td class=\"colLast\"> </td>");
checkOutput("moduleB/module-summary.html", found,
- "<li><a href=\"#module.description\">Description</a> | Modules | "
- + "<a href=\"#packages.summary\">Packages</a> | <a href=\"#services.summary\">Services</a></li>",
+ "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li>Modules | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li><a href=\"#services.summary\">Services</a></li>",
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+ "<td class=\"colLast\"> </td>",
"<table class=\"packagesSummary\">\n"
@@ -1329,8 +1337,10 @@
+ "<td class=\"colSecond\">None</td>\n"
+ "<td class=\"colLast\"> </td>");
checkOutput("moduleB/module-summary.html", found,
- "<li><a href=\"#module.description\">Description</a> | <a href=\"#modules.summary\">"
- + "Modules</a> | <a href=\"#packages.summary\">Packages</a> | <a href=\"#services.summary\">Services</a></li>",
+ "<li><a href=\"#module.description\">Description</a> | </li>\n"
+ + "<li><a href=\"#modules.summary\">Modules</a> | </li>\n"
+ + "<li><a href=\"#packages.summary\">Packages</a> | </li>\n"
+ + "<li><a href=\"#services.summary\">Services</a></li>",
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+ "<td class=\"colSecond\">None</td>\n"
+ "<td class=\"colSecond\">All Modules</td>\n"