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

     1.1 --- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Thu Oct 10 08:51:55 2013 +0200
     1.2 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.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      4780441 4874845 4978816 8014017 8016328
     1.8 + * @bug      4780441 4874845 4978816 8014017 8016328 8025633
     1.9   * @summary  Make sure that when the -private flag is not used, members
    1.10   *           inherited from package private class are documented in the child.
    1.11   *
    1.12 @@ -66,7 +66,7 @@
    1.13  
    1.14          // Method inheritence from non-public superclass.
    1.15          {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
    1.16 -            "<a href=\"../pkg/PublicChild.html#methodInheritedFromParent(int)\">" +
    1.17 +            "<a href=\"../pkg/PublicChild.html#methodInheritedFromParent-int-\">" +
    1.18                  "methodInheritedFromParent</a>"
    1.19          },
    1.20  
    1.21 @@ -78,7 +78,7 @@
    1.22  
    1.23          // Method inheritence from non-public superinterface.
    1.24          {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
    1.25 -            "<a href=\"../pkg/PublicInterface.html#methodInterface(int)\">" +
    1.26 +            "<a href=\"../pkg/PublicInterface.html#methodInterface-int-\">" +
    1.27                  "methodInterface</a>"
    1.28          },
    1.29  
    1.30 @@ -139,7 +139,7 @@
    1.31          //Do not inherit private interface method with generic parameters.
    1.32          //This method has been implemented.
    1.33          {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
    1.34 -            "<span class=\"strong\"><a href=\"../pkg2/I.html#hello(T)\">hello</a></span>"},
    1.35 +            "<span class=\"strong\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"},
    1.36      };
    1.37  
    1.38      // Test output when -private flag is used.
    1.39 @@ -171,20 +171,20 @@
    1.40              "PrivateParent</a>"
    1.41          },
    1.42          {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
    1.43 -            "<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent(int)\">" +
    1.44 +            "<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent-int-\">" +
    1.45                  "methodInheritedFromParent</a>"
    1.46          },
    1.47          // Should document that a method overrides method from private class.
    1.48         {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
    1.49              "<dt><span class=\"strong\">Overrides:</span></dt>" + NL +
    1.50 -            "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[],%20int,%20T,%20V,%20java.util.List)\">" +
    1.51 +            "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-int-T-V-java.util.List-\">" +
    1.52              "methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>" +
    1.53              "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
    1.54              "PrivateParent</a></code></dd>"},
    1.55         // Should document that a method is specified by private interface.
    1.56         {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
    1.57              "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
    1.58 -            "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" +
    1.59 +            "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" +
    1.60              "methodInterface</a></code>&nbsp;in interface&nbsp;<code>" +
    1.61              "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
    1.62              "PrivateInterface</a></code></dd>"},
    1.63 @@ -195,7 +195,7 @@
    1.64              "PrivateInterface</a>"
    1.65          },
    1.66          {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateInterface.html",
    1.67 -            "<a href=\"../pkg/PrivateInterface.html#methodInterface(int)\">" +
    1.68 +            "<a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" +
    1.69                  "methodInterface</a>"
    1.70          },
    1.71        // Should mention that any documentation was copied.
    1.72 @@ -228,11 +228,11 @@
    1.73        //with generic parameters has been implemented.
    1.74        {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
    1.75              "<span class=\"strong\">Description copied from interface:&nbsp;<code>" +
    1.76 -            "<a href=\"../pkg2/I.html#hello(T)\">I</a></code></span>"},
    1.77 +            "<a href=\"../pkg2/I.html#hello-T-\">I</a></code></span>"},
    1.78  
    1.79        {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
    1.80              "<dt><span class=\"strong\">Specified by:</span></dt>" + NL +
    1.81 -            "<dd><code><a href=\"../pkg2/I.html#hello(T)\">hello</a></code>" +
    1.82 +            "<dd><code><a href=\"../pkg2/I.html#hello-T-\">hello</a></code>" +
    1.83              "&nbsp;in interface&nbsp;<code>" +
    1.84              "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" +
    1.85              "&lt;java.lang.String&gt;</code></dd>"},