8142968: Module System implementation

Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282

Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
This commit is contained in:
Alan Bateman 2016-03-17 19:04:28 +00:00
parent 8cffe4fb02
commit 001ebb3a72
879 changed files with 26184 additions and 9697 deletions

View file

@ -23,7 +23,7 @@
/*
* @test
* @bug 8072945 8081854 8141492 8148985
* @bug 8072945 8081854 8141492 8148985 8150188
* @summary Test the version of HTML generated by the javadoc tool.
* @author bpatel
* @library ../lib
@ -42,7 +42,6 @@ public class TestHtmlVersion extends JavadocTester {
@Test
void test1() {
javadoc("-d", "out-1", "-private", "-linksource", "-html5",
"-Xprofilespath", testSrc("profile-rtjar-includes.txt"),
"-sourcepath", testSrc,
"-use",
"pkg", "pkg1", "pkg2", "pkg3");
@ -55,7 +54,6 @@ public class TestHtmlVersion extends JavadocTester {
@Test
void test2() {
javadoc("-d", "out-2", "-private", "-linksource", "-html4",
"-Xprofilespath", testSrc("profile-rtjar-includes.txt"),
"-sourcepath", testSrc,
"-use",
"pkg", "pkg1", "pkg2", "pkg3");
@ -68,7 +66,6 @@ public class TestHtmlVersion extends JavadocTester {
@Test
void test3() {
javadoc("-d", "out-3", "-private", "-linksource",
"-Xprofilespath", testSrc("profile-rtjar-includes.txt"),
"-sourcepath", testSrc,
"-use",
"pkg", "pkg1", "pkg2", "pkg3");
@ -114,26 +111,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<ul>\n"
+ "<li>");
// Test for profile-overview-frame page
checkOutput("profile-overview-frame.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<nav role=\"navigation\" class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<main role=\"main\" class=\"indexContainer\">\n"
+ "<h2 title=\"Profiles\">Profiles</h2>");
// Test for <profile-name>-frame page
checkOutput("compact1-frame.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<nav role=\"navigation\" class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<main role=\"main\" class=\"indexContainer\">\n"
+ "<h2 title=\"compact1\"><a href=\"compact1-summary.html\" target=\"classFrame\">compact1</a>&nbsp;Packages</h2>");
// Test for overview-summary page
checkOutput("overview-summary.html", true,
"<!DOCTYPE HTML>",
@ -147,10 +124,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<nav role=\"navigation\">\n"
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div>\n"
+ "<h2>Profiles</h2>",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@ -238,68 +211,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Test for <profile-name>-package-frame page
checkOutput("pkg/compact1-package-frame.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<main role=\"main\">\n"
+ "<h1 class=\"bar\"><a href=\"../compact1-summary.html\" target=\"classFrame\">"
+ "compact1</a> - <a href=\"../pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h1>",
"<section role=\"region\">\n"
+ "<h2 title=\"Interfaces\">Interfaces</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Classes\">Classes</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Enums\">Enums</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Exceptions\">Exceptions</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Errors\">Errors</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Annotation Types\">Annotation Types</h2>");
// Test for <profile-name>-package-summary page
checkOutput("pkg/compact1-package-summary.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\">",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">\n"
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
"<section role=\"region\">\n"
+ "<h2 title=\"Package pkg Description\">Package pkg Description</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Test for <profile-name>-summary page
checkOutput("compact1-summary.html", true,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\">",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">\n"
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<section role=\"region\">\n"
+ "<h3><a href=\"pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h3>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Test for constant-values page
checkOutput("constant-values.html", true,
"<!DOCTYPE HTML>",
@ -724,26 +635,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<ul>\n"
+ "<li>");
// Negated test for profile-overview-frame page
checkOutput("profile-overview-frame.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<div class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<div class=\"indexContainer\">\n"
+ "<h2 title=\"Profiles\">Profiles</h2>");
// Negated test for <profile-name>-frame page
checkOutput("compact1-frame.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<div class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<div class=\"indexContainer\">\n"
+ "<h2 title=\"compact1\"><a href=\"compact1-summary.html\" target=\"classFrame\">compact1</a>&nbsp;Packages</h2>");
// Negated test for overview-summary page
checkOutput("overview-summary.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
@ -755,11 +646,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<caption>",
"</noscript>\n"
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "<div class=\"contentContainer\">\n"
+ "<div>\n"
+ "<h2>Profiles</h2>");
+ "<!-- ========= START OF TOP NAVBAR ======= -->");
// Negated test for package-frame page
checkOutput("pkg/package-frame.html", false,
@ -799,42 +686,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
// Negated test for <profile-name>-package-frame page
checkOutput("pkg/compact1-package-frame.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<body>\n"
+ "<h1 class=\"bar\"><a href=\"../compact1-summary.html\" target=\"classFrame\">"
+ "compact1</a> - <a href=\"../pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h1>");
// Negated test for <profile-name>-package-summary page
checkOutput("pkg/compact1-package-summary.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
// Negated test for <profile-name>-summary page
checkOutput("compact1-summary.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
// Negated test for constant-values page
checkOutput("constant-values.html", false,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
@ -844,6 +695,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
@ -856,6 +708,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">\n"
+ "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
+ "<h2 title=\"Contents\">Contents</h2>",
@ -879,6 +732,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<li class=\"blockList\">\n"
+ "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
@ -892,6 +746,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<div class=\"contentContainer\">\n"
+ "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
@ -909,6 +764,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"contentContainer\">");
// Negated test for src-html page
@ -926,6 +782,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@ -1133,6 +990,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
"<li class=\"blockList\"><a name=\"pkg\">\n"
@ -1175,26 +1033,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<ul>\n"
+ "<li>");
// Test for profile-overview-frame page
checkOutput("profile-overview-frame.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<div class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<div class=\"indexContainer\">\n"
+ "<h2 title=\"Profiles\">Profiles</h2>");
// Test for <profile-name>-frame page
checkOutput("compact1-frame.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<div class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<div class=\"indexContainer\">\n"
+ "<h2 title=\"compact1\"><a href=\"compact1-summary.html\" target=\"classFrame\">compact1</a>&nbsp;Packages</h2>");
// Test for overview-summary page
checkOutput("overview-summary.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
@ -1206,10 +1044,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<caption>",
"</noscript>\n"
+ "<div class=\"fixedNav\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<div class=\"contentContainer\">\n"
+ "<div>\n"
+ "<h2>Profiles</h2>");
+ "<!-- ========= START OF TOP NAVBAR ======= -->");
// Test for package-frame page
checkOutput("pkg/package-frame.html", true,
@ -1250,42 +1085,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
// Test for <profile-name>-package-frame page
checkOutput("pkg/compact1-package-frame.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<body>\n"
+ "<h1 class=\"bar\"><a href=\"../compact1-summary.html\" target=\"classFrame\">"
+ "compact1</a> - <a href=\"../pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h1>");
// Test for <profile-name>-package-summary page
checkOutput("pkg/compact1-package-summary.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
// Test for <profile-name>-summary page
checkOutput("compact1-summary.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
"<meta name=\"date\"",
"<a name=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
"<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
// Test for constant-values page
checkOutput("constant-values.html", true,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
@ -1295,6 +1094,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
@ -1307,6 +1107,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">\n"
+ "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
+ "<h2 title=\"Contents\">Contents</h2>",
@ -1330,6 +1131,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<li class=\"blockList\">\n"
+ "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
@ -1344,6 +1146,7 @@ public class TestHtmlVersion extends JavadocTester {
"<li class=\"circle\">",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<h1 class=\"title\">Hierarchy For All Packages</h1>\n"
+ "<span class=\"packageHierarchyLabel\">Package Hierarchies:</span>",
@ -1363,6 +1166,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"contentContainer\">");
// Test for src-html page
@ -1380,6 +1184,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@ -1587,6 +1392,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "</a>",
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
+ "</div>\n"
+ "<div class=\"navPadding\">&nbsp;</div>\n"
+ "<div class=\"header\">",
"<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
"<li class=\"blockList\"><a name=\"pkg\">\n"
@ -1634,26 +1440,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<ul>\n"
+ "<li>");
// Negated test for profile-overview-frame page
checkOutput("profile-overview-frame.html", false,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<nav role=\"navigation\" class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<main role=\"main\" class=\"indexContainer\">\n"
+ "<h2 title=\"Profiles\">Profiles</h2>");
// Negated test for <profile-name>-frame page
checkOutput("compact1-frame.html", false,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<nav role=\"navigation\" class=\"indexNav\">\n"
+ "<ul>\n"
+ "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
"<main role=\"main\" class=\"indexContainer\">\n"
+ "<h2 title=\"compact1\"><a href=\"compact1-summary.html\" target=\"classFrame\">compact1</a>&nbsp;Packages</h2>");
// Negated test for overview-summary page
checkOutput("overview-summary.html", false,
"<!DOCTYPE HTML>",
@ -1665,14 +1451,7 @@ public class TestHtmlVersion extends JavadocTester {
+ "<caption>",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"contentContainer\">\n"
+ "<div>\n"
+ "<h2>Profiles</h2>",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
+ "<!-- ========= START OF TOP NAVBAR ======= -->");
// Negated test for package-frame page
checkOutput("pkg/package-frame.html", false,
@ -1753,66 +1532,6 @@ public class TestHtmlVersion extends JavadocTester {
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Negated test for <profile-name>-package-frame page
checkOutput("pkg/compact1-package-frame.html", false,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<main role=\"main\">\n"
+ "<h1 class=\"bar\"><a href=\"../compact1-summary.html\" target=\"classFrame\">"
+ "compact1</a> - <a href=\"../pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h1>",
"<section role=\"region\">\n"
+ "<h2 title=\"Interfaces\">Interfaces</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Classes\">Classes</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Enums\">Enums</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Exceptions\">Exceptions</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Errors\">Errors</h2>",
"<section role=\"region\">\n"
+ "<h2 title=\"Annotation Types\">Annotation Types</h2>");
// Negated test for <profile-name>-package-summary page
checkOutput("pkg/compact1-package-summary.html", false,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\">",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
"<section role=\"region\">\n"
+ "<h2 title=\"Package pkg Description\">Package pkg Description</h2>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Negated test for <profile-name>-summary page
checkOutput("compact1-summary.html", false,
"<!DOCTYPE HTML>",
"<meta name=\"dc.created\"",
"<a id=\"navbar.top.firstrow\">\n"
+ "<!-- -->\n"
+ "</a>",
"<table class=\"typeSummary\">",
"<header role=\"banner\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ========= START OF TOP NAVBAR ======= -->",
"<main role=\"main\">\n"
+ "<div class=\"header\">",
"<ul class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<section role=\"region\">\n"
+ "<h3><a href=\"pkg/compact1-package-summary.html\" target=\"classFrame\">pkg</a></h3>\n",
"<footer role=\"contentinfo\">\n"
+ "<nav role=\"navigation\">\n"
+ "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
// Negated test for constant-values page
checkOutput("constant-values.html", false,
"<!DOCTYPE HTML>",