author | ksrini |
Wed, 04 Oct 2017 10:44:21 -0700 | |
changeset 47311 | ff631a3cadbc |
parent 47284 | 355349babaf4 |
child 48654 | 36f58bd6269f |
permissions | -rw-r--r-- |
10 | 1 |
/* |
44297
e03f5fb3714b
8175200: Long method signatures disturb Method Summary table
bpatel
parents:
42417
diff
changeset
|
2 |
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. |
10 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5520 | 19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
10 | 22 |
*/ |
23 |
||
24 |
/* |
|
25 |
* @test |
|
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
26 |
* @bug 4682448 4947464 5029946 8025633 8026567 8035473 8139101 8175200 |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
27 |
8186332 8186703 |
10 | 28 |
* @summary Verify that the public modifier does not show up in the |
29 |
* documentation for public methods, as recommended by the JLS. |
|
30 |
* If A implements I and B extends A, B should be in the list of |
|
31 |
* implementing classes in the documentation for I. |
|
32 |
* @author jamieh |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
33 |
* @library ../lib |
36526 | 34 |
* @modules jdk.javadoc/jdk.javadoc.internal.tool |
10 | 35 |
* @build JavadocTester |
36 |
* @run main TestInterface |
|
37 |
*/ |
|
38 |
||
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
39 |
/* |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
40 |
* TODO: make it Interface<PE> ie. fix all ParameterTypes, likely should get |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
41 |
* fixed when Doc is replace by j.l.m, but meanwhile this test has been adjusted |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
42 |
* take the current format this is better than @ignore because we can follow the |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
43 |
* differences as the work progress. |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
44 |
* |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
45 |
* The consensus is that we should have something as follows: |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
46 |
* In Child.html |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
47 |
* Specified by: method in interface<IE> |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
48 |
* Overrides: method in class Parent<PE> |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
49 |
* In otherwords the TypeParameter in scope should be used ex: Interface<IE>, Parent<PE> |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
50 |
and Child<CE> |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
51 |
*/ |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
52 |
|
10 | 53 |
public class TestInterface extends JavadocTester { |
54 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
55 |
public static void main(String... args) throws Exception { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
56 |
TestInterface tester = new TestInterface(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
57 |
tester.runTests(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
58 |
} |
10 | 59 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
60 |
@Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
61 |
void test() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
62 |
javadoc("-d", "out", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
63 |
"-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
64 |
"pkg"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
65 |
checkExit(Exit.OK); |
10 | 66 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
67 |
checkOutput("pkg/Interface.html", true, |
47284
355349babaf4
8186332: Fix method signature in method summary table
bpatel
parents:
47216
diff
changeset
|
68 |
"<pre>int method()</pre>", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
69 |
"<pre>static final int field</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
70 |
// Make sure known implementing class list is correct and omits type parameters. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
71 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
72 |
+ "<dt>All Known Implementing Classes:</dt>\n" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
73 |
+ "<dd><code><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" |
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
74 |
+ "</a></code>, <code><a href=\"../pkg/Parent.html\" title=\"class in pkg\">Parent" |
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
75 |
+ "</a></code></dd>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
76 |
+ "</dl>"); |
10 | 77 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
78 |
checkOutput("pkg/Child.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
79 |
// Make sure "All Implemented Interfaces": has substituted type parameters |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
80 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
81 |
+ "<dt>All Implemented Interfaces:</dt>\n" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
82 |
+ "<dd><code><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" |
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
83 |
+ "Interface</a><CE></code></dd>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
84 |
+ "</dl>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
85 |
//Make sure Class Tree has substituted type parameters. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
86 |
"<ul class=\"inheritance\">\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
87 |
+ "<li>java.lang.Object</li>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
88 |
+ "<li>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
89 |
+ "<ul class=\"inheritance\">\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
90 |
+ "<li><a href=\"../pkg/Parent.html\" title=\"class in pkg\">" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
91 |
+ "pkg.Parent</a><CE></li>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
92 |
+ "<li>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
93 |
+ "<ul class=\"inheritance\">\n" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
94 |
+ "<li>pkg.Child<CE></li>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
95 |
+ "</ul>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
96 |
+ "</li>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
97 |
+ "</ul>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
98 |
+ "</li>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
99 |
+ "</ul>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
100 |
//Make sure "Specified By" has substituted type parameters. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
101 |
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
102 |
+ "<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
103 |
+ "</code> in interface <code>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
104 |
+ "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
105 |
+ "Interface</a><<a href=\"../pkg/Child.html\" title=\"type parameter in Child\">" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
106 |
+ "CE</a>></code></dd>", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
107 |
//Make sure "Overrides" has substituted type parameters. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
108 |
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
109 |
+ "<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
110 |
+ "</code> in class <code><a href=\"../pkg/Parent.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
111 |
+ "title=\"class in pkg\">Parent</a><<a href=\"../pkg/Child.html\" " |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
112 |
+ "title=\"type parameter in Child\">CE</a>></code></dd>"); |
10 | 113 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
114 |
checkOutput("pkg/Parent.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
115 |
//Make sure "Direct Know Subclasses" omits type parameters |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
116 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
117 |
+ "<dt>Direct Known Subclasses:</dt>\n" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
118 |
+ "<dd><code><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" |
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
119 |
+ "</a></code></dd>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
120 |
+ "</dl>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
121 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
122 |
checkOutput("pkg/Interface.html", false, |
47284
355349babaf4
8186332: Fix method signature in method summary table
bpatel
parents:
47216
diff
changeset
|
123 |
"public int method()", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
124 |
"public static final int field"); |
42417
8e1573096052
8139101: javadoc emits "specified by" clause when class has a method that matches a static interface method
bpatel
parents:
40506
diff
changeset
|
125 |
|
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
126 |
checkOutput("pkg/ClassWithStaticMembers.html", false, |
42417
8e1573096052
8139101: javadoc emits "specified by" clause when class has a method that matches a static interface method
bpatel
parents:
40506
diff
changeset
|
127 |
//Make sure "Specified By" does not appear on class documentation when |
8e1573096052
8139101: javadoc emits "specified by" clause when class has a method that matches a static interface method
bpatel
parents:
40506
diff
changeset
|
128 |
//the method is a static method in the interface. |
8e1573096052
8139101: javadoc emits "specified by" clause when class has a method that matches a static interface method
bpatel
parents:
40506
diff
changeset
|
129 |
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"); |
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
130 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
131 |
checkOutput("pkg/ClassWithStaticMembers.html", true, |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
132 |
"<h4>f</h4>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
133 |
+ "<pre>public static int f</pre>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
134 |
+ "<div class=\"block\">A hider field</div>", |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
135 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
136 |
"<td class=\"colFirst\"><code>static void</code></td>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
137 |
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
138 |
+ "<a href=\"../pkg/ClassWithStaticMembers.html#m--\">m</a></span>()</code></th>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
139 |
+ "<td class=\"colLast\">\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
140 |
+ "<div class=\"block\">A hider method</div>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
141 |
+ "</td>\n", |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
142 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
143 |
"<h4>staticMethod</h4>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
144 |
+ "<pre>public static void staticMethod()</pre>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
145 |
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
146 |
+ "Description copied from interface: <code>" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
147 |
+ "<a href=\"../pkg/InterfaceWithStaticMembers.html#staticMethod--\">" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
148 |
+ "InterfaceWithStaticMembers</a></code></span></div>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
149 |
+ "<div class=\"block\">A static method</div>\n"); |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
150 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
151 |
checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true, |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
152 |
"<pre>public static class <span class=\"typeNameLabel\">" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
153 |
+ "ClassWithStaticMembers.InnerClass</span>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
154 |
+ "extends java.lang.Object</pre>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
155 |
+ "<div class=\"block\">A hider inner class</div>"); |
10 | 156 |
} |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
157 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
158 |
@Test |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
159 |
void test1() { |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
160 |
javadoc("-d", "out-1", |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
161 |
"-sourcepath", testSrc, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
162 |
"pkg1"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
163 |
checkExit(Exit.OK); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
164 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
165 |
checkOutput("pkg1/Child.html", true, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
166 |
// Ensure the correct Overrides in the inheritance hierarchy is reported |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
167 |
"<span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" + |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
168 |
"<dd><code><a href=\"../pkg1/GrandParent.html#method1--\">method1</a></code>" + |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
169 |
" in class " + |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
170 |
"<code><a href=\"../pkg1/GrandParent.html\" title=\"class in pkg1\">GrandParent</a>" + |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
171 |
"<<a href=\"../pkg1/Child.html\" title=\"type parameter in Child\">CE</a>></code>"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
172 |
} |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
173 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
174 |
@Test |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
175 |
void test2() { |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
176 |
javadoc("-d", "out-2", |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
177 |
"-sourcepath", testSrc, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
178 |
"pkg2"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
179 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
180 |
checkExit(Exit.OK); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
181 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
182 |
checkOutput("pkg2/Spliterator.OfDouble.html", true, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
183 |
// Ensure the correct type parameters are displayed correctly |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
184 |
"<h3>Nested classes/interfaces inherited from interface pkg2." |
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
185 |
+ "<a href=\"../pkg2/Spliterator.html\" title=\"interface in pkg2\">Spliterator</a></h3>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
186 |
+ "<code><a href=\"../pkg2/Spliterator.OfDouble.html\" title=\"interface in pkg2\">" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
187 |
+ "Spliterator.OfDouble</a>, <a href=\"../pkg2/Spliterator.OfInt.html\" " |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
188 |
+ "title=\"interface in pkg2\">Spliterator.OfInt</a><" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
189 |
+ "<a href=\"../pkg2/Spliterator.OfInt.html\" title=\"type parameter in Spliterator.OfInt\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
190 |
+ "Integer</a>>, <a href=\"../pkg2/Spliterator.OfPrimitive.html\" title=\"interface in pkg2\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
191 |
+ "Spliterator.OfPrimitive</a><<a href=\"../pkg2/Spliterator.OfPrimitive.html\" " |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
192 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T</a>,<a href=\"../pkg2/Spliterator.OfPrimitive.html\" " |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
193 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T_CONS</a>," |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
194 |
+ "<a href=\"../pkg2/Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
195 |
+ "T_SPLITR</a> extends <a href=\"../pkg2/Spliterator.OfPrimitive.html\" title=\"interface in pkg2\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
196 |
+ "Spliterator.OfPrimitive</a><<a href=\"../pkg2/Spliterator.OfPrimitive.html\" " |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
197 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T</a>," |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
198 |
+ "<a href=\"../pkg2/Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
199 |
+ "T_CONS</a>,<a href=\"../pkg2/Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
200 |
+ "T_SPLITR</a>>></code>"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
201 |
} |
10 | 202 |
} |