test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java

@@ -60,47 +60,43 @@
                 "pkg");
         checkExit(Exit.OK);
         checkSubNav();
 
         checkOutput("pkg/A.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/C.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/E.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/I.html", true,
                 // Test for 4664607
                 "<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
-                + "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
+                + "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         // Remaining tests check for additional padding to offset the fixed navigation bar.
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
-                + "</a></div>\n"
-                + "</nav>\n"
+                + "</span></nav>\n"
                 + "</header>\n"
                 + "<div class=\"flexContent\">\n"
                 + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
-                + "</a></div>\n"
-                + "</nav>\n"
+                + "</span></nav>\n"
                 + "</header>\n"
                 + "<div class=\"flexContent\">\n"
                 + "<main role=\"main\">\n"
                 + "<div class=\"header\">");
     }

@@ -115,25 +111,23 @@
         checkExit(Exit.OK);
         checkSubNav();
 
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
-                + "</a></div>\n"
-                + "</nav>\n"
+                + "</span></nav>\n"
                 + "</header>\n"
                 + "<div class=\"flexContent\">\n"
                 + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
-                + "</a></div>\n"
-                + "</nav>");
+                + "</span></nav>\n");
     }
 
     // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified.
     @Test
     public void test2(Path ignore) {

@@ -282,7 +276,7 @@
                 "All Classes",
                 "<script type=\"text/javascript\"><!--\n"
                 + "  allClassesLink = document.getElementById(\"allclasses_navbar_top\");",
                 "<script type=\"text/javascript\"><!--\n"
                 + "  allClassesLink = document.getElementById(\"allclasses_navbar_bottom\");");
-}
+    }
 }