--- a/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Mon Feb 15 14:02:57 2016 -0800
+++ b/langtools/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Mon Feb 15 17:17:58 2016 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8005091 8009686 8025633 8026567
+ * @bug 8005091 8009686 8025633 8026567 6469562
* @summary Make sure that type annotations are displayed correctly
* @author Bhavesh Patel
* @library ../lib
@@ -260,13 +260,13 @@
checkOutput("typeannos/ThrWithValue.html", true,
"<pre>void oneException()\n"
+ " throws <a href=\"../typeannos/ThrB.html\" title=\""
- + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/"
- + "ThrB.html#value--\">value</a>=\"m\") java.lang.Exception</pre>",
+ + "annotation in typeannos\">@ThrB</a>("
+ + "\"m\") java.lang.Exception</pre>",
"<pre>void twoExceptions()\n"
+ " throws <a href=\"../typeannos/ThrB.html\" title=\""
- + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/"
- + "ThrB.html#value--\">value</a>=\"m\") java.lang.RuntimeException,\n"
+ + "annotation in typeannos\">@ThrB</a>("
+ + "\"m\") java.lang.RuntimeException,\n"
+ " <a href=\"../typeannos/ThrA.html\" title=\""
+ "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
@@ -293,14 +293,14 @@
checkOutput("typeannos/BoundWithValue.html", true,
"<pre>void wcSuper(<a href=\"../typeannos/MyList.html\" title=\""
+ "class in typeannos\">MyList</a><? super <a href=\"../typeannos/"
- + "WldB.html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\""
- + "../typeannos/WldB.html#value--\">value</a>=\"m\") java.lang."
+ + "WldB.html\" title=\"annotation in typeannos\">@WldB</a>("
+ + "\"m\") java.lang."
+ "String> l)</pre>",
"<pre><a href=\"../typeannos/MyList.html\" title=\"class in "
+ "typeannos\">MyList</a><? extends <a href=\"../typeannos/WldB."
- + "html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"../"
- + "typeannos/WldB.html#value--\">value</a>=\"m\") java.lang.String"
+ + "html\" title=\"annotation in typeannos\">@WldB</a>("
+ + "\"m\") java.lang.String"
+ "> returnWcExtends()</pre>");
// Test for receiver annotations (Receivers.java).
@@ -314,7 +314,7 @@
"<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrA."
+ "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\"../"
+ "typeannos/RcvrB.html\" title=\"annotation in typeannos\">@RcvrB"
- + "</a>(<a href=\"../typeannos/RcvrB.html#value--\">value</a>=\"m\")"
+ + "</a>(\"m\")"
+ " DefaultUnmodified this)</pre>",
"<pre><T extends java.lang.Runnable> void accept("
@@ -337,15 +337,15 @@
checkOutput("typeannos/WithValue.html", true,
"<pre><T extends java.lang.Runnable> void accept("
+ "<a href=\"../typeannos/RcvrB.html\" title=\"annotation in "
- + "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value--\">"
- + "value</a>=\"m\") WithValue this,\n"
+ + "typeannos\">@RcvrB</a>("
+ + "\"m\") WithValue this,\n"
+ " T r)\n"
+ " throws java.lang.Exception</pre>");
checkOutput("typeannos/WithFinal.html", true,
"<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrB."
- + "html\" title=\"annotation in typeannos\">@RcvrB</a>(<a href=\"../"
- + "typeannos/RcvrB.html#value--\">value</a>=\"m\") WithFinal"
+ + "html\" title=\"annotation in typeannos\">@RcvrB</a>("
+ + "\"m\") WithFinal"
+ " this)</pre>");
checkOutput("typeannos/WithBody.html", true,