8186703: javadoc needs a test to verify member hiding

Reviewed-by: jjg

test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java

@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200 8186332
+ * @bug      4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200
+             8186332 8186703
  * @summary  Verify that the public modifier does not show up in the
  *           documentation for public methods, as recommended by the JLS.
  *           If A implements I and B extends A, B should be in the list of
@@ -122,10 +123,36 @@ public class TestInterface extends JavadocTester {
                 "public int method()",
                 "public static final int field");
 
-        checkOutput("pkg/ClassWithStaticMethod.html", false,
+        checkOutput("pkg/ClassWithStaticMembers.html", false,
                 //Make sure "Specified By" does not appear on class documentation when
                 //the method is a static method in the interface.
                 "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n");
+
+        checkOutput("pkg/ClassWithStaticMembers.html", true,
+                "<h4>f</h4>\n"
+                + "<pre>public static&nbsp;int f</pre>\n"
+                + "<div class=\"block\">A hider field</div>",
+
+                "<td class=\"colFirst\"><code>static void</code></td>\n"
+                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<a href=\"../pkg/ClassWithStaticMembers.html#m--\">m</a></span>()</code></th>\n"
+                + "<td class=\"colLast\">\n"
+                + "<div class=\"block\">A hider method</div>\n"
+                + "</td>\n",
+
+                "<h4>staticMethod</h4>\n"
+                + "<pre>public static&nbsp;void&nbsp;staticMethod()</pre>\n"
+                + "<div class=\"block\"><span class=\"descfrmTypeLabel\">"
+                + "Description copied from interface:&nbsp;<code>"
+                + "<a href=\"../pkg/InterfaceWithStaticMembers.html#staticMethod--\">"
+                + "InterfaceWithStaticMembers</a></code></span></div>\n"
+                + "<div class=\"block\">A static method</div>\n");
+
+        checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true,
+                "<pre>public static class <span class=\"typeNameLabel\">"
+                + "ClassWithStaticMembers.InnerClass</span>\n"
+                + "extends java.lang.Object</pre>\n"
+                + "<div class=\"block\">A hider inner class</div>");
     }
 
     @Test
@@ -155,8 +182,8 @@ public class TestInterface extends JavadocTester {
         checkOutput("pkg2/Spliterator.OfDouble.html", true,
             // Ensure the correct type parameters are displayed correctly
             "<h3>Nested classes/interfaces inherited from interface&nbsp;pkg2."
-            + "<a href=\"../pkg2/Spliterator.html\" title=\"interface in pkg2\">Spliterator</a></h3>\n" +
+            + "<a href=\"../pkg2/Spliterator.html\" title=\"interface in pkg2\">Spliterator</a></h3>\n"
-            "<code><a href=\"../pkg2/Spliterator.OfDouble.html\" title=\"interface in pkg2\">"
+            + "<code><a href=\"../pkg2/Spliterator.OfDouble.html\" title=\"interface in pkg2\">"
             + "Spliterator.OfDouble</a>, <a href=\"../pkg2/Spliterator.OfInt.html\" "
             + "title=\"interface in pkg2\">Spliterator.OfInt</a>&lt;"
             + "<a href=\"../pkg2/Spliterator.OfInt.html\" title=\"type parameter in Spliterator.OfInt\">"

test/langtools/jdk/javadoc/doclet/testInterface/pkg/ClassWithStaticMembers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,18 @@
 
 package pkg;
 
-public class ClassWithStaticMethod implements InterfaceWithStaticMethod {
+public class ClassWithStaticMembers implements InterfaceWithStaticMembers {
 
-    public static void staticMethod() {
+    /** A hider inner class */
-    }
+    public static class InnerClass{}
+
+    /** A hider field */
+    public static int f = 1;
+
+    /** A hider method */
+    public static void m(){}
+
+    // no comment
+    public static void staticMethod() {}
 
 }

test/langtools/jdk/javadoc/doclet/testInterface/pkg/InterfaceWithStaticMembers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,14 @@
 
 package pkg;
 
-public interface InterfaceWithStaticMethod {
+public interface InterfaceWithStaticMembers {
 
-    /**
+    /** A static nested class */
-     * A static method
+    static class InnerClass {}
-     */
+
+    /** A static field */
+    static int f = 0;
+
+    /** A static method */
     static void staticMethod() { }
 }