diff -r 9a8e44b62c77 -r 86fe1414f12c langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java --- a/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java Tue Jun 23 17:46:23 2015 +0530 +++ b/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java Tue Jun 23 15:41:05 2015 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8072945 + * @bug 8072945 8081854 * @summary Test the version of HTML generated by the javadoc tool. * @author bpatel * @library ../lib @@ -1172,7 +1172,7 @@ checkOutput("overview-summary.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1194,7 +1194,7 @@ checkOutput("pkg/package-summary.html", true, "", "\n" + "\n" + "\n" + "", "

", @@ -1208,7 +1208,7 @@ checkOutput("pkg/package-tree.html", true, "", "\n" + "\n" + "\n" + "", "

"); @@ -1217,7 +1217,7 @@ checkOutput("pkg1/package-use.html", true, "", "\n" + "\n" + "\n" + "", "

"); @@ -1234,7 +1234,7 @@ checkOutput("pkg/compact1-package-summary.html", true, "", "\n" + "\n" + "\n" + "", "

", @@ -1248,7 +1248,7 @@ checkOutput("compact1-summary.html", true, "", "\n" + "\n" + "\n" + "", "

", @@ -1262,7 +1262,7 @@ checkOutput("constant-values.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1273,7 +1273,7 @@ checkOutput("deprecated-list.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1295,7 +1295,7 @@ checkOutput("serialized-form.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1307,7 +1307,7 @@ checkOutput("overview-tree.html", true, "", "\n" + "\n" + "\n" + "", "

", @@ -1326,7 +1326,7 @@ checkOutput("index-all.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1342,7 +1342,7 @@ checkOutput("help-doc.html", true, "", "\n" + "\n" + "\n" + "", "\n" @@ -1359,54 +1359,54 @@ checkOutput("pkg/AnotherClass.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Field Summary
\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Constructor Summary
\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Summary
\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Field Detail
", "\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Constructor Detail
  ", "\n" + "
  - \n" + + "
  - \n" + "\n" + "\n" + "
    Method Detail
    "); @@ -1415,34 +1415,34 @@ checkOutput("pkg/AnotherClass.ModalExclusionType.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
    ", "\n" + "
    - \n" + + "
    - \n" + "\n" + "\n" + "
      Enum Constant Summary
      \n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Summary
\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Enum Constant Detail
", "\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Method Detail
  "); @@ -1451,21 +1451,21 @@ checkOutput("pkg2/Interface.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
  ", "\n" + "
  - \n" + + "
  - \n" + "\n" + "\n" + "
    Method Summary
    \n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Detail
"); @@ -1474,20 +1474,20 @@ checkOutput("pkg/TestError.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
", "\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Constructor Summary
  ", "\n" + "
  - \n" + + "
  - \n" + "\n" + "\n" + "
    Constructor Detail
    "); @@ -1496,20 +1496,20 @@ checkOutput("pkg/TestException.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
    ", "\n" + "
    \n" - + "
    \n" + + "
    \n" + "\n" + "\n" + "
    Constructor Summary
    ", "\n" + "
    \n" - + "
    \n" + + "
    \n" + "\n" + "\n" + "
    Constructor Detail
    "); @@ -1518,28 +1518,28 @@ checkOutput("pkg2/TestAnnotationType.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
    ", "\n" + "
    \n" - + "
    \n" + + "
    \n" + "\n" + "\n" + "
    Required Element Summary
    \n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Optional Element Summary
\n" + "

", "\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Element Detail
"); @@ -1548,13 +1548,13 @@ checkOutput("pkg1/class-use/RegClass.html", true, "", "\n" + "\n" + "\n" + "", "\n" + "
", "

", - "

\n" + "

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

Uses of RegClass in pkg

\n" @@ -1623,7 +1623,7 @@ checkOutput("overview-summary.html", false, "", "\n" + "", "

\n" @@ -1662,7 +1662,7 @@ checkOutput("pkg/package-summary.html", false, "", "\n" + "", "

", @@ -1681,7 +1681,7 @@ checkOutput("pkg/package-tree.html", false, "", "\n" + "", "

\n" @@ -1705,7 +1705,7 @@ checkOutput("pkg1/package-use.html", false, "", "\n" + "", "

", @@ -1742,7 +1742,7 @@ checkOutput("pkg/compact1-package-summary.html", false, "", "\n" + "", "

", @@ -1761,7 +1761,7 @@ checkOutput("compact1-summary.html", false, "", "\n" + "", "

", @@ -1782,7 +1782,7 @@ checkOutput("constant-values.html", false, "", "\n" + "", "

", @@ -1803,7 +1803,7 @@ checkOutput("deprecated-list.html", false, "", "\n" + "", "

", @@ -1820,7 +1820,7 @@ checkOutput("serialized-form.html", false, "", "\n" + "", "

\n" @@ -1838,7 +1838,7 @@ checkOutput("overview-tree.html", false, "", "\n" + "", "

\n" @@ -1862,7 +1862,7 @@ checkOutput("index-all.html", false, "", "\n" + "", "

\n" @@ -1884,7 +1884,7 @@ checkOutput("help-doc.html", false, "", "\n" + "", "

\n" @@ -1906,7 +1906,7 @@ checkOutput("pkg/AnotherClass.html", false, "", "\n" + "", "

\n" @@ -1916,46 +1916,46 @@ + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Field Summary
\n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Constructor Summary
\n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Summary
", "
\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Field Detail
  ", "
  \n" + "
  - \n" + + "
  - \n" + "\n" + "\n" + "
    Constructor Detail
    ", "
    \n" + "
    \n" - + "
    \n" + + "
    \n" + "\n" + "\n" + "
    Method Detail
    ", @@ -1967,7 +1967,7 @@ checkOutput("pkg/AnotherClass.ModalExclusionType.html", false, "", "\n" + "\n" + "\n" + "", "
    \n" @@ -1977,27 +1977,27 @@ + "
    ", "
    \n" + "
    \n" - + "
    \n" + + "
    \n" + "\n" + "\n" + "
    Enum Constant Summary
    \n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Summary
\n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Enum Constant Detail
", "
\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Method Detail
  ", @@ -2009,7 +2009,7 @@ checkOutput("pkg2/Interface.html", false, "", "\n" + "\n" + "\n" + "", "
  \n" @@ -2019,14 +2019,14 @@ + "
  ", "
  \n" + "
  \n" - + "
  \n" + + "
  \n" + "\n" + "\n" + "
  Method Summary
  \n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Method Detail
", @@ -2038,7 +2038,7 @@ checkOutput("pkg/TestError.html", false, "", "\n" + "\n" + "\n" + "", "
\n" @@ -2048,13 +2048,13 @@ + "
", "
\n" + "
- \n" + + "
- \n" + "\n" + "\n" + "
  Constructor Summary
  ", "
  \n" + "
  \n" - + "
  \n" + + "
  \n" + "\n" + "\n" + "
  Constructor Detail
  ", @@ -2066,7 +2066,7 @@ checkOutput("pkg/TestException.html", false, "", "\n" + "\n" + "\n" + "", "
  \n" @@ -2076,13 +2076,13 @@ + "
  ", "
  \n" + "
  \n" - + "
  \n" + + "
  \n" + "\n" + "\n" + "
  Constructor Summary
  ", "
  \n" + "
  \n" - + "
  \n" + + "
  \n" + "\n" + "\n" + "
  Constructor Detail
  ", @@ -2094,7 +2094,7 @@ checkOutput("pkg2/TestAnnotationType.html", false, "", "\n" + "\n" + "\n" + "", "
  \n" @@ -2104,21 +2104,21 @@ + "
  ", "
  \n" + "
  \n" - + "
  \n" + + "
  \n" + "\n" + "\n" + "
  Required Element Summary
  \n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Optional Element Summary
\n" + "

", "

\n" + "

\n" + + "
\n" + "\n" + "\n" + "
Element Detail
", @@ -2130,7 +2130,7 @@ checkOutput("pkg1/class-use/RegClass.html", false, "", "\n" + "\n" + "\n" + "", "
\n" @@ -2139,7 +2139,7 @@ "
\n" + "
", "

", - "

\n" + "

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

Uses of RegClass in pkg

\n"

Nested Class Summary

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail

Enum Constant Summary

Method Summary

Enum Constant Detail

Method Detail

Method Summary

Method Detail

Constructor Summary

Constructor Detail

Constructor Summary

Constructor Detail

Required Element Summary

Optional Element Summary

Element Detail

Uses of RegClass in pkg

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail

Method Summary

Enum Constant Detail

Method Detail

Method Detail

Optional Element Summary

Element Detail

Uses of RegClass in pkg