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

     1.1 --- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Wed Jun 26 20:38:21 2013 -0700
     1.2 +++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Wed Jun 26 20:42:43 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -23,7 +23,7 @@
    1.11  
    1.12  /*
    1.13   * @test
    1.14 - * @bug      4780441 4874845 4978816
    1.15 + * @bug      4780441 4874845 4978816 8014017
    1.16   * @summary  Make sure that when the -private flag is not used, members
    1.17   *           inherited from package private class are documented in the child.
    1.18   *
    1.19 @@ -33,17 +33,19 @@
    1.20   *
    1.21   *           Make sure that when a private interface method with generic parameters
    1.22   *           is implemented, the comments can be inherited properly.
    1.23 + *
    1.24 + *           Make sure when no modifier appear in the class signature, the
    1.25 + *           signature is displayed correctly without extra space at the beginning.
    1.26   * @author   jamieh
    1.27   * @library  ../lib/
    1.28 - * @build    JavadocTester
    1.29 - * @build    TestPrivateClasses
    1.30 + * @build    JavadocTester TestPrivateClasses
    1.31   * @run main TestPrivateClasses
    1.32   */
    1.33  
    1.34  public class TestPrivateClasses extends JavadocTester {
    1.35  
    1.36      //Test information.
    1.37 -    private static final String BUG_ID = "4780441-4874845-4978816";
    1.38 +    private static final String BUG_ID = "4780441-4874845-4978816-8014017";
    1.39  
    1.40      //Javadoc arguments.
    1.41      private static final String[] ARGS1 = new String[] {
    1.42 @@ -234,8 +236,19 @@
    1.43              "&nbsp;in interface&nbsp;<code>" +
    1.44              "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" +
    1.45              "&lt;java.lang.String&gt;</code></dd>"},
    1.46 +
    1.47 +      //Make sure when no modifier appear in the class signature, the
    1.48 +      //signature is displayed correctly without extra space at the beginning.
    1.49 +      {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
    1.50 +            "<pre>class <span class=\"strong\">PrivateParent</span>"},
    1.51 +
    1.52 +      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
    1.53 +            "<pre>public class <span class=\"strong\">PublicChild</span>"},
    1.54      };
    1.55 -    private static final String[][] NEGATED_TEST2 = NO_TEST;
    1.56 +    private static final String[][] NEGATED_TEST2 = {
    1.57 +        {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
    1.58 +            "<pre> class <span class=\"strong\">PrivateParent</span>"},
    1.59 +    };
    1.60  
    1.61      /**
    1.62       * The entry point of the test.