--- old/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java 2016-02-13 21:45:06.323545662 -0800 +++ new/test/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java 2016-02-13 21:45:06.243545659 -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, "
void oneException()\n" + " throws @ThrB(value=\"m\") java.lang.Exception", + + "annotation in typeannos\">@ThrB(" + + "\"m\") java.lang.Exception", "
void twoExceptions()\n" + " throws @ThrB(value=\"m\") java.lang.RuntimeException,\n" + + "annotation in typeannos\">@ThrB(" + + "\"m\") java.lang.RuntimeException,\n" + " @ThrA java.lang.Exception"); @@ -293,14 +293,14 @@ checkOutput("typeannos/BoundWithValue.html", true, "
void wcSuper(MyList<? super @WldB(value=\"m\") java.lang." + + "WldB.html\" title=\"annotation in typeannos\">@WldB(" + + "\"m\") java.lang." + "String> l)", "
MyList<? extends @WldB(value=\"m\") java.lang.String" + + "html\" title=\"annotation in typeannos\">@WldB(" + + "\"m\") java.lang.String" + "> returnWcExtends()"); // Test for receiver annotations (Receivers.java). @@ -314,7 +314,7 @@ "
java.lang.String nonVoid(@RcvrA @RcvrB" - + "(value=\"m\")" + + "(\"m\")" + " DefaultUnmodified this)", "
<T extends java.lang.Runnable> void accept(" @@ -337,15 +337,15 @@ checkOutput("typeannos/WithValue.html", true, "<T extends java.lang.Runnable> void accept(" + "@RcvrB(" - + "value=\"m\") WithValue this,\n" + + "typeannos\">@RcvrB(" + + "\"m\") WithValue this,\n" + " T r)\n" + " throws java.lang.Exception"); checkOutput("typeannos/WithFinal.html", true, "java.lang.String nonVoid(@RcvrB(value=\"m\") WithFinal" + + "html\" title=\"annotation in typeannos\">@RcvrB(" + + "\"m\") WithFinal" + " this)"); checkOutput("typeannos/WithBody.html", true,