< prev index next >

test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java

Print this page

        

@@ -69,13 +69,11 @@
     void html5Output() {
         // Test for overview-summary page
         checkOutput("index.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<div class=\"overviewSummary\">\n"
                 + "<table>\n"
                 + "<caption>",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"

@@ -86,22 +84,18 @@
 
         // Test for package-summary page
         checkOutput("pkg/package-summary.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<div class=\"typeSummary\">\n<table>",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<section class=\"packageDescription\"><a id=\"package.description\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"packageDescription\" id=\"package.description\">\n"
                 + "<div class=\"block\">Test package.</div>",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
         // No package description

@@ -115,13 +109,11 @@
 
         // Test for package-tree page
         checkOutput("pkg/package-tree.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<li class=\"circle\">",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"

@@ -140,13 +132,11 @@
 
         // Test for package-use page
         checkOutput("pkg1/package-use.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<div class=\"useSummary\">\n<table>",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"

@@ -157,35 +147,31 @@
 
         // Test for constant-values page
         checkOutput("constant-values.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<div class=\"constantsSummary\">\n<table>",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
                 "<section class=\"packages\">\n"
                 + "<h2 title=\"Contents\">Contents</h2>\n",
-                "<section class=\"constantsSummary\">\n"
+                "<section class=\"constantsSummary\" id=\"pkg\">\n"
                 + "<h2 title=\"pkg\">pkg.*</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for deprecated-list page
         checkOutput("deprecated-list.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<div class=\"deprecatedSummary\">\n<table>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
+                "<div class=\"deprecatedSummary\" id=\"class\">\n<table>",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",

@@ -195,13 +181,11 @@
 
         // Test for serialized-form page
         checkOutput("serialized-form.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",

@@ -213,13 +197,11 @@
 
         // Test for overview-tree page
         checkOutput("overview-tree.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<li class=\"circle\">",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"

@@ -238,13 +220,11 @@
 
         // Test for index-all page
         checkOutput("index-all.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "</header>\n"
                 + "<div class=\"flexContent\">\n"

@@ -261,13 +241,11 @@
 
         // Test for help-doc page
         checkOutput("help-doc.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",

@@ -283,224 +261,163 @@
 
         // Test for a regular class page and members (nested class, field, constructore and method)
         checkOutput("pkg/AnotherClass.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n"
                 + "<h2>Nested Class Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"fieldSummary\"><a id=\"field.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"fieldSummary\" id=\"field.summary\">\n"
                 + "<h2>Field Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"methodSummary\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"methodSummary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>",
-                "<section class=\"fieldDetails\">"
-                + "<a id=\"field.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"fieldDetails\" id=\"field.detail\">\n"
                 + "<h2>Field Details</h2>\n",
-                "<section class=\"constructorDetails\">"
-                + "<a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
-                "<section class=\"methodDetails\">"
-                + "<a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"methodDetails\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for enum page
         checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"constantsSummary\" id=\"enum.constant.summary\">\n"
                 + "<h2>Enum Constant Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n",
                 "<table aria-labelledby=\"t0\">\n",
-                "<section class=\"methodSummary\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"methodSummary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n",
                 "<table aria-labelledby=\"t0\">",
-                "<section class=\"constantDetails\">"
-                + "<a id=\"enum.constant.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"constantDetails\" id=\"enum.constant.detail\">\n"
                 + "<h2>Enum Constant Details</h2>\n",
-                "<section class=\"methodDetails\">"
-                + "<a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"methodDetails\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for interface page
         checkOutput("pkg2/Interface.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"methodSummary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n",
                 "<table aria-labelledby=\"t0\">\n",
-                "<section class=\"methodDetails\">"
-                + "<a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"methodDetails\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for error page
         checkOutput("pkg/TestError.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>",
-                "<section class=\"constructorDetails\">"
-                + "<a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for exception page
         checkOutput("pkg/TestException.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>",
-                "<section class=\"constructorDetails\">"
-                + "<a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for annotation page
         checkOutput("pkg2/TestAnnotationType.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\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"
-                + "</a>\n"
+                "<section class=\"memberSummary\" id=\"annotation.type.required.element.summary\">\n"
                 + "<h2>Required Element Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"memberSummary\"><a id=\"annotation.type.optional.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"memberSummary\" id=\"annotation.type.optional.element.summary\">\n"
                 + "<h2>Optional Element Summary</h2>\n"
                 + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"memberDetails\">"
-                + "<a id=\"annotation.type.element.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h2>Element Details</h2>",
+                "<section class=\"details\" id=\"annotation.type.element.detail\">\n"
+                + "<ul class=\"blockList\">\n"
+                + "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
+                + "<li class=\"blockList\">\n"
+                + "<section class=\"memberDetails\">\n"
+                + "<h2>Element Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
 
         // Test for class use page
         checkOutput("pkg1/class-use/RegClass.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<header role=\"banner\" class=\"flexHeader\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
                 "<div class=\"useSummary\">\n<table>",
-                "<section class=\"detail\"><a id=\"pkg\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
+                "<section class=\"detail\" id=\"pkg\">\n"
                 + "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
                 + "<div class=\"useSummary\">\n<table>",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
< prev index next >