mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 02:54:35 +02:00
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:
parent
8cffe4fb02
commit
001ebb3a72
879 changed files with 26184 additions and 9697 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -23,7 +23,7 @@
|
|||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854
|
||||
* @bug 4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188
|
||||
* @summary Make sure the Next/Prev Class links iterate through all types.
|
||||
* Make sure the navagation is 2 columns, not 3.
|
||||
* @author jamieh
|
||||
|
@ -67,5 +67,85 @@ public class TestNavigation extends JavadocTester {
|
|||
+ "<a name=\"navbar.top.firstrow\">\n"
|
||||
+ "<!-- -->\n"
|
||||
+ "</a>");
|
||||
|
||||
// Remaining tests check for additional padding to offset the fixed navigation bar.
|
||||
checkOutput("pkg/A.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->");
|
||||
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "<div class=\"header\">");
|
||||
}
|
||||
|
||||
// Test for checking additional padding to offset the fixed navigation bar in HTML5.
|
||||
@Test
|
||||
void test1() {
|
||||
javadoc("-d", "out-1", "-html5",
|
||||
"-sourcepath", testSrc,
|
||||
"pkg");
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/A.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "</nav>\n"
|
||||
+ "</header>\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->");
|
||||
|
||||
checkOutput("pkg/package-summary.html", true,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "</nav>");
|
||||
}
|
||||
|
||||
// Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML4.
|
||||
@Test
|
||||
void test2() {
|
||||
javadoc("-d", "out-2", "-nonavbar",
|
||||
"-sourcepath", testSrc,
|
||||
"pkg");
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/A.html", false,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->");
|
||||
|
||||
checkOutput("pkg/package-summary.html", false,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "<div class=\"header\">");
|
||||
}
|
||||
|
||||
// Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML5.
|
||||
@Test
|
||||
void test3() {
|
||||
javadoc("-d", "out-3", "-html5", "-nonavbar",
|
||||
"-sourcepath", testSrc,
|
||||
"pkg");
|
||||
checkExit(Exit.OK);
|
||||
|
||||
checkOutput("pkg/A.html", false,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "</nav>\n"
|
||||
+ "</header>\n"
|
||||
+ "<!-- ======== START OF CLASS DATA ======== -->");
|
||||
|
||||
checkOutput("pkg/package-summary.html", false,
|
||||
"<!-- ========= END OF TOP NAVBAR ========= -->\n"
|
||||
+ "</div>\n"
|
||||
+ "<div class=\"navPadding\"> </div>\n"
|
||||
+ "</nav>");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue