Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu Oct 10 08:51:55 2013 +0200
     1.2 +++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu Oct 10 10:51:15 2013 -0700
     1.3 @@ -23,7 +23,7 @@
     1.4  
     1.5  /*
     1.6   * @test
     1.7 - * @bug 4638588 4635809 6256068 6270645
     1.8 + * @bug 4638588 4635809 6256068 6270645 8025633
     1.9   * @summary Test to make sure that members are inherited properly in the Javadoc.
    1.10   *          Verify that inheritence labels are correct.
    1.11   * @author jamieh
    1.12 @@ -44,7 +44,7 @@
    1.13  
    1.14          //Public method should be inherited
    1.15          {BUG_ID + FS + "pkg" + FS + "SubClass.html",
    1.16 -         "<a href=\"../pkg/BaseClass.html#pubMethod()\">"},
    1.17 +         "<a href=\"../pkg/BaseClass.html#pubMethod--\">"},
    1.18  
    1.19          //Public inner class should be inherited.
    1.20          {BUG_ID + FS + "pkg" + FS + "SubClass.html",
    1.21 @@ -56,7 +56,7 @@
    1.22  
    1.23          //Protected method should be inherited
    1.24          {BUG_ID + FS + "pkg" + FS + "SubClass.html",
    1.25 -         "<a href=\"../pkg/BaseClass.html#proMethod()\">"},
    1.26 +         "<a href=\"../pkg/BaseClass.html#proMethod--\">"},
    1.27  
    1.28          //Protected inner class should be inherited.
    1.29          {BUG_ID + FS + "pkg" + FS + "SubClass.html",
    1.30 @@ -73,14 +73,14 @@
    1.31           // Test overriding/implementing methods with generic parameters.
    1.32                   {BUG_ID + FS + "pkg" + FS + "BaseClass.html",
    1.33           "<dl>" + NL + "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
    1.34 -                          "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">" +
    1.35 +                          "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">" +
    1.36                            "getAnnotation</a></code>&nbsp;in interface&nbsp;<code>" +
    1.37                            "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
    1.38                            "BaseInterface</a></code></dd>" + NL + "</dl>"},
    1.39  
    1.40           // Test diamond inheritence member summary (6256068)
    1.41                   {BUG_ID + FS + "diamond" + FS + "Z.html",
    1.42 -                 "<code><a href=\"../diamond/A.html#aMethod()\">aMethod</a></code>"},
    1.43 +                 "<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"},
    1.44  
    1.45           // Test that doc is inherited from closed parent (6270645)
    1.46                   {BUG_ID + FS + "inheritDist" + FS + "C.html",
    1.47 @@ -90,7 +90,7 @@
    1.48  
    1.49      private static final String[][] NEGATED_TEST = {
    1.50          {BUG_ID + FS + "pkg" + FS + "SubClass.html",
    1.51 -        "<a href=\"../pkg/BaseClass.html#staticMethod()\">staticMethod</a></code>"},
    1.52 +        "<a href=\"../pkg/BaseClass.html#staticMethod--\">staticMethod</a></code>"},
    1.53      };
    1.54      private static final String[] ARGS =
    1.55          new String[] {