author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 55339 | 0530705ca300 |
permissions | -rw-r--r-- |
10 | 1 |
/* |
53562 | 2 |
* Copyright (c) 2003, 2019, 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 |
50810
0358dad944c7
8187288: bad (no) wrapping for modifier and type column
pmuthuswamy
parents:
49139
diff
changeset
|
27 |
8186332 8186703 8182765 8187288 |
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 |
|
53097 | 33 |
* @library ../../lib |
36526 | 34 |
* @modules jdk.javadoc/jdk.javadoc.internal.tool |
53097 | 35 |
* @build javadoc.tester.* |
10 | 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 |
|
53097 | 53 |
import javadoc.tester.JavadocTester; |
54 |
||
10 | 55 |
public class TestInterface extends JavadocTester { |
56 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
57 |
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
|
58 |
TestInterface tester = new TestInterface(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
59 |
tester.runTests(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
60 |
} |
10 | 61 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
62 |
@Test |
53097 | 63 |
public void test() { |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
64 |
javadoc("-d", "out", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
65 |
"-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
66 |
"pkg"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
67 |
checkExit(Exit.OK); |
10 | 68 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
69 |
checkOutput("pkg/Interface.html", true, |
55197
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
70 |
"<div class=\"memberSignature\"><span class=\"returnType\">int</span> " |
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
71 |
+ "<span class=\"memberName\">method</span>()</div>", |
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
72 |
"<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> " |
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
73 |
+ "<span class=\"returnType\">int</span> <span class=\"memberName\">field</span></div>", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
74 |
// 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
|
75 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
76 |
+ "<dt>All Known Implementing Classes:</dt>\n" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
77 |
+ "<dd><code><a href=\"Child.html\" title=\"class in pkg\">Child" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
78 |
+ "</a></code>, <code><a href=\"Parent.html\" title=\"class in pkg\">Parent" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
79 |
+ "</a></code></dd>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
80 |
+ "</dl>"); |
10 | 81 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
82 |
checkOutput("pkg/Child.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
83 |
// 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
|
84 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
85 |
+ "<dt>All Implemented Interfaces:</dt>\n" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
86 |
+ "<dd><code><a href=\"Interface.html\" title=\"interface in pkg\">" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
87 |
+ "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
|
88 |
+ "</dl>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
89 |
//Make sure Class Tree has substituted type parameters. |
54648
89f2043ee67a
8221991: Improve the HTML for the inheritance tree for a type
pmuthuswamy
parents:
54596
diff
changeset
|
90 |
"<div class=\"inheritance\" title=\"Inheritance Tree\">java.lang.Object\n" |
89f2043ee67a
8221991: Improve the HTML for the inheritance tree for a type
pmuthuswamy
parents:
54596
diff
changeset
|
91 |
+ "<div class=\"inheritance\"><a href=\"Parent.html\"" |
89f2043ee67a
8221991: Improve the HTML for the inheritance tree for a type
pmuthuswamy
parents:
54596
diff
changeset
|
92 |
+ " title=\"class in pkg\">pkg.Parent</a><CE>\n" |
89f2043ee67a
8221991: Improve the HTML for the inheritance tree for a type
pmuthuswamy
parents:
54596
diff
changeset
|
93 |
+ "<div class=\"inheritance\">pkg.Child<CE></div>\n" |
89f2043ee67a
8221991: Improve the HTML for the inheritance tree for a type
pmuthuswamy
parents:
54596
diff
changeset
|
94 |
+ "</div>\n</div>", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
95 |
//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
|
96 |
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
97 |
+ "<dd><code><a href=\"Interface.html#method()\">method</a>" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
98 |
+ "</code> in interface <code>" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
99 |
+ "<a href=\"Interface.html\" title=\"interface in pkg\">" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
100 |
+ "Interface</a><<a href=\"Child.html\" title=\"type parameter in Child\">" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
101 |
+ "CE</a>></code></dd>", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
102 |
//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
|
103 |
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
104 |
+ "<dd><code><a href=\"Parent.html#method()\">method</a>" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
105 |
+ "</code> in class <code><a href=\"Parent.html\" " |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
106 |
+ "title=\"class in pkg\">Parent</a><<a href=\"Child.html\" " |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
107 |
+ "title=\"type parameter in Child\">CE</a>></code></dd>"); |
10 | 108 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
109 |
checkOutput("pkg/Parent.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
110 |
//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
|
111 |
"<dl>\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
112 |
+ "<dt>Direct Known Subclasses:</dt>\n" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
113 |
+ "<dd><code><a href=\"Child.html\" title=\"class in pkg\">Child" |
40506
258ad5fd9b57
8163800: The fix for JDK-8072052 shows up other minor incorrect use of styles
jjg
parents:
36526
diff
changeset
|
114 |
+ "</a></code></dd>\n" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
115 |
+ "</dl>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
116 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
117 |
checkOutput("pkg/Interface.html", false, |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
118 |
"public int method--", |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
119 |
"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
|
120 |
|
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
121 |
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
|
122 |
//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
|
123 |
//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
|
124 |
"<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
|
125 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
126 |
checkOutput("pkg/ClassWithStaticMembers.html", true, |
55339
0530705ca300
8223364: Bad placement of anchor relative to header
hannesw
parents:
55197
diff
changeset
|
127 |
"<h3><a id=\"f\">f</a></h3>\n" |
55197
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
128 |
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> " |
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
129 |
+ "<span class=\"returnType\">int</span> <span class=\"memberName\">f</span></div>\n" |
47311
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
130 |
+ "<div class=\"block\">A hider field</div>", |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
131 |
|
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
132 |
"<td class=\"colFirst\"><code>static void</code></td>\n" |
ff631a3cadbc
8186703: javadoc needs a test to verify member hiding
ksrini
parents:
47284
diff
changeset
|
133 |
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
134 |
+ "<a href=\"#m()\">m</a></span>()</code></th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
135 |
+ "<td class=\"colLast\">\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
136 |
+ "<div class=\"block\">A hider method</div>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
137 |
+ "</td>\n", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
138 |
|
55339
0530705ca300
8223364: Bad placement of anchor relative to header
hannesw
parents:
55197
diff
changeset
|
139 |
"<h3><a id=\"staticMethod()\">staticMethod</a></h3>\n" |
55197
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
140 |
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> " |
0ca8e495bbba
8214126: Method signatures not formatted correctly in browser
hannesw
parents:
54648
diff
changeset
|
141 |
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">staticMethod</span>()</div>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
142 |
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
143 |
+ "Description copied from interface: <code>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
144 |
+ "<a href=\"InterfaceWithStaticMembers.html#staticMethod()\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
145 |
+ "InterfaceWithStaticMembers</a></code></span></div>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
146 |
+ "<div class=\"block\">A static method</div>\n"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
147 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
148 |
checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
149 |
"<pre>public static class <span class=\"typeNameLabel\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
150 |
+ "ClassWithStaticMembers.InnerClass</span>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
151 |
+ "extends java.lang.Object</pre>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
152 |
+ "<div class=\"block\">A hider inner class</div>"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
153 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
154 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
155 |
@Test |
53097 | 156 |
public void test1() { |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
157 |
javadoc("-d", "out-1", |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
158 |
"-sourcepath", testSrc, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
159 |
"pkg1"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
160 |
checkExit(Exit.OK); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
161 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
162 |
checkOutput("pkg1/Child.html", true, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
163 |
// Ensure the correct Overrides in the inheritance hierarchy is reported |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
164 |
"<span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" + |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
165 |
"<dd><code><a href=\"GrandParent.html#method1()\">method1</a></code>" + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
166 |
" in class " + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
167 |
"<code><a href=\"GrandParent.html\" title=\"class in pkg1\">GrandParent</a>" + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
168 |
"<<a href=\"Child.html\" title=\"type parameter in Child\">CE</a>></code>"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
169 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
170 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
171 |
@Test |
53097 | 172 |
public void test2() { |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
173 |
javadoc("-d", "out-2", |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
174 |
"-sourcepath", testSrc, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
175 |
"pkg2"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
176 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
177 |
checkExit(Exit.OK); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
178 |
|
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
179 |
checkOutput("pkg2/Spliterator.OfDouble.html", true, |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
180 |
// Ensure the correct type parameters are displayed correctly |
53991 | 181 |
"<h2>Nested classes/interfaces inherited from interface pkg2." |
182 |
+ "<a href=\"Spliterator.html\" title=\"interface in pkg2\">Spliterator</a></h2>\n" |
|
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
53991
diff
changeset
|
183 |
+ "<a id=\"nested.classes.inherited.from.class.pkg2.Spliterator\">\n" |
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
53991
diff
changeset
|
184 |
+ "<!-- -->\n" |
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
53991
diff
changeset
|
185 |
+ "</a><code><a href=\"Spliterator.OfDouble.html\" title=\"interface in pkg2\">" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
186 |
+ "Spliterator.OfDouble</a>, <a href=\"Spliterator.OfInt.html\" " |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
187 |
+ "title=\"interface in pkg2\">Spliterator.OfInt</a><" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
188 |
+ "<a href=\"Spliterator.OfInt.html\" title=\"type parameter in Spliterator.OfInt\">" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
189 |
+ "Integer</a>>, <a href=\"Spliterator.OfPrimitive.html\" title=\"interface in pkg2\">" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
190 |
+ "Spliterator.OfPrimitive</a><<a href=\"Spliterator.OfPrimitive.html\" " |
50810
0358dad944c7
8187288: bad (no) wrapping for modifier and type column
pmuthuswamy
parents:
49139
diff
changeset
|
191 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T</a>,​<a href=\"Spliterator.OfPrimitive.html\" " |
0358dad944c7
8187288: bad (no) wrapping for modifier and type column
pmuthuswamy
parents:
49139
diff
changeset
|
192 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T_CONS</a>,​" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
193 |
+ "<a href=\"Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
194 |
+ "T_SPLITR</a> extends <a href=\"Spliterator.OfPrimitive.html\" title=\"interface in pkg2\">" |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
195 |
+ "Spliterator.OfPrimitive</a><<a href=\"Spliterator.OfPrimitive.html\" " |
50810
0358dad944c7
8187288: bad (no) wrapping for modifier and type column
pmuthuswamy
parents:
49139
diff
changeset
|
196 |
+ "title=\"type parameter in Spliterator.OfPrimitive\">T</a>,​" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47311
diff
changeset
|
197 |
+ "<a href=\"Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
50810
0358dad944c7
8187288: bad (no) wrapping for modifier and type column
pmuthuswamy
parents:
49139
diff
changeset
|
198 |
+ "T_CONS</a>,​<a href=\"Spliterator.OfPrimitive.html\" title=\"type parameter in Spliterator.OfPrimitive\">" |
35426
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
199 |
+ "T_SPLITR</a>>></code>"); |
374342e56a56
8035473: [javadoc] Revamp the existing Doclet APIs
ksrini
parents:
30730
diff
changeset
|
200 |
} |
10 | 201 |
} |