Source code

# HG changeset patch # User bpatel # Date 1520361947 28800 # Node ID 771616d26ca1adf42233b15310d38473fc1b0121 # Parent 67912cbf784a72004afa75813dbf3bce91a2e253 8182765: HTML5 must be the default javadoc codegen mode in the near future Reviewed-by: jjg diff -r 67912cbf784a -r 771616d26ca1 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Tue Mar 06 17:43:21 2018 +0100 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Tue Mar 06 10:45:47 2018 -0800 @@ -307,8 +307,7 @@ } if (htmlVersion == null) { - reporter.print(WARNING, getText("doclet.HTML_version_not_specified", helpfile)); - htmlVersion = HtmlVersion.HTML4; + htmlVersion = HtmlVersion.HTML5; } // check if helpfile exists @@ -658,6 +657,7 @@ new Option(resources, "-html4") { @Override public boolean process(String opt, List args) { + reporter.print(WARNING, getText("doclet.HTML_4_specified", helpfile)); htmlVersion = HtmlVersion.HTML4; return true; } diff -r 67912cbf784a -r 771616d26ca1 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Tue Mar 06 17:43:21 2018 +0100 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties Tue Mar 06 10:45:47 2018 -0800 @@ -445,9 +445,8 @@ disable checks for the specified packages. # L10N: do not localize the option names -html4 and -html5 -doclet.HTML_version_not_specified=\ - You have not specified the version of HTML to use.\n\ - The default is currently HTML 4.01, but this will change to HTML5\n\ - in a future release. To suppress this warning, please specify the\n\ - version of HTML used in your documentation comments and to be\n\ - generated by this doclet, using the -html4 or -html5 options. +doclet.HTML_4_specified=\ + You have specified the HTML version as HTML 4.01 by using the -html4 option.\n\ + The default is currently HTML5 and the support for HTML 4.01 will be removed\n\ + in a future release. To suppress this warning, please ensure that any HTML constructs\n\ + in your comments are valid in HTML5, and remove the -html4 option. diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java --- a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2018, 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 4638136 7198273 8025633 8081854 + * @bug 4638136 7198273 8025633 8081854 8182765 * @summary Add ability to skip over nav bar for accessibility * @author dkramer * @library ../lib @@ -46,21 +46,37 @@ "p1", "p2"); checkExit(Exit.OK); - // Testing only for the presence of the and + // Testing only for the presence of the and checkOutput("p1/C1.html", true, // Top navbar "Skip navigation links", // Top navbar - "\n" + "", // Bottom navbar "Skip navigation links", // Bottom navbar + ""); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "p1", "p2"); + checkExit(Exit.OK); + + // Testing only for the presence of + checkOutput("p1/C1.html", true, + "\n" + + "\n" + + "", "\n" + "\n" + ""); - - } } diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java --- a/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/AccessSummary/AccessSummary.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2018, 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 4637604 4775148 8183037 + * @bug 4637604 4775148 8183037 8182765 * @summary Test the tables for summary attribute * @author dkramer * @library ../lib @@ -47,15 +47,29 @@ void testAccessSummary() { javadoc("-d", "out", "-sourcepath", testSrc, "p1", "p2"); checkExit(Exit.OK); - checkOutput("overview-summary.html", true, + checkSummary(false); + } + + @Test + void testAccessSummary_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "p1", "p2"); + checkExit(Exit.OK); + checkSummary(true); + } + + void checkSummary(boolean found) { + checkOutput("overview-summary.html", found, "summary=\"Package Summary table, listing packages, and an explanation\""); - // Test that the summary attribute appears - checkOutput("p1/C1.html", true, + // Test that the summary attribute appears or not + checkOutput("p1/C1.html", found, "summary=\"Constructor Summary table, listing constructors, and an explanation\""); - // Test that the summary attribute appears - checkOutput("constant-values.html", true, + // Test that the summary attribute appears or not + checkOutput("constant-values.html", found, "summary=\"Constant Field Values table, listing constant fields, and values\""); } } diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java --- a/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/MetaTag/MetaTag.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2018, 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 4034096 4764726 6235799 + * @bug 4034096 4764726 6235799 8182765 * @summary Add support for HTML keywords via META tag for * class and member names to improve API search * @author dkramer @@ -58,23 +58,7 @@ checkExit(Exit.OK); - checkOutput("p1/C1.html", true, - "", - "", - "", - "", - ""); - - checkOutput("p1/package-summary.html", true, - ""); - - checkOutput("overview-summary.html", true, - ""); - - // NOTE: Hopefully, this regression test is not run at midnight. If the output - // was generated yesterday and this test is run today, the test will fail. - checkOutput("overview-summary.html", true, - ""); + checkMeta("dc.created", true); } @Test @@ -87,24 +71,55 @@ checkExit(Exit.OK); // No keywords when -keywords is not used. - checkOutput("p1/C1.html", false, - "", - "", - "", - "", - ""); + checkMeta("dc.created", false); + } + + @Test + void testStandard_html4() { + javadoc("-d", "out-1-html4", + "-html4", + "-sourcepath", testSrc, + "-keywords", + "-doctitle", "Sample Packages", + "p1", "p2"); + + checkExit(Exit.OK); + + checkMeta("date", true); + } - checkOutput("p1/package-summary.html", false, - ""); + @Test + void testNoTimestamp_html4() { + javadoc("-d", "out-2-html4", + "-html4", + "-sourcepath", testSrc, + "-notimestamp", + "-doctitle", "Sample Packages", + "p1", "p2"); + checkExit(Exit.OK); + + // No keywords when -keywords is not used. + checkMeta("date", false); + } - checkOutput("overview-summary.html", false, - ""); + void checkMeta(String metaNameDate, boolean found) { + checkOutput("p1/C1.html", found, + "", + "", + "", + "", + ""); - // The date metatag should not show up when -notimestamp is used. + checkOutput("p1/package-summary.html", found, + ""); + + checkOutput("overview-summary.html", found, + ""); + // NOTE: Hopefully, this regression test is not run at midnight. If the output // was generated yesterday and this test is run today, the test will fail. - checkOutput("overview-summary.html", false, - ""); + checkOutput("overview-summary.html", found, + ""); } private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java --- a/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/ValidHtml/ValidHtml.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2018, 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 4275630 4749453 4625400 4753048 4415270 8074521 + * @bug 4275630 4749453 4625400 4753048 4415270 8074521 8182765 * @summary Generated HTML is invalid with frames. * Displays unnecessary horizontal scroll bars. * Missing whitespace in DOCTYPE declaration @@ -53,26 +53,42 @@ "-sourcepath", testSrc, "p1", "p2"); checkExit(Exit.OK); - - // Test the proper DOCTYPE element are present: - checkOutput("index.html", true, LOOSE); - checkOutput("overview-summary.html", true, LOOSE); - checkOutput("p1/package-summary.html", true, LOOSE); - checkOutput("p1/C.html", true, LOOSE); - checkOutput("overview-frame.html", true, LOOSE); - checkOutput("allclasses-frame.html", true, LOOSE); - checkOutput("p1/package-frame.html", true, LOOSE); - // Test for IFRAME element: checkOutput("index.html", true, "\n" + ""); + String HTML5 = ""; + checkValidHTML(HTML5); } - private static final String LOOSE = - ""; + @Test + void test_html4() { + // Test for all cases except the split index page + javadoc("-d", "out-html4", + "-html4", + "-doctitle", "Document Title", + "-windowtitle", "Window Title", + "-use", + "-overview", testSrc("overview.html"), + "-sourcepath", testSrc, + "p1", "p2"); + checkExit(Exit.OK); + String HTML4 = ""; + + checkValidHTML(HTML4); } + + void checkValidHTML(String doctype) { + // Test the proper DOCTYPE element are present: + checkOutput("index.html", true, doctype); + checkOutput("overview-summary.html", true, doctype); + checkOutput("p1/package-summary.html", true, doctype); + checkOutput("p1/C.html", true, doctype); + checkOutput("overview-frame.html", true, doctype); + checkOutput("allclasses-frame.html", true, doctype); + checkOutput("p1/package-frame.html", true, doctype); + } +} diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java --- a/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 8025633 8025524 8081854 8187521 + * @bug 8025633 8025524 8081854 8187521 8182765 * @summary Test for valid name attribute in HTML anchors. * @author Bhavesh Patel * @library /tools/lib ../lib @@ -33,7 +33,6 @@ */ import java.io.IOException; -import java.nio.charset.Charset; import java.nio.file.Path; import java.nio.file.Paths; @@ -54,6 +53,7 @@ @Test void testHtml4(Path ignore) { javadoc("-d", "out-html4", + "-html4", "-sourcepath", testSrc, "-source", "8", //so that '_' can be used as an identifier "-use", @@ -175,7 +175,6 @@ "-sourcepath", testSrc, "-source", "8", //so that '_' can be used as an identifier "-use", - "-html5", "pkg1"); checkExit(Exit.OK); diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java --- a/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2018, 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 8025633 8081854 + * @bug 8025633 8081854 8182765 * @summary Make sure that annotations types with optional elements have * element headers * @author Mahmood Ali @@ -48,6 +48,18 @@ checkExit(Exit.OK); checkOutput("pkg/AnnotationOptional.html", true, + ""); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "pkg"); + checkExit(Exit.OK); + + checkOutput("pkg/AnnotationOptional.html", true, ""); } } diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java --- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 + * @bug 4973609 8015249 8025633 8026567 6469561 8071982 8162363 8182765 * @summary Make sure that annotation types with 0 members does not have * extra HR tags. * @author jamieh @@ -72,11 +72,11 @@ checkOutput("pkg/AnnotationType.html", true, "", "

", - "

", + "

", "", "", "

Element Detail

", - "", + "", "", "", "

\n\n" + "

" + "" + "

AnnotationTypeField

", + ""); } +} diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java --- a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java Tue Mar 06 10:45:47 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2018, 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 4652655 4857717 8025633 8026567 8071982 8164407 + * @bug 4652655 4857717 8025633 8026567 8071982 8164407 8182765 * @summary This test verifies that class cross references work properly. * @author jamieh * @library ../lib @@ -35,6 +35,8 @@ public class TestClassCrossReferences extends JavadocTester { + static final String uri = "http://docs.oracle.com/javase/8/docs/api/"; + public static void main(String... args) throws Exception { TestClassCrossReferences tester = new TestClassCrossReferences(); tester.runTests(); @@ -42,8 +44,6 @@ @Test void test() { - final String uri = "http://docs.oracle.com/javase/8/docs/api/"; - javadoc("-d", "out", "-Xdoclint:none", "-sourcepath", testSrc, @@ -58,7 +58,7 @@ + "title=\"class or interface in javax.swing.text\" class=\"externalLink\">Link to AttributeContext innerclass", "Link to external class BigDecimal", - "Link to external member gcd", "Link to external member URI", @@ -68,4 +68,18 @@ + ""); } + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-Xdoclint:none", + "-sourcepath", testSrc, + "-linkoffline", uri, testSrc, + testSrc("C.java")); + checkExit(Exit.OK); + + checkOutput("C.html", true, + "Link to external member gcd"); } +} diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java --- a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 8163800 8175200 8186332 + * @bug 8163800 8175200 8186332 8182765 * @summary The fix for JDK-8072052 shows up other minor incorrect use of styles * @library ../lib * @modules jdk.javadoc/jdk.javadoc.internal.tool @@ -51,11 +51,11 @@ checkOutput("p/C1.html", true, "C2", - "C1()"); + "C1()"); checkOutput("p/C2.html", true, "C3", - "C2()"); + "C2()"); checkOutput("p/C3.html", true, "I1, " @@ -63,7 +63,7 @@ + "I2, " + "IT1<T>, " + "IT2<java.lang.String>", - "C3()"); + "C3()"); checkOutput("p/I1.html", true, "C3", @@ -82,7 +82,26 @@ checkOutput("p/IT2.html", true, "code>C3"); - } + @Test + void test_html4() { + + javadoc("-d", "out-html4", + "-html4", + "-Xdoclint:none", + "-sourcepath", testSrc, + "-package", + "p"); + checkExit(Exit.OK); + + checkOutput("p/C1.html", true, + "C1()"); + + checkOutput("p/C2.html", true, + "C2()"); + + checkOutput("p/C3.html", true, + "C3()"); } +} diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java --- a/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testConstructors/TestConstructors.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 8025524 8031625 8081854 8175200 8186332 + * @bug 8025524 8031625 8081854 8175200 8186332 8182765 * @summary Test for constructor name which should be a non-qualified name. * @author Bhavesh Patel * @library ../lib @@ -48,6 +48,57 @@ checkOutput("pkg1/Outer.html", true, "
See Also:
\n" + + "
Inner(), \n" + + "Inner(int), \n" + + "NestedInner(), \n" + + "NestedInner(int), \n" + + "Outer(), \n" + + "Outer(int)
", + "Link: Inner(), " + + "Outer(int), " + + "NestedInner(int)", + "Outer()", + "", + "Outer(int i)", + ""); + + checkOutput("pkg1/Outer.Inner.html", true, + "Inner()", + "", + "Inner(int i)", + ""); + + checkOutput("pkg1/Outer.Inner.NestedInner.html", true, + "NestedInner()", + "", + "NestedInner(int i)", + ""); + + checkOutput("pkg1/Outer.Inner.html", false, + "Outer.Inner()", + "Outer.Inner(int)"); + + checkOutput("pkg1/Outer.Inner.NestedInner.html", false, + "Outer.Inner.NestedInner()", + "Outer.Inner.NestedInner(int)"); + + checkOutput("pkg1/Outer.html", false, + "Outer.Inner()", + "Outer.Inner(int)", + "Outer.Inner.NestedInner()", + "Outer.Inner.NestedInner(int)"); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "pkg1"); + checkExit(Exit.OK); + + checkOutput("pkg1/Outer.html", true, + "
See Also:
\n" + "
Inner(), \n" + "Inner(int), \n" + "NestedInner(), \n" diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Tue Mar 06 10:45:47 2018 -0800 @@ -24,7 +24,7 @@ /* * @test * @bug 4927552 8026567 8071982 8162674 8175200 8175218 8183511 8186332 - * 8169819 8074407 8191030 + * 8169819 8074407 8191030 8182765 * @summary test generated docs for deprecated items * @author jamieh * @library ../lib @@ -209,6 +209,97 @@ + "
Enum Constants
\n" + "
Annotation Type Elements
\n" + "

", + "", + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "", + "

For Removal
Element	Description

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Enums
Enum	Description
pkg.TestEnum	\n" + + " enum_test1 passes. \n" + + "

", + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Exceptions
Exceptions	Description
pkg.TestException	\n" + + " exception_test1 passes. \n" + + "

", + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Fields
Field	Description
pkg.DeprecatedClassByAnnotation.field
pkg.TestAnnotationType.field	\n" + + " annotation_test4 passes. \n" + + "
pkg.TestClass.field	\n" + + " class_test2 passes. This is the second sentence of deprecated description for a field. \n" + + "
pkg.TestError.field	\n" + + " error_test2 passes. \n" + + "
pkg.TestException.field	\n" + + " exception_test2 passes. \n" + + "
pkg.TestInterface.field	\n" + + " interface_test2 passes. \n" + + "

Overrides:

\n" + + "

read in class

"
+                + "FilterReader

", + "

Specified by:

\n" + + "

readInt in interface

"
+                + "DataInput

" + ); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "-linkoffline", uri, testSrc, + "pkg"); + checkExit(Exit.OK); + + checkOutput("pkg/XReader.html", true, + "

Overrides:

\n" + "

read in class

"
                 + "",
-                "",
+                "",
+                "",
                 "

Direct Known Subclasses:

\n" +
                 "" +
                 "A.VisibleInner, A.VisibleInnerExtendsInvisibleInner");
 
         checkOutput("pkg1/A.html", false,
-                "",
-                "");
+                "",
+                "");
 
         checkOutput("pkg1/A.VisibleInner.html", true,
                 "visibleField",
-                "visibleMethod",
+                "visibleMethod",
                 "Nested classes/interfaces inherited from class pkg1." +
                 "A\n" +
                 "" +
@@ -73,16 +72,16 @@
                 "");
 
         checkOutput("pkg1/A.VisibleInner.html", false,
-                "../pkg1/A.VisibleInner.html#VisibleInner--",
-                "",
-                "");
+                "../pkg1/A.VisibleInner.html#VisibleInner()",
+                "",
+                "");
 
         checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", true,
                 "public static class " +
                 "A.VisibleInnerExtendsInvisibleInner\n" +
                 "extends A",
                 "visibleField",
-                "visibleMethod");
+                "visibleMethod");
 
         checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", false,
                 "invisibleField",
@@ -98,6 +97,33 @@
         checkFiles(false,
                 "pkg1/A.InvisibleInner.html",
                 "pkg1/A.InvisibleInnerExtendsVisibleInner.html");
+    }
 
+    @Test
+    public void test1_html4() {
+        javadoc("-d", "out1-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-package",
+                "pkg1");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg1/A.html", true,
+                "",
+                "");
+
+        checkOutput("pkg1/A.VisibleInner.html", true,
+                "visibleMethod");
+
+        checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", true,
+                "visibleMethod");
+
+        checkOutput("pkg1/A.html", false,
+                "");
+
+        checkOutput("pkg1/A.VisibleInner.html", false,
+                "../pkg1/A.VisibleInner.html#VisibleInner--",
+                "",
+                "");
     }
 }
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
--- a/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4663254 8016328 8025633 8026567 8081854
+ * @bug      4663254 8016328 8025633 8026567 8081854 8182765
  * @summary  Verify that spaces do not appear in hrefs and anchors.
  * @author   jamieh
  * @library  ../lib
@@ -50,6 +50,49 @@
 
         checkOutput("pkg/C1.html", true,
                 //External link.
+                "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long,int)\"",
+                //Member summary table link.
+                "href=\"#method(int,int,java.util.ArrayList)\"",
+                //Anchor test.
+                "\n"
+                + "\n"
+                + "",
+                //Backward compatibility anchor test."pkg/C1.html",
+                "\n"
+                + "\n"
+                + "");
+
+        checkOutput("pkg/C2.html", true,
+                //{@link} test.
+                "Link: ",
+                //@see test.
+                "See Also:\n"
+                + ""
+        );
+
+        checkOutput("pkg/C4.html", true,
+                //Header does not link to the page itself.
+                "Class C4<E extends C4<E>>",
+                //Signature does not link to the page itself.
+                "public abstract class C4<E extends C4<E>>"
+        );
+
+        checkOutput(Output.OUT, false,
+                " tag is malformed");
+    }
+
+    @Test
+    void test_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/", testSrc,
+                "pkg");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/C1.html", true,
+                //External link.
                 "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait-long-int-\"",
                 //Member summary table link.
                 "href=\"#method-int-int-java.util.ArrayList-\"",
@@ -69,15 +112,5 @@
                 "See Also:\n"
                 + "
"
         );
-
-        checkOutput("pkg/C4.html", true,
-                //Header does not link to the page itself.
-                "Class C4<E extends C4<E>>",
-                //Signature does not link to the page itself.
-                "public abstract class C4<E extends C4<E>>"
-        );
-
-        checkOutput(Output.OUT, false,
-                " tag is malformed");
     }
 }
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6786690 6820360 8025633 8026567 8175200 8183511 8186332 8074407
+ * @bug 6786690 6820360 8025633 8026567 8175200 8183511 8186332 8074407 8182765
  * @summary This test verifies the nesting of definition list tags.
  * @author Bhavesh Patel
  * @library ../lib
@@ -58,6 +58,17 @@
     }
 
     @Test
+    void test_Comment_Deprecated_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-1-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "pkg1");
+        checkExit(Exit.OK);
+        checkCommentDeprecated_html4(true);
+    }
+
+    @Test
     void test_NoComment_Deprecated() {
 //        tester.run(ARGS2, TEST_ALL, NEGATED_TEST_NO_C5);
 //        tester.runTestsOnHTML(NO_TEST,  NEGATED_TEST_C5);
@@ -73,6 +84,18 @@
     }
 
     @Test
+    void test_NoComment_Deprecated_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-2-html4",
+                "-html4",
+                "-nocomment",
+                "-sourcepath", testSrc,
+                "pkg1");
+        checkExit(Exit.OK);
+        checkCommentDeprecated_html4(false);
+    }
+
+    @Test
     void test_Comment_NoDeprecated() {
 //        tester.run(ARGS3, TEST_ALL, NEGATED_TEST_NO_C5);
 //        tester.runTestsOnHTML(TEST_NODEPR, TEST_NOCMNT_NODEPR);
@@ -88,6 +111,19 @@
     }
 
     @Test
+    void test_Comment_NoDeprecated_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-3-html4",
+                "-html4",
+                "-nodeprecated",
+                "-sourcepath", testSrc,
+                "pkg1");
+        checkExit(Exit.OK);
+        checkNoDeprecated_html4();
+        checkNoCommentNoDeprecated_html4(false);
+    }
+
+    @Test
     void testNoCommentNoDeprecated() {
 //        tester.run(ARGS4, TEST_ALL, NEGATED_TEST_NO_C5);
 //        tester.runTestsOnHTML(TEST_NOCMNT_NODEPR, TEST_CMNT_DEPR);
@@ -103,6 +139,19 @@
         checkCommentDeprecated(false);
     }
 
+    @Test
+    void testNoCommentNoDeprecated_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-4-html4",
+                "-html4",
+                "-nocomment",
+                "-nodeprecated",
+                "-sourcepath", testSrc,
+                "pkg1");
+        checkNoCommentNoDeprecated_html4(true);
+        checkCommentDeprecated_html4(false);
+    }
+
     void checkCommon(boolean checkC5) {
         // Test common to all runs of javadoc. The class signature should print
         // properly enclosed definition list tags and the Annotation Type
@@ -166,7 +215,7 @@
                 + "
Since:
\n"
                 + "1.4\n"
                 + "See Also:\n"
-                + ""
+                + "
"
                 + "setUndecorated(boolean)\n"
                 + "",
                 "\n"
@@ -193,7 +242,7 @@
                 + "1.4\n"
                 + "See Also:\n"
                 + ""
-                + "readObject()"
+                + "readObject()"
                 + "
\n"
                 + "
",
                 "\n"
@@ -201,7 +250,7 @@
                 + "java.io.IOException\n"
                 + "See Also:"
                 + "\n"
-                + ""
+                + "
"
                 + "setUndecorated(boolean)\n"
                 + "");
 
@@ -223,6 +272,85 @@
                 + "java.io.IOException\n"
                 + "See Also:"
                 + "\n"
+                + ""
+                + "C1.setUndecorated(boolean)\n"
+                + "",
+                "Deprecated.\n"
+                + "As of JDK version 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                + "This field indicates whether the C1 is "
+                + "undecorated.\n"
+                + " \n"
+                + "\n"
+                + "Since:\n"
+                + "1.4\n"
+                + "See Also:"
+                + "\n"
+                + ""
+                + "C1.setUndecorated(boolean)\n"
+                + "",
+                "Deprecated.\n"
+                + "As of JDK version 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                + "Reads the object stream.\n"
+                + "\n"
+                + "Throws:"
+                + "\n"
+                + "java.io.IOException\n"
+                + "",
+                "Deprecated."
+                + "\n"
+                + "The name for this class.");
+    }
+
+    void checkCommentDeprecated_html4(boolean expectFound) {
+        // Test for normal run of javadoc in which various ClassDocs and
+        // serialized form should have properly nested definition list tags
+        // enclosing comments, tags and deprecated information.
+        checkOutput("pkg1/C1.html", expectFound,
+                "\n"
+                + "Since:\n"
+                + "1.4\n"
+                + "See Also:\n"
+                + ""
+                + "setUndecorated(boolean)\n"
+                + "",
+                "\n"
+                + "Parameters:\n"
+                + "undecorated"
+                + " - true if no decorations are\n"
+                + "         to be enabled;\n"
+                + "         false "
+                + "if decorations are to be enabled.\n"
+                + "Since:"
+                + "\n"
+                + "1.4\n"
+                + "See Also:\n"
+                + ""
+                + "readObject()"
+                + "\n"
+                + "",
+                "\n"
+                + "Throws:\n"
+                + "java.io.IOException\n"
+                + "See Also:"
+                + "\n"
+                + ""
+                + "setUndecorated(boolean)\n"
+                + "");
+
+        checkOutput("serialized-form.html", expectFound,
+                "\n"
+                + "Throws:"
+                + "\n"
+                + ""
+                + "java.io.IOException\n"
+                + "See Also:"
+                + "\n"
                 + ""
                 + "C1.setUndecorated(boolean)\n"
                 + "",
@@ -252,10 +380,7 @@
                 + "Throws:"
                 + "\n"
                 + "java.io.IOException\n"
-                + "",
-                "Deprecated."
-                + "\n"
-                + "The name for this class.");
+                + "");
     }
 
     void checkNoDeprecated() {
@@ -310,6 +435,81 @@
                 + "Since:\n"
                 + "1.4\n"
                 + "See Also:\n"
+                + ""
+                + "readObject()\n"
+                + "",
+                "\n"
+                + "Throws:"
+                + "\n"
+                + "java.io.IOException\n"
+                + ""
+                + "See Also:\n"
+                + ""
+                + "setUndecorated(boolean)\n"
+                + "");
+
+        checkOutput("serialized-form.html", true,
+                "\n"
+                + "Throws:"
+                + "\n"
+                + ""
+                + "java.io.IOException\n"
+                + "See Also:"
+                + "\n"
+                + ""
+                + "C1.setUndecorated(boolean)\n"
+                + "",
+                "Deprecated.\n"
+                + "As of JDK version 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                + "This field indicates whether the C1 is "
+                + "undecorated.\n"
+                + " \n"
+                + "\n"
+                + "Since:\n"
+                + "1.4\n"
+                + "See Also:"
+                + "\n"
+                + ""
+                + "C1.setUndecorated(boolean)\n"
+                + "",
+                "Deprecated.\n"
+                + "As of JDK version 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                + "Reads the object stream.\n"
+                + "\n"
+                + "Throws:"
+                + "\n"
+                + "java.io.IOException\n"
+                + "",
+                "Deprecated."
+                + "\n"
+                + ""
+                + "The name for this class.");
+    }
+
+    void checkNoDeprecated_html4() {
+        // Test with -nodeprecated option. The ClassDocs should have properly nested
+        // definition list tags enclosing comments and tags. The ClassDocs should not
+        // display definition list for deprecated information. The serialized form
+        // should display properly nested definition list tags for comments, tags
+        // and deprecated information.
+        checkOutput("pkg1/C1.html", true,
+                "\n"
+                + "Parameters:"
+                + "\n"
+                + "undecorated - true"
+                + " if no decorations are\n"
+                + "         to be enabled;\n"
+                + "         false if decorations are to be enabled."
+                + "\n"
+                + "Since:\n"
+                + "1.4\n"
+                + "See Also:\n"
                 + ""
                 + "readObject()\n"
                 + "",
@@ -360,11 +560,7 @@
                 + "Throws:"
                 + "\n"
                 + "java.io.IOException\n"
-                + "",
-                "Deprecated."
-                + "\n"
-                + ""
-                + "The name for this class.");
+                + "");
     }
 
     void checkNoCommentNoDeprecated(boolean expectFound) {
@@ -392,6 +588,30 @@
                 "" +
                 "Deprecated.\n"
                 + "As of JDK version 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                +
+                "",
+                ""
+                + "Deprecated.\n"
+                + "As of JDK version"
+                + " 1.5, replaced by\n"
+                + " "
+                + "setUndecorated(boolean).\n"
+                + "\n"
+                + "");
+    }
+
+    void checkNoCommentNoDeprecated_html4(boolean expectFound) {
+        // Test with -nocomment and -nodeprecated options. The ClassDocs whould
+        // not display definition lists for any member details.
+        checkOutput("serialized-form.html", expectFound,
+                "boolean " +
+                "undecorated\n" +
+                "" +
+                "Deprecated.\n"
+                + "As of JDK version 1.5, replaced by\n"
                 + " "
                 + "setUndecorated(boolean).\n"
                 + "\n"
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java	Tue Mar 06 10:45:47 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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 8008164 8169819 8183037
+ * @bug 8008164 8169819 8183037 8182765
  * @summary Test styles on HTML tables generated by javadoc.
  * @author Bhavesh Patel
  * @library ../lib
@@ -45,6 +45,43 @@
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg1", "pkg2");
+        checkExit(Exit.ERROR);
+        checkOutput(Output.OUT, true,
+                "attribute not supported in HTML5: summary",
+                "attribute border for table only accepts \"\" or \"1\", use CSS instead: BORDER",
+                "attribute not supported in HTML5: cellpadding",
+                "attribute not supported in HTML5: cellspacing",
+                "attribute not supported in HTML5: align");
+
+        checkOutput("pkg1/TestTable.html", true,
+                "

",
+                "

",
+                "

",
+                "

");
+
+        checkOutput("pkg1/package-summary.html", true,
+                "

");
+
+        checkOutput("pkg1/class-use/TestTable.html", true,
+                "

");
+
+        checkOutput("overview-summary.html", true,
+                "

");
+
+        checkOutput("deprecated-list.html", true,
+            "

");
+
+        checkOutput("constant-values.html", true,
+            "

");
+    }
+
+    @Test
+    void test_html4() {
+        javadoc("-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-use",
+                "pkg1", "pkg2");
         checkExit(Exit.OK);
 
         checkOutput("pkg1/TestTable.html", true,
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      6786688 8008164 8162363 8169819 8183037
+ * @bug      6786688 8008164 8162363 8169819 8183037 8182765
  * @summary  HTML tables should have table summary, caption and table headers.
  * @author   Bhavesh Patel
  * @library  ../lib
@@ -53,11 +53,95 @@
                 "pkg1", "pkg2");
         checkExit(Exit.OK);
 
-        checkHtmlTableSummaries();
+        checkHtmlTableTag();
         checkHtmlTableCaptions();
         checkHtmlTableHeaders();
     }
 
+    @Test
+    void test_html4() {
+        javadoc("-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-use",
+                "pkg1", "pkg2");
+        checkExit(Exit.OK);
+
+        checkHtmlTableSummaries();
+    }
+
+    /*
+     * Tests for validating table tag for HTML tables
+     */
+    void checkHtmlTableTag() {
+        //Package summary
+        checkOutput("pkg1/package-summary.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/package-summary.html", true,
+                "

",
+                "

");
+
+        // Class documentation
+        checkOutput("pkg1/C1.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/C2.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/C2.ModalExclusionType.html", true,
+                "

");
+
+        checkOutput("pkg2/C3.html", true,
+                "

");
+
+        checkOutput("pkg2/C4.html", true,
+                "

");
+
+        // Class use documentation
+        checkOutput("pkg1/class-use/I1.html", true,
+                "

");
+
+        checkOutput("pkg1/class-use/C1.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/class-use/C2.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+                "

");
+
+        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
+                "

");
+
+        // Package use documentation
+        checkOutput("pkg1/package-use.html", true,
+                "

",
+                "

");
+
+        checkOutput("pkg2/package-use.html", true,
+                "

",
+                "

");
+
+        // Deprecated
+        checkOutput("deprecated-list.html", true,
+                "

",
+                "

");
+
+        // Constant values
+        checkOutput("constant-values.html", true,
+                "

");
+
+        // Overview Summary
+        checkOutput("overview-summary.html", true,
+                "

");
+    }
+
     /*
      * Tests for validating summary for HTML tables
      */
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6786682 4649116
+ * @bug 6786682 4649116 8182765
  * @summary This test verifies the use of lang attribute by .
  * @author Bhavesh Patel
  * @library ../lib
@@ -106,6 +106,104 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg3/package-summary.html", true,
+                "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "This is the first line. Note the newlines before the <p> is relevant.\n"
+                + "");
+
+        checkOutput("pkg3/A.DatatypeFactory.html", true,
+                "\n"
+                + " Factory that creates new javax.xml.datatype\n"
+                + " Objects that map XML to/from Java Objects.\n"
+                + "\n"
+                + " \n"
+                + " A new instance of the DatatypeFactory is created through the\n"
+                + " newInstance() method that uses the following implementation\n"
+                + " resolution mechanisms to determine an implementation:\n"
+                + " \n"
+                + " \n"
+                + " If the system property specified by DATATYPEFACTORY_PROPERTY,\n"
+                + " \"javax.xml.datatype.DatatypeFactory\", exists, a class with\n"
+                + " the name of the property value is instantiated. Any Exception thrown\n"
+                + " during the instantiation process is wrapped as a\n"
+                + " IllegalStateException.\n"
+                + " \n"
+                + " \n"
+                + " If the file ${JAVA_HOME}/lib/jaxp.properties exists, it is loaded in a\n"
+                + " Properties Object. The\n"
+                + " Properties Object  is then queried for the\n"
+                + " property as documented in the prior step and processed as documented in\n"
+                + " the prior step.\n"
+                + " \n"
+                + " \n"
+                + " Uses the service-provider loading facilities, defined by the\n"
+                + " ServiceLoader class, to attempt to locate and load an\n"
+                + " implementation of the service using the default loading mechanism:\n"
+                + " the service-provider loading facility will use the current thread's context class loader\n"
+                + " to attempt to load the service. If the context class loader is null, the system class loader will be used.\n"
+                + " 
\n"
+                + " In case of service configuration error a\n"
+                + " DatatypeConfigurationException will be thrown.\n"
+                + " \n"
+                + " \n"
+                + " The final mechanism is to attempt to instantiate the Class\n"
+                + " specified by DATATYPEFACTORY_IMPLEMENTATION_CLASS. Any Exception\n"
+                + " thrown during the instantiation process is wrapped as a\n"
+                + " IllegalStateException.\n"
+                + " \n"
+                + " ");
+
+        checkOutput("pkg3/A.ActivationDesc.html", true,
+                "public class A.ActivationDesc\n"
+                + "extends java.lang.Object\n"
+                + "implements java.io.Serializable\n"
+                + "An activation descriptor contains the information necessary to activate\n"
+                + " an object: \n"
+                + "  the object's group identifier,\n"
+                + " 
 the object's fully-qualified class name,\n"
+                + " 
 the object's code location (the location of the class), a codebase\n"
+                + " URL path,\n"
+                + " 
 the object's restart \"mode\", and,\n"
+                + " 
 a \"marshalled\" object that can contain object specific\n"
+                + " initialization data. \n"
+                + "\n"
+                + " \n"
+                + " A descriptor registered with the activation system can be used to\n"
+                + " recreate/activate the object specified by the descriptor. The\n"
+                + " MarshalledObject in the object's descriptor is passed as the\n"
+                + " second argument to the remote object's constructor for object to use\n"
+                + " during reinitialization/activation.");
+
+        checkOutput("pkg3/A.ActivationGroupID.html", true,
+                "public class A.ActivationGroupID\n"
+                + "extends java.lang.Object\n"
+                + "implements java.io.Serializable\n"
+                + "The identifier for a registered activation group serves several purposes:\n"
+                + " \n"
+                + " identifies the group uniquely within the activation system, and\n"
+                + " 
contains a reference to the group's activation system so that the\n"
+                + " group can contact its activation system when necessary.
\n"
+                + "\n"
+                + " The ActivationGroupID is returned from the call to\n"
+                + " ActivationSystem.registerGroup and is used to identify the\n"
+                + " group within the activation system. This group id is passed as one of the\n"
+                + " arguments to the activation group's special constructor when an\n"
+                + " activation group is created/recreated.\n"
+                + "");
+    }
+
+    @Test
+    void test_other_html4() {
+        javadoc("-locale", "en_US",
+                "-d", "out-other-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "pkg3");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg3/package-summary.html", true,
                 "\n"
                 + "\n"
                 + "\n"
@@ -154,43 +252,5 @@
                 + " IllegalStateException.\n"
                 + " \n"
                 + " ");
-
-        checkOutput("pkg3/A.ActivationDesc.html", true,
-                "public class A.ActivationDesc\n"
-                + "extends java.lang.Object\n"
-                + "implements java.io.Serializable\n"
-                + "An activation descriptor contains the information necessary to activate\n"
-                + " an object: \n"
-                + "  the object's group identifier,\n"
-                + " 
 the object's fully-qualified class name,\n"
-                + " 
 the object's code location (the location of the class), a codebase\n"
-                + " URL path,\n"
-                + " 
 the object's restart \"mode\", and,\n"
-                + " 
 a \"marshalled\" object that can contain object specific\n"
-                + " initialization data. \n"
-                + "\n"
-                + " \n"
-                + " A descriptor registered with the activation system can be used to\n"
-                + " recreate/activate the object specified by the descriptor. The\n"
-                + " MarshalledObject in the object's descriptor is passed as the\n"
-                + " second argument to the remote object's constructor for object to use\n"
-                + " during reinitialization/activation.");
-
-         checkOutput("pkg3/A.ActivationGroupID.html", true,
-                 "public class A.ActivationGroupID\n"
-                 + "extends java.lang.Object\n"
-                 + "implements java.io.Serializable\n"
-                 + "The identifier for a registered activation group serves several purposes:\n"
-                 + " \n"
-                 + " identifies the group uniquely within the activation system, and\n"
-                 + " 
contains a reference to the group's activation system so that the\n"
-                 + " group can contact its activation system when necessary.
\n"
-                 + "\n"
-                 + " The ActivationGroupID is returned from the call to\n"
-                 + " ActivationSystem.registerGroup and is used to identify the\n"
-                 + " group within the activation system. This group id is passed as one of the\n"
-                 + " arguments to the activation group's special constructor when an\n"
-                 + " activation group is created/recreated.\n"
-                 + "");
     }
 }
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037
+ * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765
  * @summary Test the version of HTML generated by the javadoc tool.
  * @author bpatel
  * @library ../lib
@@ -41,7 +41,9 @@
 
     @Test
     void test1() {
-        javadoc("-d", "out-1", "-private", "-linksource", "-html5",
+        javadoc("-d", "out-1",
+                "-private",
+                "-linksource",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
@@ -53,7 +55,10 @@
 
     @Test
     void test2() {
-        javadoc("-d", "out-2", "-private", "-linksource", "-html4",
+        javadoc("-d", "out-2",
+                "-html4",
+                "-private",
+                "-linksource",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
@@ -65,7 +70,10 @@
 
     @Test
     void test3() {
-        javadoc("-d", "out-3", "-private", "-linksource",
+        javadoc("-d", "out-3",
+                "-html4",
+                "-private",
+                "-linksource",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg", "pkg1", "pkg2", "pkg3");
@@ -77,7 +85,9 @@
 
     @Test
     void test4() {
-        javadoc("-d", "out-4", "-private", "-linksource", "-html5",
+        javadoc("-d", "out-4",
+                "-private",
+                "-linksource",
                 "-sourcepath", testSrc,
                 "-use",
                 "pkg3");
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java
--- a/test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlWarning/TestHtmlWarning.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8194955
+ * @bug 8194955 8182765
  * @summary Warn when default HTML version is used.
  * @library ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -47,8 +47,11 @@
     }
 
     private static final Path testFile = Paths.get("C.java");
-    private static final String warning =
-        "javadoc: warning - You have not specified the version of HTML to use.";
+    private static final String warning
+            = "javadoc: warning - You have specified the HTML version as HTML 4.01 by using the -html4 option.\n"
+            + "The default is currently HTML5 and the support for HTML 4.01 will be removed\n"
+            + "in a future release. To suppress this warning, please ensure that any HTML constructs\n"
+            + "in your comments are valid in HTML5, and remove the -html4 option.";
 
     @Test
     void testHtml4() {
@@ -57,7 +60,7 @@
                 testFile.toString());
         checkExit(Exit.OK);
 
-        checkOutput(Output.OUT, false, warning);
+        checkOutput(Output.OUT, true, warning);
     }
 
     @Test
@@ -76,6 +79,6 @@
                 testFile.toString());
         checkExit(Exit.OK);
 
-        checkOutput(Output.OUT, true, warning);
+        checkOutput(Output.OUT, false, warning);
     }
 }
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
--- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java	Tue Mar 06 10:45:47 2018 -0800
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200
-             8186332 8186703
+             8186332 8186703 8182765
  * @summary  Verify that the public modifier does not show up in the
  *           documentation for public methods, as recommended by the JLS.
  *           If A implements I and B extends A, B should be in the list of
@@ -99,14 +99,14 @@
                 + "",
                 //Make sure "Specified By" has substituted type parameters.
                 "Specified by:\n"
-                + "method"
+                + "
method"
                 + " in interface "
                 + ""
                 + "Interface<"
                 + "CE>
",
                 //Make sure "Overrides" has substituted type parameters.
                 "Overrides:\n"
-                + "method"
+                + "
method"
                 + " in class Parent<CE>
");
@@ -120,7 +120,7 @@
                 + "
");
 
         checkOutput("pkg/Interface.html", false,
-                "public int method()",
+                "public int method--",
                 "public static final int field");
 
         checkOutput("pkg/ClassWithStaticMembers.html", false,
@@ -135,6 +135,52 @@
 
                 "

\n"
                 + "

\n"
+                + "

\n",
+
+                "staticMethod\n"
+                + "public static void staticMethod()\n"
+                + ""
+                + "Description copied from interface: "
+                + ""
+                + "InterfaceWithStaticMembers\n"
+                + "A static method\n");
+
+        checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true,
+                "public static class "
+                + "ClassWithStaticMembers.InnerClass\n"
+                + "extends java.lang.Object\n"
+                + "A hider inner class");
+    }
+
+    @Test
+    void test_html4() {
+        javadoc("-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "pkg");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/Child.html", true,
+                //Make sure "Specified By" has substituted type parameters.
+                "Specified by:\n"
+                + "method"
+                + " in interface "
+                + ""
+                + "Interface<"
+                + "CE>",
+                //Make sure "Overrides" has substituted type parameters.
+                "Overrides:\n"
+                + "method"
+                + " in class Parent<CE>");
+
+        checkOutput("pkg/ClassWithStaticMembers.html", true,
+                "

\n"
+                + "

\n"
                 + "

",
                 "

\n"
@@ -135,7 +134,7 @@
                 + "Since:\n"
                 + "JavaFX 8.0",
                 "Property Summary\n"
-                + "

`static void`	`" + + "m()`	\n" + + " A hider method \n" + + "	`static void`	`" + "m()`	\n" + " A hider method \n" @@ -148,11 +194,8 @@ + "InterfaceWithStaticMembers\n" + " A static method \n"); - checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true, - " public static class " - + "ClassWithStaticMembers.InnerClass\n" - + "extends java.lang.Object \n" - + " A hider inner class "); + checkOutput("pkg/Interface.html", false, + "public int method()"); } @Test @@ -165,6 +208,23 @@ checkOutput("pkg1/Child.html", true, // Ensure the correct Overrides in the inheritance hierarchy is reported "Overrides:\n" + + " `method1`" + + " in class " + + "`GrandParent" + + "<CE>`"); + } + + @Test + void test1_html4() { + javadoc("-d", "out-1-html4", + "-html4", + "-sourcepath", testSrc, + "pkg1"); + checkExit(Exit.OK); + + checkOutput("pkg1/Child.html", true, + // Ensure the correct Overrides in the inheritance hierarchy is reported + "Overrides:\n" + " `method1`" + " in class " + "GrandParent" + diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java --- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue Mar 06 10:45:47 2018 -0800 @@ -24,7 +24,7 @@ /* * @test * @bug 7112427 8012295 8025633 8026567 8061305 8081854 8150130 8162363 - * 8167967 8172528 8175200 8178830 8182257 8186332 + * 8167967 8172528 8175200 8178830 8182257 8186332 8182765 * @summary Test of the JavaFX doclet features. * @author jvalenta * @library ../lib @@ -51,9 +51,8 @@ checkOutput("pkg1/C.html", true, " `See Also:` `\n" - + "getRate(), \n" - + "" - + "setRate(double)", + + "getRate(), \n" + + "setRate(double)", "public final void setRate(double value)\n" + "Sets the value of the property rate.\n" + "\n" @@ -77,7 +76,7 @@ "Gets the value of the property Property", "Property description:", "`	`" - + "" + + "" + "setTestMethodProperty()`	`" + "paused`

\n"
+                + "

\n"
                 + "

",
                 "

\n"
                 + "

\n",
@@ -168,6 +167,30 @@
 
         checkOutput("pkg1/D.html", false, "shouldNotAppear");
     }
+
+    @Test
+    void test1_html4() {
+        javadoc("-d", "out1-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-javafx",
+                "-package",
+                "pkg1");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg1/C.html", true,
+                "See Also:\n"
+                + "getRate(), \n"
+                + ""
+                + "setRate(double)",
+                "

",
+                "Property Summary\n"
+                + "

Properties
`C.BooleanProperty`	`" + + "" + + "setTestMethodProperty()`

\n"
+                + "

");
+    }
+
     /*
      * Test with -javafx option enabled, to ensure property getters and setters
      * are treated correctly.
@@ -182,6 +205,61 @@
         checkExit(Exit.OK);
         checkOutput("pkg2/Test.html", true,
                 "Property Detail\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "beta\n"
+                + "public java.lang.Object betaProperty\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "gamma\n"
+                + "public final java.util.List<java.lang.String> gammaProperty\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "delta\n"
+                + "public final java.util.List<"
+                + "java.util.Set<? super java.lang.Object>> deltaProperty\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "",
+                "Property Summary\n"
+                + "

\n"
+                + "

");
+
+        checkOutput("pkg2/Test.html", false,
+                "Property Summary\n"
+                + "

\n"
+                + "

");
+    }
+
+    @Test
+    void test2_html4() {
+        javadoc("-d", "out2a-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-javafx",
+                "-package",
+                "pkg2");
+        checkExit(Exit.OK);
+        checkOutput("pkg2/Test.html", true,
+                "Property Detail\n"
                 + "\n"
                 + "\n"
                 + "\n"
@@ -215,15 +293,6 @@
                 "Property Summary\n"
                 + "

\n"
                 + "

");
-
-        checkOutput("pkg2/Test.html", false,
-                "Property Summary\n"
-                + "

\n"
-                + "

");
     }
 
     /*
@@ -246,6 +315,47 @@
                 + "

\n"
                 + "

\n"
                 + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

"
+        );
+    }
+
+    @Test
+    void test3_html4() {
+        javadoc("-d", "out2b-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "-package",
+                "pkg2");
+        checkExit(Exit.OK);
+        checkOutput("pkg2/Test.html", true,
+                "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
+                + "

\n"
                 + "

\n"
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4720957 5020118 8026567 8038976 8184969 8164407
+ * @bug 4720957 5020118 8026567 8038976 8184969 8164407 8182765
  * @summary Test to make sure that -link and -linkoffline link to
  * right files, and URLs with and without trailing slash are accepted.
  * @author jamieh
@@ -66,7 +66,9 @@
                 "-linkoffline", url, testSrc + "/jdk",
                 "-package",
                 "pkg", "mylib.lang");
-        checkExit(Exit.OK);
+        checkExit(Exit.ERROR);
+        checkOutput(Output.OUT, true,
+                "tag not supported in the generated HTML version: tt");
 
         checkOutput("pkg/C.html", true,
                 "A method with html tag the method "
-                + "getSystemClassLoader()"
                 + " as the parent class loader.",
                 "is equivalent to invoking "
-                + ""
+                + ""
                 + "createTempFile(prefix, suffix, null).",
                 "Link-Plain to String Class",
@@ -109,6 +111,25 @@
                 + "title=\"class or interface in java.lang\" class=\"externalLink\">Object"
         );
 
+        String out1_html4 = "out1-html4";
+        javadoc("-d", out1_html4,
+                "-html4",
+                "-classpath", mylib,
+                "-sourcepath", testSrc,
+                "-linkoffline", url, testSrc + "/jdk",
+                "-package",
+                "pkg", "mylib.lang");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/B.html", true,
+                "A method with html tag the method "
+                + "getSystemClassLoader()"
+                + " as the parent class loader.",
+                "is equivalent to invoking "
+                + ""
+                + "createTempFile(prefix, suffix, null).");
+
         // Generate the documentation using -linkoffline and a relative path as the first parameter.
         // We will try linking to the docs generated in test 1 with a relative path.
         String out2 = "out2";
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java	Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4732864 6280605 7064544 8014636 8016328 8025633 8071982
+ * @bug      4732864 6280605 7064544 8014636 8016328 8025633 8071982 8182765
  * @summary  Make sure that you can link from one member to another using
  *           non-qualified name, furthermore, ensure the right one is linked.
  * @author   jamieh
@@ -52,9 +52,9 @@
                 "Qualified Link: C.InnerC.
\n"
                 + " Unqualified Link1: C.InnerC.
\n"
                 + " Unqualified Link2: C.InnerC.
\n"
-                + " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
\n"
-                + " Unqualified Link: method(C.InnerC, C.InnerC2).
\n"
-                + " Unqualified Link: method(InnerC, InnerC2).
\n"
+                + " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
\n"
+                + " Unqualified Link: method(C.InnerC, C.InnerC2).
\n"
+                + " Unqualified Link: method(InnerC, InnerC2).
\n"
                 + " Package Link: pkg.
");
 
         checkOutput("pkg/C.InnerC.html", true,
@@ -73,4 +73,23 @@
 
         checkFiles(false, "checkPkg/A.html");
     }
+
+    @Test
+    void test_html4() {
+        javadoc("-Xdoclint:none",
+                "-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "pkg", testSrc("checkPkg/B.java"));
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/C.html", true,
+                "Qualified Link: C.InnerC.
\n"
+                + " Unqualified Link1: C.InnerC.
\n"
+                + " Unqualified Link2: C.InnerC.
\n"
+                + " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
\n"
+                + " Unqualified Link: method(C.InnerC, C.InnerC2).
\n"
+                + " Unqualified Link: method(InnerC, InnerC2).
\n"
+                + " Package Link: pkg.
");
 }
+}
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java
--- a/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java	Tue Mar 06 10:45:47 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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 4521661 8081854
+ * @bug 4521661 8081854 8182765
  * @summary Test to make sure that there is a link with a proper anchor
  * from a serializable class to serialized-form.html.
  * @author jamieh
@@ -48,8 +48,20 @@
         checkExit(Exit.OK);
 
         checkOutput("serialized-form.html", true,
-                "");
+                "");
         checkOutput("pkg/C.html", true,
                 "");
     }
+
+    @Test
+    void test_html4() {
+        javadoc("-d", "out-html4",
+                "-html4",
+                "-sourcepath", testSrc,
+                "pkg");
+        checkExit(Exit.OK);
+
+        checkOutput("serialized-form.html", true,
+                "");
 }
+}
diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java	Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java	Tue Mar 06 10:45:47 2018 -0800
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4638588 4635809 6256068 6270645 8025633 8026567 8162363 8175200
- *      8192850
+ *      8192850 8182765
  * @summary Test to make sure that members are inherited properly in the Javadoc.
  *          Verify that inheritance labels are correct.
  * @author jamieh
@@ -52,13 +52,13 @@
                 // Public field should be inherited
                 "",
                 // Public method should be inherited
-                "",
+                "",
                 // Public inner class should be inherited.
                 "",
                 // Protected field should be inherited
                 "",
                 // Protected method should be inherited
-                "",
+                "",
                 // Protected inner class should be inherited.
                 "",
                 // New labels as of 1.5.0
@@ -71,6 +71,57 @@
                 // Test overriding/implementing methods with generic parameters.
                 "\n"
                 + "Specified by:\n"
+                + ""
+                + "getAnnotation in interface "
+                + ""
+                + "BaseInterface\n"
+                + "");
+
+        checkOutput("diamond/Z.html", true,
+                // Test diamond inheritance member summary (6256068)
+                "aMethod");
+
+        checkOutput("inheritDist/C.html", true,
+                // Test that doc is inherited from closed parent (6270645)
+                "m1-B");
+
+        checkOutput("pkg/SubClass.html", false,
+                "staticMethod");
+
+        checkOutput("pkg1/Implementer.html", true,
+                // ensure the method makes it
+                "

\n" + + ""); + + checkOutput("pkg1/Implementer.html", false, + "

Methods inherited from interface pkg1.Interface

\n" + + "between" + ); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-sourcepath", testSrc, + "pkg", "diamond", "inheritDist", "pkg1"); + checkExit(Exit.OK); + + checkOutput("pkg/SubClass.html", true, + // Public method should be inherited + "", + // Protected method should be inherited + ""); + + checkOutput("pkg/BaseClass.html", true, + // Test overriding/implementing methods with generic parameters. + "

Specified by:

"); + + checkOutput("pkg/PrivateParent.html", true, + "\n" + + ""); + + // Legacy anchor dimensions (6290760) + checkOutput("pkg2/A.html", true, + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + void test_html4() { + javadoc("-d", "out-html4", + "-html4", + "-private", "-sourcepath", testSrc, "pkg","pkg2"); checkExit(Exit.OK); @@ -53,9 +89,6 @@ "PublicChild\n" + ""); diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java --- a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 8178339 + * @bug 8178339 8182765 * @summary Tests indirect exports and opens in the module summary page * @modules jdk.javadoc/jdk.javadoc.internal.api * jdk.javadoc/jdk.javadoc.internal.tool @@ -72,6 +72,16 @@ checkExit(Exit.OK); verifyIndirectExports(false); verifyIndirectOpens(false); + + javadoc("-d", base.resolve("out-api-html4").toString(), + "-html4", + "-quiet", + "--module-source-path", base.toString(), + "--expand-requires", "transitive", + "--module", "a"); + checkExit(Exit.OK); + verifyIndirectExports_html4(false); + verifyIndirectOpens_html4(false); } @Test @@ -98,6 +108,16 @@ checkExit(Exit.OK); verifyIndirectExports(true); verifyIndirectOpens(true); + + javadoc("-d", base.resolve("out-api-html4").toString(), + "-html4", + "-quiet", + "--module-source-path", base.toString(), + "--expand-requires", "transitive", + "--module", "a"); + checkExit(Exit.OK); + verifyIndirectExports_html4(true); + verifyIndirectOpens_html4(true); } @Test @@ -125,6 +145,17 @@ checkExit(Exit.OK); verifyIndirectExports(false); verifyIndirectOpens(false); + + javadoc("-d", base.resolve("out-api-html4").toString(), + "-html4", + "-quiet", + "--module-source-path", base.toString(), + "--expand-requires", "transitive", + "--module", "a"); + + checkExit(Exit.OK); + verifyIndirectExports_html4(false); + verifyIndirectOpens_html4(false); } @Test @@ -157,13 +188,13 @@ // could be listed in the indirects section, so just // check for minimal expected strings. checkOutput("a/module-summary.html", true, - "Indirect Exports table", + "Indirect Exports", "\n" + "\n" + "\n"); checkOutput("a/module-summary.html", true, - "Indirect Opens table", + "Indirect Opens", "\n" + "\n" + "\n"); @@ -188,6 +219,40 @@ } checkOutput("a/module-summary.html", present, + "

All Methods " - + "Instance Methods" - + " " - + "Concrete Methods " - + "
`<T> java.lang.Object`	`" + + "alphaProperty" + + "(java.util.List<T> foo)`
`java.lang.Object`	`" + + "betaProperty()`
`java.util.List<java.util.Set<? super java.lang.Object>>" + + "`	`" + + "deltaProperty()`
`java.util.List<java.lang.String>`	`" + + "gammaProperty()`	Modifier and Type	Method	Description
`<T> java.lang.Object`	`" + "alphaProperty" + "(java.util.List<T> foo)`	`static java.time.Period`	`" + + "" + + "between(java.time.LocalDate startDateInclusive,\n" + + " java.time.LocalDate endDateExclusive)`	`" + + "returnTypeTest()`", + // Check return type in member detail. + " public " + + "PublicChild returnTypeTest() ", + "	`" + + "PublicChild()`	`private`	`" + + "PrivateParent(int i)`" + + "	`" + "returnTypeTest()`", - // Check return type in member detail. - " public " - + "PublicChild returnTypeTest() ", "	`" + "PublicChild()`	m	exportsto
m	opensto

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

" + typeString + "
From	Packages
m	pm

\n"); + } + + void verifyIndirectExports_html4(boolean present) { + verifyIndirects_html4(present, false); + } + + void verifyIndirectOpens_html4(boolean present) { + verifyIndirects_html4(present, true); + } + + void verifyIndirects_html4(boolean present, boolean opens) { + + String typeString = opens ? "Indirect Opens" : "Indirect Exports"; + + // Avoid false positives, just check for primary string absence. + if (!present) { + checkOutput("a/module-summary.html", false, typeString); + return; + } + + checkOutput("a/module-summary.html", present, "\n" + "\n" + "\n" @@ -202,6 +267,4 @@ + "\n" + "

\n"); } - } - diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Tue Mar 06 10:45:47 2018 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 8178067 8192007 + * @bug 8178067 8192007 8182765 * @summary tests the module's services, such as provides and uses * @modules jdk.javadoc/jdk.javadoc.internal.api * jdk.javadoc/jdk.javadoc.internal.tool @@ -117,7 +117,8 @@ mb.write(src); javadoc("-d", base.resolve("out").toString(), - "-quiet", "-noindex", + "-quiet", + "-noindex", "--module-source-path", src.toString(), "--module", "moduleService,moduleServiceProvider,moduleServiceUser,moduleServiceUserNoDescription", "pkgService", "moduleServiceProvider/pkgServiceProvider", "moduleServiceUser/pkgServiceUser", @@ -194,6 +195,33 @@ "

Services

"); checkOutput("m/module-summary.html", true, + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Uses
Type	Description
A
B

\n"); + + javadoc("-d", base.toString() + "/out-html4", + "-html4", + "-quiet", + "--show-module-contents", "all", + "--module-source-path", base.toString(), + "--module", "m"); + checkExit(Exit.OK); + + checkOutput("m/module-summary.html", true, "\n" + "\n" + "\n" + @@ -234,6 +262,28 @@ "

Services

"); checkOutput("m/module-summary.html", true, + "

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Uses
Type	Description
A

\n"); + + javadoc("-d", base.toString() + "/out-html4", + "-html4", + "-quiet", + "--module-source-path", base.toString(), + "--module", "m"); + checkExit(Exit.OK); + + checkOutput("m/module-summary.html", true, "\n" + "\n" + "\n" + @@ -300,6 +350,33 @@ "

Services

"); checkOutput("m/module-summary.html", true, + "

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n"); + + javadoc("-d", base.toString() + "/out-html4", + "-html4", + "-quiet", + "--show-module-contents", "all", + "--module-source-path", base.toString(), + "--module", "m"); + + checkExit(Exit.OK); + + checkOutput("m/module-summary.html", true, "

Provides
Type	Description
A	(Implementation(s): B)
A	(Implementation(s): B)

\n" + "\n" + "\n" + @@ -343,6 +420,30 @@ "

Services

"); checkOutput("m/module-summary.html", true, + "

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Provides
Type	Description
A	\n" + + " abc \n

Services

"); checkOutput("m/module-summary.html", true, + "

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Provides
Type	Description
A	\n" + + " abc \n

", + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Uses
Type	Description
B	\n" + + " def \n

\n"); + + javadoc("-d", base.toString() + "/out-html4", + "-html4", + "-quiet", + "--module-source-path", base.toString(), + "--module", "m"); + + checkExit(Exit.OK); + + checkOutput("m/module-summary.html", true, "\n" + "\n" + "\n" + diff -r 67912cbf784a -r 771616d26ca1 test/langtools/jdk/javadoc/doclet/testModules/TestModules.java --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Mar 06 17:43:21 2018 +0100 +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Mar 06 10:45:47 2018 -0800 @@ -26,7 +26,7 @@ * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 * 8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218 * 8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464 - 8164407 8192007 + 8164407 8192007 8182765 * @summary Test modules support in javadoc. * @author bpatel * @library ../lib @@ -46,7 +46,10 @@ */ @Test void testHtml4() { - javadoc("-d", "out", "-use", "-Xdoclint:none", + javadoc("-d", "out", + "-html4", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "--module-source-path", testSrc, "--module", "moduleA,moduleB", @@ -68,7 +71,9 @@ */ @Test void testHtml5() { - javadoc("-d", "out-html5", "-html5", "-use", "-Xdoclint:none", + javadoc("-d", "out-html5", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "--module-source-path", testSrc, "--module", "moduleA,moduleB", @@ -90,7 +95,11 @@ */ @Test void testHtml4NoComment() { - javadoc("-d", "out-nocomment", "-nocomment", "-use", "-Xdoclint:none", + javadoc("-d", "out-nocomment", + "-html4", + "-nocomment", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "--module-source-path", testSrc, "--module", "moduleA,moduleB", @@ -108,7 +117,10 @@ */ @Test void testHtml5NoComment() { - javadoc("-d", "out-html5-nocomment", "-nocomment", "-html5", "-use", "-Xdoclint:none", + javadoc("-d", "out-html5-nocomment", + "-nocomment", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "--module-source-path", testSrc, "--module", "moduleA,moduleB", @@ -126,7 +138,9 @@ */ @Test void testHtml4UnnamedModule() { - javadoc("-d", "out-nomodule", "-use", + javadoc("-d", "out-nomodule", + "-html4", + "-use", "-overview", testSrc("overview.html"), "-sourcepath", testSrc, "testpkgnomodule", "testpkgnomodule1"); @@ -143,7 +157,8 @@ */ @Test void testHtml5UnnamedModule() { - javadoc("-d", "out-html5-nomodule", "-html5", "-use", + javadoc("-d", "out-html5-nomodule", + "-use", "-overview", testSrc("overview.html"), "-sourcepath", testSrc, "testpkgnomodule", "testpkgnomodule1"); @@ -159,7 +174,10 @@ */ @Test void testJDTagsInModules() { - javadoc("-d", "out-mdltags", "-author", "-version", "-Xdoclint:none", + javadoc("-d", "out-mdltags", + "-author", + "-version", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -170,11 +188,32 @@ } /** + * Test generated module pages with javadoc tags. + */ + @Test + void testJDTagsInModules_html4() { + javadoc("-d", "out-mdltags-html4", + "-html4", + "-author", + "-version", + "-Xdoclint:none", + "-tag", "regular:a:Regular Tag:", + "-tag", "moduletag:s:Module Tag:", + "--module-source-path", testSrc, + "--module", "moduletags,moduleB", + "testpkgmdltags", "testpkgmdlB"); + checkExit(Exit.OK); + checkModuleTags_html4(); + } + + /** * Test generated module summary page. */ @Test void testModuleSummary() { - javadoc("-d", "out-moduleSummary", "-use", "-Xdoclint:none", + javadoc("-d", "out-moduleSummary", + "-use", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB", "testpkgmdlA", "testpkgmdlB", "moduleB/testpkg2mdlB"); @@ -184,11 +223,29 @@ } /** + * Test generated module summary page. + */ + @Test + void testModuleSummary_html4() { + javadoc("-d", "out-moduleSummary-html4", + "-html4", + "-use", + "-Xdoclint:none", + "--module-source-path", testSrc, + "--module", "moduleA,moduleB", + "testpkgmdlA", "testpkgmdlB", "moduleB/testpkg2mdlB"); + checkExit(Exit.OK); + checkModuleSummary_html4(); + checkNegatedModuleSummary_html4(); + } + + /** * Test generated module summary page of an aggregating module. */ @Test void testAggregatorModuleSummary() { - javadoc("-d", "out-aggregatorModuleSummary", "-use", + javadoc("-d", "out-aggregatorModuleSummary", + "-use", "--module-source-path", testSrc, "--expand-requires", "transitive", "--module", "moduleT"); @@ -201,7 +258,8 @@ */ @Test void testModuleFilesAndLinks() { - javadoc("-d", "out-modulelinks", "-Xdoclint:none", + javadoc("-d", "out-modulelinks", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB", "testpkgmdlA", "testpkgmdlB"); @@ -215,7 +273,8 @@ */ @Test void testModuleDeprecation() { - javadoc("-d", "out-moduledepr", "-Xdoclint:none", + javadoc("-d", "out-moduledepr", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -230,7 +289,8 @@ */ @Test void testModuleAnnotation() { - javadoc("-d", "out-moduleanno", "-Xdoclint:none", + javadoc("-d", "out-moduleanno", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB", "testpkgmdlA", "testpkgmdlB"); @@ -239,11 +299,31 @@ } /** + * Test annotations on modules. + */ + @Test + void testModuleAnnotation_html4() { + javadoc("-d", "out-moduleanno-html4", + "-html4", + "-Xdoclint:none", + "--module-source-path", testSrc, + "--module", "moduleA,moduleB", + "testpkgmdlA", "testpkgmdlB"); + checkExit(Exit.OK); + checkModuleAnnotation_html4(); + } + + /** * Test module summary pages in "api" mode. */ @Test void testApiMode() { - javadoc("-d", "out-api", "-use", "--show-module-contents=api", "-author", "-version", "-Xdoclint:none", + javadoc("-d", "out-api", + "-use", + "--show-module-contents=api", + "-author", + "-version", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -262,7 +342,12 @@ */ @Test void testAllMode() { - javadoc("-d", "out-all", "-use", "--show-module-contents=all", "-author", "-version", "-Xdoclint:none", + javadoc("-d", "out-all", + "-use", + "--show-module-contents=all", + "-author", + "-version", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -277,11 +362,35 @@ } /** + * Test module summary pages in "all" mode. + */ + @Test + void testAllModeHtml4() { + javadoc("-d", "out-all-html4", + "-html4", + "-use", + "--show-module-contents=all", + "-author", + "-version", + "-Xdoclint:none", + "-tag", "regular:a:Regular Tag:", + "-tag", "moduletag:s:Module Tag:", + "--module-source-path", testSrc, + "--module", "moduleA,moduleB,moduleC,moduletags", + "testpkgmdlA", "moduleA/concealedpkgmdlA", "testpkgmdlB", "testpkg2mdlB", "testpkgmdlC", "testpkgmdltags"); + checkExit(Exit.OK); + checkModuleModeCommon_html4(); + checkModuleModeApi_html4(false); + } + + /** * Test generated module summary page of a module with no exported package. */ @Test void testModuleSummaryNoExportedPkgAll() { - javadoc("-d", "out-ModuleSummaryNoExportedPkgAll", "-use", "--show-module-contents=all", + javadoc("-d", "out-ModuleSummaryNoExportedPkgAll", + "-use", + "--show-module-contents=all", "-sourcepath", testSrc + "/moduleNoExport", "--module", "moduleNoExport", "testpkgmdlNoExport"); @@ -293,8 +402,25 @@ * Test generated module summary page of a module with no exported package. */ @Test + void testModuleSummaryNoExportedPkgAll_html4() { + javadoc("-d", "out-ModuleSummaryNoExportedPkgAll-html4", + "-html4", + "-use", + "--show-module-contents=all", + "-sourcepath", testSrc + "/moduleNoExport", + "--module", "moduleNoExport", + "testpkgmdlNoExport"); + checkExit(Exit.OK); + checkModuleSummaryNoExported_html4(true); + } + + /** + * Test generated module summary page of a module with no exported package. + */ + @Test void testModuleSummaryNoExportedPkgApi() { - javadoc("-d", "out-ModuleSummaryNoExportedPkgApi", "-use", + javadoc("-d", "out-ModuleSummaryNoExportedPkgApi", + "-use", "-sourcepath", testSrc + "/moduleNoExport", "--module", "moduleNoExport", "testpkgmdlNoExport"); @@ -303,6 +429,21 @@ } /** + * Test generated module summary page of a module with no exported package. + */ + @Test + void testModuleSummaryNoExportedPkgApi_html4() { + javadoc("-d", "out-ModuleSummaryNoExportedPkgApi-html4", + "-html4", + "-use", + "-sourcepath", testSrc + "/moduleNoExport", + "--module", "moduleNoExport", + "testpkgmdlNoExport"); + checkExit(Exit.OK); + checkModuleSummaryNoExported_html4(false); + } + + /** * Test generated module pages for javadoc run for a single module having a single package. */ @Test @@ -320,7 +461,9 @@ */ @Test void testSingleModuleMultiplePkg() { - javadoc("-d", "out-singlemodmultiplepkg", "--show-module-contents=all", "-Xdoclint:none", + javadoc("-d", "out-singlemodmultiplepkg", + "--show-module-contents=all", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleB", "testpkg2mdlB", "testpkgmdlB"); @@ -333,7 +476,9 @@ */ @Test void testGroupOption() { - javadoc("-d", "out-group", "--show-module-contents=all", "-Xdoclint:none", + javadoc("-d", "out-group", + "--show-module-contents=all", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -348,13 +493,37 @@ } /** + * Test -group option for modules. The overview-summary.html page should group the modules accordingly. + */ + @Test + void testGroupOption_html4() { + javadoc("-d", "out-group-html4", + "-html4", + "--show-module-contents=all", + "-Xdoclint:none", + "-tag", "regular:a:Regular Tag:", + "-tag", "moduletag:s:Module Tag:", + "--module-source-path", testSrc, + "-group", "Module Group A", "moduleA*", + "-group", "Module Group B & C", "moduleB*:moduleC*", + "-group", "Java SE Modules", "java*", + "--module", "moduleA,moduleB,moduleC,moduletags", + "moduleA/concealedpkgmdlA", "testpkgmdlA", "testpkg2mdlB", "testpkgmdlB", "testpkgmdlC", + "testpkgmdltags"); + checkExit(Exit.OK); + checkGroupOption_html4(); + } + + /** * Test -group option for modules and the ordering of module groups. * The overview-summary.html page should group the modules accordingly and display the group tabs in * the order it was provided on the command-line. */ @Test void testGroupOptionOrdering() { - javadoc("-d", "out-groupOrder", "--show-module-contents=all", "-Xdoclint:none", + javadoc("-d", "out-groupOrder", + "--show-module-contents=all", + "-Xdoclint:none", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -374,7 +543,9 @@ */ @Test void testUnnamedModuleGroupOption() { - javadoc("-d", "out-groupnomodule", "-use", "-Xdoclint:none", + javadoc("-d", "out-groupnomodule", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "-sourcepath", testSrc, "-group", "Package Group 0", "testpkgnomodule", @@ -385,13 +556,33 @@ } /** + * Test -group option for unnamed modules. The overview-summary.html page should group the packages accordingly. + */ + @Test + void testUnnamedModuleGroupOption_html4() { + javadoc("-d", "out-groupnomodule-html4", + "-html4", + "-use", + "-Xdoclint:none", + "-overview", testSrc("overview.html"), + "-sourcepath", testSrc, + "-group", "Package Group 0", "testpkgnomodule", + "-group", "Package Group 1", "testpkgnomodule1", + "testpkgnomodule", "testpkgnomodule1"); + checkExit(Exit.OK); + checkUnnamedModuleGroupOption_html4(); + } + + /** * Test -group option for unnamed modules and the ordering of package groups. * The overview-summary.html page should group the packages accordingly and display the group tabs in * the order it was provided on the command-line. */ @Test void testGroupOptionPackageOrdering() { - javadoc("-d", "out-groupPkgOrder", "-use", "-Xdoclint:none", + javadoc("-d", "out-groupPkgOrder", + "-use", + "-Xdoclint:none", "-overview", testSrc("overview.html"), "-sourcepath", testSrc, "-group", "Z Group", "testpkgnomodule", @@ -406,7 +597,9 @@ */ @Test void testGroupOptionSingleModule() { - javadoc("-d", "out-groupsinglemodule", "-use", "-Xdoclint:none", + javadoc("-d", "out-groupsinglemodule", + "-use", + "-Xdoclint:none", "--module-source-path", testSrc, "-group", "Module Group B", "moduleB*", "--module", "moduleB", @@ -419,8 +612,27 @@ * Test -group option for a single module. */ @Test + void testGroupOptionSingleModule_html4() { + javadoc("-d", "out-groupsinglemodule-html4", + "-html4", + "-use", + "-Xdoclint:none", + "--module-source-path", testSrc, + "-group", "Module Group B", "moduleB*", + "--module", "moduleB", + "testpkg2mdlB", "testpkgmdlB"); + checkExit(Exit.OK); + checkGroupOptionSingleModule_html4(); + } + + /** + * Test -group option for a single module. + */ + @Test void testModuleName() { - javadoc("-d", "out-modulename", "-use", "-Xdoclint:none", + javadoc("-d", "out-modulename", + "-use", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleB,test.moduleFullName", "testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname"); @@ -434,7 +646,10 @@ @Test void testLinkOffline() { String url = "https://docs.oracle.com/javase/9/docs/api/"; - javadoc("-d", "out-linkoffline", "-use", "--show-module-contents=all", "-Xdoclint:none", + javadoc("-d", "out-linkoffline", + "-use", + "--show-module-contents=all", + "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB", "-linkoffline", url, testSrc + "/jdk", @@ -589,7 +804,7 @@ "Type Link: TestClassInModuleTags.", "Member Link: testMethod(String).", + + "testMethod(java.lang.String)\">testMethod(String).", "Package Link: testpkgmdltags.", "

Since:

\n" + "

JDK 9

", @@ -610,6 +825,12 @@ + "

Just a simple module tag.

"); } + void checkModuleTags_html4() { + checkOutput("moduletags/module-summary.html", true, + "Member Link: testMethod(String)."); + } + void checkOverviewSummaryModules() { checkOutput("overview-summary.html", true, "

\n" @@ -724,7 +945,7 @@ + "Packages | Services\n" + "", "\n" - + "\n" + + "\n" + "\n" + "", "\n" @@ -732,7 +953,7 @@ + "\n" + "", "\n" - + "\n" + + "\n" + "\n" + "", "\n" @@ -747,7 +968,7 @@ + "Packages | " + "Services", "\n" - + "\n" + + "\n" + "\n" + "", "\n" @@ -755,11 +976,11 @@ + "\n" + "", "\n" - + "\n" + + "\n" + "\n" + "", "\n" - + "\n" + + "\n" + "\n" + "", "\n" @@ -784,6 +1005,31 @@ + ""); } + void checkModuleSummary_html4() { + checkOutput("moduleA/module-summary.html", true, + "\n" + + "\n" + + "\n" + + "", + "\n" + + "\n" + + "\n" + + ""); + checkOutput("moduleB/module-summary.html", true, + "\n" + + "\n" + + "\n" + + "", + "\n" + + "\n" + + "\n" + + "", + "\n" + + "\n" + + "\n" + + ""); + } + void checkAggregatorModuleSummary() { checkOutput("moduleT/module-summary.html", true, ""); checkOutput("moduleA/module-summary.html", true, @@ -937,14 +1191,14 @@ checkOutput("moduletags/module-summary.html", true, "

Description | Modules" + " | Packages | Services

", - "

\n" + "

This is a test description for the moduletags module.
\n" + " Type Link: TestClassInModuleTags.
\n" - + " Member Link: testMethod(String).
\n" + + " Member Link: testMethod(String).
\n" + " Package Link: testpkgmdltags.

\n" + "

\n" + "", "\n" + "\n" + "", - "

Indirect Requires
transitive	moduleB	\n" + " This is a test description for the moduleB module. \n" + "

\n" + "

\n" + "", "\n" + "\n" @@ -952,6 +1206,42 @@ + "

This is a test description for the moduleA module with a Search " + "phrase search phrase.

\n" + "", + "

Indirect Exports
transitive static	moduleA

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "", + "

Requires
Modifier	Module	Description

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "", + "

Indirect Requires
Modifier	Module	Description

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n", + "\n" + + "\n"); + } + + void checkModuleModeCommon_html4() { + checkOutput("overview-summary.html", true, + "\n" + + ""); + checkOutput("moduletags/module-summary.html", true, + "

Indirect Opens
From	Packages
moduleB	testpkgmdlB	moduletags	\n" + + " This is a test description for the moduletags module. \n" + + " Type Link: `TestClassInModuleTags`. \n" + + " Member Link: `testMethod(String)`. \n" + + " Package Link: `testpkgmdltags`. \n" + + "

\n" + + "", + "

\n" + + "", "

\n" + "\n" + "\n" @@ -969,9 +1259,7 @@ + "\n" + "\n" + "\n" - + "\n", - "\n" - + "\n"); + + "\n"); } void checkModuleModeApi(boolean found) { @@ -983,7 +1271,7 @@ + "Packages | Services", "\n" + "", - "

Requires
From	Packages
moduleB	testpkgmdlB
testpkgmdlB

\n" + "

\n" + "\n" + "\n" + "\n" @@ -1001,6 +1289,23 @@ + ""); } + void checkModuleModeApi_html4(boolean found) { + checkOutput("moduleB/module-summary.html", found, + "

Opens
Package

\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "

Opens
Package	Description
testpkgmdlB

"); + } + void checkModuleModeAll(boolean found) { checkOutput("moduleA/module-summary.html", found, " \n" @@ -1084,11 +1389,18 @@ void checkModuleAnnotation() { checkOutput("moduleB/module-summary.html", true, + "

@AnnotationType(optional=\"Module Annotation\",\n" + + " required=2016)\n" + + "

"); + checkOutput("moduleB/module-summary.html", false, + "@AnnotationTypeUndocumented"); + } + + void checkModuleAnnotation_html4() { + checkOutput("moduleB/module-summary.html", true, "

@AnnotationType(optional=\"Module Annotation\",\n" + " required=2016)\n" + "

"); - checkOutput("moduleB/module-summary.html", false, - "@AnnotationTypeUndocumented"); } void checkOverviewFrame(boolean found) { @@ -1101,15 +1413,45 @@ void checkModuleSummaryNoExported(boolean found) { checkOutput("moduleNoExport/module-summary.html", found, "\n" - + "\n" + + "\n" + "\n" + "", "Concealed "); } + void checkModuleSummaryNoExported_html4(boolean found) { + checkOutput("moduleNoExport/module-summary.html", found, + "\n" + + "\n" + + "\n" + + ""); + } + void checkGroupOption() { checkOutput("overview-summary.html", true, "

\n" + + "\n" + + "", + "var groups = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n" + + "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n" + + "var altColor = \"altColor\";\n" + + "var rowColor = \"rowColor\";\n" + + "var tableTab = \"tableTab\";\n" + + "var activeTableTab = \"activeTableTab\";"); + checkOutput("overview-summary.html", false, + "

\n" + + "", + "Java SE Modules"); + } + + void checkGroupOption_html4() { + checkOutput("overview-summary.html", true, + "

\n" + "

\n" + "

Element Detail

Nested classes/interfaces inherited from class pkg1." + "A

staticMethod

Property Summary

Property Summary

Property Detail

beta

gamma

delta

Property Summary

Property Summary

Property Detail

Property Summary

Property Summary

Methods inherited from interface pkg1.Interface

Services

Services

Services

Services

Services

Optional Element Summary

Element Detail

one

two

Required Element Summary

Element Detail

one

two

Constructor Summary

Enum Constant Summary

Method Summary

Method Detail

one

two

Method Summary

Method Detail

one

two

twoProperty

threeProperty

fourProperty

M

M

Document Title

Document Title

Document Title

m3

m3

`M`