--- a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java Tue Mar 06 17:43:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java Tue Mar 06 10:45:47 2018 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4951228 6290760 8025633 8026567 8081854 8162363 8175200 8177417 8186332
+ * @bug 4951228 6290760 8025633 8026567 8081854 8162363 8175200 8177417 8186332 8182765
* @summary Test the case where the overriden method returns a different
* type than the method in the child class. Make sure the
* documentation is inherited but the return type isn't.
@@ -43,7 +43,43 @@
@Test
void test() {
- javadoc("-d", "out", "-private",
+ javadoc("-d", "out",
+ "-private",
+ "-sourcepath", testSrc,
+ "pkg","pkg2");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/PublicChild.html", true,
+ // Check return type in member summary.
+ "<code><a href=\"PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
+ + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#returnTypeTest()\">"
+ + "returnTypeTest</a></span>()</code>",
+ // Check return type in member detail.
+ "<pre>public <a href=\"PublicChild.html\" title=\"class in pkg\">"
+ + "PublicChild</a> returnTypeTest()</pre>",
+ "<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"#%3Cinit%3E()\">PublicChild</a></span>()</code></th>");
+
+ checkOutput("pkg/PrivateParent.html", true,
+ "<td class=\"colFirst\"><code>private </code></td>\n"
+ + "<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ + "<a href=\"#%3Cinit%3E(int)\">PrivateParent</a></span>​(int i)</code>"
+ + "</th>");
+
+ // Legacy anchor dimensions (6290760)
+ checkOutput("pkg2/A.html", true,
+ "<a id=\"f(java.lang.Object[])\">\n"
+ + "<!-- -->\n"
+ + "</a><a id=\"f(T[])\">\n"
+ + "<!-- -->\n"
+ + "</a>");
+ }
+
+ @Test
+ void test_html4() {
+ javadoc("-d", "out-html4",
+ "-html4",
+ "-private",
"-sourcepath", testSrc,
"pkg","pkg2");
checkExit(Exit.OK);
@@ -53,9 +89,6 @@
"<code><a href=\"PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#returnTypeTest--\">"
+ "returnTypeTest</a></span>()</code>",
- // Check return type in member detail.
- "<pre>public <a href=\"PublicChild.html\" title=\"class in pkg\">"
- + "PublicChild</a> returnTypeTest()</pre>",
"<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"#PublicChild--\">PublicChild</a></span>()</code></th>");