--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Wed Nov 27 12:18:40 2019 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java Wed Nov 27 13:08:16 2019 +0100
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202
- * 8202624 8210047 8184205 8221871 8223733
+ * 8202624 8210047 8184205 8221871 8223733 8223378
* @summary Test the version of HTML generated by the javadoc tool.
* @author bpatel
* @library ../../lib
@@ -78,9 +78,8 @@
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
@@ -94,9 +93,8 @@
+ "<!-- -->\n"
+ "</a>",
"<div class=\"typeSummary\">\n<table>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -124,9 +122,8 @@
+ "<!-- -->\n"
+ "</a>",
"<li class=\"circle\">",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -150,9 +147,8 @@
+ "<!-- -->\n"
+ "</a>",
"<div class=\"useSummary\">\n<table>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -168,9 +164,8 @@
+ "<!-- -->\n"
+ "</a>",
"<div class=\"constantsSummary\">\n<table>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -190,9 +185,8 @@
+ "<!-- -->\n"
+ "</a>",
"<div class=\"deprecatedSummary\">\n<table>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -207,9 +201,8 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -227,9 +220,8 @@
+ "<!-- -->\n"
+ "</a>",
"<li class=\"circle\">",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -252,11 +244,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"</header>\n"
+ + "<div class=\"flexContent\">\n"
+ "<main role=\"main\">",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
@@ -275,9 +267,8 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -298,11 +289,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"nestedClassSummary\"><a id=\"nested.class.summary\">\n"
+ "<!-- -->\n"
@@ -349,11 +340,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"constantsSummary\"><a id=\"enum.constant.summary\">\n"
+ "<!-- -->\n"
@@ -388,11 +379,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"methodSummary\"><a id=\"method.summary\">\n"
+ "<!-- -->\n"
@@ -416,11 +407,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
+ "<!-- -->\n"
@@ -442,11 +433,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
+ "<!-- -->\n"
@@ -468,11 +459,11 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ + "<!-- ======== START OF CLASS DATA ======== -->\n"
+ "<div class=\"header\">",
"<section class=\"memberSummary\"><a id=\"annotation.type.required.element.summary\">\n"
+ "<!-- -->\n"
@@ -500,9 +491,8 @@
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<header role=\"banner\">\n"
+ "<header role=\"banner\" class=\"flexHeader\">\n"
+ "<nav role=\"navigation\">\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
@@ -528,7 +518,6 @@
"<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption>",
"</noscript>\n"
- + "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->");
// Negated test for package-summary page
@@ -574,11 +563,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">",
"<div class=\"constantsSummary\">\n"
+ "<table summary=\"Constant Field Values table, listing constant fields, and values\">");
@@ -592,11 +576,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">\n"
+ "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
+ "<h2 title=\"Contents\">Contents</h2>",
@@ -620,11 +599,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">",
"<li class=\"blockList\">\n"
+ "<h2 title=\"Package\">Package pkg</h2>");
@@ -638,11 +612,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">",
"<div class=\"contentContainer\">\n"
+ "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
@@ -660,11 +629,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"contentContainer\">");
// Negated test for src-html page
@@ -682,11 +646,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">",
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@@ -703,8 +662,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- ======== NESTED CLASS SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"nested.class.summary\">\n"
@@ -763,8 +720,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n"
@@ -801,8 +756,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- ========== METHOD SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"method.summary\">\n"
@@ -825,8 +778,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
@@ -847,8 +798,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
@@ -869,8 +818,6 @@
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
- "<!-- ======== START OF CLASS DATA ======== -->\n"
- + "<div class=\"header\">",
"<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n"
+ "<ul class=\"blockList\">\n"
+ "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n"
@@ -903,11 +850,6 @@
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "<div class=\"header\">",
"<div class=\"useSummary\">\n"
+ "<table summary=\"Use table, listing packages, and an explanation\">",