--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Fri Mar 29 09:31:44 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Mon Apr 01 12:44:23 2019 +0530
@@ -53,7 +53,6 @@
"-use",
"-Xdoclint:none",
"-overview", testSrc("overview.html"),
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
"testpkgmdlA", "testpkgmdlB");
@@ -62,11 +61,8 @@
checkHtml5NoDescription(false);
checkHtml5OverviewSummaryModules();
checkModuleLink();
- checkModuleClickThroughLinks();
- checkModuleClickThrough(true);
checkModuleFilesAndLinks(true);
checkModulesInSearch(true);
- checkOverviewFrame(true);
checkAllPkgsAllClasses(true);
}
@@ -79,7 +75,6 @@
"-nocomment",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
@@ -89,7 +84,6 @@
checkHtml5NoDescription(true);
checkModuleLink();
checkModuleFilesAndLinks(true);
- checkOverviewFrame(true);
}
/**
@@ -99,7 +93,6 @@
public void testHtml5UnnamedModule() {
javadoc("-d", "out-html5-nomodule",
"-use",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"testpkgnomodule", "testpkgnomodule1");
@@ -107,7 +100,6 @@
checkHtml5OverviewSummaryPackages();
checkModuleFilesAndLinks(false);
checkModulesInSearch(false);
- checkOverviewFrame(false);
}
/**
@@ -165,13 +157,11 @@
public void testModuleFilesAndLinks() {
javadoc("-d", "out-modulelinks",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleA,moduleB",
"testpkgmdlA", "testpkgmdlB");
checkExit(Exit.OK);
checkModuleFilesAndLinks(true);
- checkOverviewFrame(true);
}
/**
@@ -215,7 +205,6 @@
"-author",
"-version",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -225,8 +214,6 @@
checkModuleModeCommon();
checkModuleModeApi(true);
checkModuleModeAll(false);
- checkModuleFrameFiles(true);
- checkAllModulesLink(true);
}
/**
@@ -240,7 +227,6 @@
"-author",
"-version",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -250,8 +236,6 @@
checkModuleModeCommon();
checkModuleModeApi(false);
checkModuleModeAll(true);
- checkModuleFrameFiles(true);
- checkAllModulesLink(true);
}
/**
@@ -289,12 +273,10 @@
@Test
public void testSingleModuleSinglePkg() {
javadoc("-d", "out-singlemod",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleC",
"testpkgmdlC");
checkExit(Exit.OK);
- checkModuleFrameFiles(false);
}
/**
@@ -305,12 +287,10 @@
javadoc("-d", "out-singlemodmultiplepkg",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleB",
"testpkg2mdlB", "testpkgmdlB");
checkExit(Exit.OK);
- checkAllModulesLink(false);
}
/**
@@ -321,7 +301,6 @@
javadoc("-d", "out-group",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -345,7 +324,6 @@
javadoc("-d", "out-groupOrder",
"--show-module-contents=all",
"-Xdoclint:none",
- "--frames",
"-tag", "regular:a:Regular Tag:",
"-tag", "moduletag:s:Module Tag:",
"--module-source-path", testSrc,
@@ -368,7 +346,6 @@
javadoc("-d", "out-groupnomodule",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"-group", "Package Group 0", "testpkgnomodule",
@@ -388,7 +365,6 @@
javadoc("-d", "out-groupPkgOrder",
"-use",
"-Xdoclint:none",
- "--frames",
"-overview", testSrc("overview.html"),
"-sourcepath", testSrc,
"-group", "Z Group", "testpkgnomodule",
@@ -406,7 +382,6 @@
javadoc("-d", "out-groupsinglemodule",
"-use",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"-group", "Module Group B", "moduleB*",
"--module", "moduleB",
@@ -423,7 +398,6 @@
javadoc("-d", "out-modulename",
"-use",
"-Xdoclint:none",
- "--frames",
"--module-source-path", testSrc,
"--module", "moduleB,test.moduleFullName",
"testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname");
@@ -464,7 +438,7 @@
+ "</a>\n"
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
@@ -473,7 +447,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
@@ -523,7 +497,7 @@
+ "</a>\n"
+ "<div class=\"block\">This is a test description for the moduleB module. Search "
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>");
- checkOutput("overview-summary.html", found,
+ checkOutput("index.html", found,
"</nav>\n"
+ "</header>\n"
+ "<main role=\"main\">\n"
@@ -533,7 +507,7 @@
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"</table>\n"
+ "</div>\n"
+ "</main>\n"
@@ -564,7 +538,7 @@
}
void checkModuleLink() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<li>Module</li>");
checkOutput("moduleA/module-summary.html", true,
"<li class=\"navBarCell1Rev\">Module</li>");
@@ -619,7 +593,7 @@
}
void checkOverviewSummaryModules() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -642,7 +616,7 @@
}
void checkOverviewSummaryPackages() {
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -661,7 +635,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -682,7 +656,7 @@
}
void checkHtml5OverviewSummaryModules() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -705,7 +679,7 @@
}
void checkHtml5OverviewSummaryPackages() {
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
@@ -728,7 +702,7 @@
+ "<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>");
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ "<thead>\n"
@@ -861,27 +835,6 @@
+ "</a>");
}
- void checkModuleClickThroughLinks() {
- checkOutput("module-overview-frame.html", true,
- "<li><a href=\"moduleA/module-frame.html\" target=\"packageListFrame\" "
- + "onclick=\"updateModuleFrame('moduleA/module-type-frame.html','moduleA/module-summary.html');"
- + "\">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"
- + " top.packageFrame.location = pFrame;\n"
- + " top.classFrame.location = cFrame;\n"
- + "}");
- }
-
- void checkModuleClickThrough(boolean found) {
- checkFiles(found,
- "moduleA/module-type-frame.html",
- "moduleB/module-type-frame.html");
- }
-
void checkModuleFilesAndLinks(boolean found) {
checkFileAndOutput("moduleA/testpkgmdlA/package-summary.html", found,
"<li><a href=\"../module-summary.html\">Module</a></li>",
@@ -897,26 +850,7 @@
"<div class=\"subTitle\"><span class=\"packageLabelInType\">"
+ "Package</span> <a href=\"package-summary.html\">testpkgmdlB</a></div>");
checkFiles(found,
- "moduleA/module-frame.html",
- "moduleA/module-summary.html",
- "module-overview-frame.html");
- }
-
- void checkModuleFrameFiles(boolean found) {
- checkFiles(found,
- "moduleC/module-frame.html",
- "moduleC/module-type-frame.html",
- "module-overview-frame.html");
- checkFiles(true,
- "moduleC/module-summary.html",
- "allclasses-frame.html");
- checkFiles(false,
- "allclasses-noframe.html");
- }
-
- void checkAllModulesLink(boolean found) {
- checkOutput("overview-frame.html", found,
- "<li><a href=\"module-overview-frame.html\" target=\"packageListFrame\">All Modules</a></li>");
+ "moduleA/module-summary.html");
}
void checkModulesInSearch(boolean found) {
@@ -950,7 +884,7 @@
}
void checkModuleModeCommon() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">This is a test description for the moduleA module with a Search "
@@ -1155,13 +1089,6 @@
"@AnnotationTypeUndocumented");
}
- void checkOverviewFrame(boolean found) {
- checkOutput("index.html", !found,
- "<iframe src=\"overview-frame.html\" name=\"packageListFrame\" title=\"All Packages\"></iframe>");
- checkOutput("index.html", found,
- "<iframe src=\"module-overview-frame.html\" name=\"packageListFrame\" title=\"All Modules\"></iframe>");
- }
-
void checkModuleSummaryNoExported(boolean found) {
checkOutput("moduleNoExport/module-summary.html", found,
"<!-- ============ PACKAGES SUMMARY =========== -->\n"
@@ -1172,7 +1099,7 @@
}
void checkGroupOption() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"overviewSummary\">\n"
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
@@ -1194,14 +1121,14 @@
+ "var rowColor = \"rowColor\";\n"
+ "var tableTab = \"tableTab\";\n"
+ "var activeTableTab = \"activeTableTab\";");
- checkOutput("overview-summary.html", false,
+ checkOutput("index.html", false,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>",
"Java SE Modules");
}
void checkGroupOptionOrdering() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
@@ -1217,7 +1144,7 @@
+ "Other Modules</button></div>",
"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,
+ checkOutput("index.html", false,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
@@ -1235,7 +1162,7 @@
}
void checkUnnamedModuleGroupOption() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
+ "</div>\n"
@@ -1260,7 +1187,7 @@
}
void checkGroupOptionPackageOrdering() {
- checkOutput("overview-summary.html", true,
+ checkOutput("index.html", true,
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>"
@@ -1289,12 +1216,6 @@
+ "<dd>\n"
+ "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n"
+ "</dd>");
- checkOutput("module-overview-frame.html", found,
- "<h1 title=\"Modules\">Modules</h1>\n"
- + "<ul title=\"Modules\">\n"
- + "<li><a href=\"moduleB/module-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('moduleB/module-type-frame.html','moduleB/module-summary.html');\">moduleB</a></li>\n"
- + "<li><a href=\"test.moduleFullName/module-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('test.moduleFullName/module-type-frame.html','test.moduleFullName/module-summary.html');\">test.moduleFullName</a></li>\n"
- + "</ul>");
checkOutput("test.moduleFullName/module-summary.html", !found,
"<div class=\"header\">\n"
+ "<h1 title=\"Module\" class=\"title\">Module moduleFullName</h1>\n"