author | jjg |
Tue, 22 Apr 2014 17:57:40 -0700 | |
changeset 24072 | e7549dcbc4af |
parent 24065 | fc4022e50129 |
child 24399 | af1a0220d0fa |
permissions | -rw-r--r-- |
10 | 1 |
/* |
23971 | 2 |
* Copyright (c) 2003, 2014, 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 |
|
21478
fa4c7cda1b41
8026567: Use meaningful style names for strong and italic styles.
bpatel
parents:
21008
diff
changeset
|
26 |
* @bug 4682448 4947464 5029946 8025633 8026567 |
10 | 27 |
* @summary Verify that the public modifier does not show up in the |
28 |
* documentation for public methods, as recommended by the JLS. |
|
29 |
* If A implements I and B extends A, B should be in the list of |
|
30 |
* implementing classes in the documentation for I. |
|
31 |
* @author jamieh |
|
32 |
* @library ../lib/ |
|
33 |
* @build JavadocTester |
|
34 |
* @build TestInterface |
|
35 |
* @run main TestInterface |
|
36 |
*/ |
|
37 |
||
38 |
public class TestInterface extends JavadocTester { |
|
39 |
||
40 |
//Javadoc arguments. |
|
41 |
private static final String[] ARGS = new String[] { |
|
24072 | 42 |
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" |
10 | 43 |
}; |
44 |
||
45 |
//Input for string search tests. |
|
46 |
private static final String[][] TEST = { |
|
24072 | 47 |
{ "pkg/Interface.html", |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
48 |
"<pre>int method()</pre>"}, |
24072 | 49 |
{ "pkg/Interface.html", |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
50 |
"<pre>static final int field</pre>"}, |
10 | 51 |
|
52 |
||
53 |
// Make sure known implementing class list is correct and omits type parameters. |
|
24072 | 54 |
{ "pkg/Interface.html", |
23971 | 55 |
"<dl>\n" + |
56 |
"<dt>All Known Implementing Classes:</dt>\n" + |
|
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
57 |
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
58 |
"</a>, <a href=\"../pkg/Parent.html\" title=\"class in pkg\">Parent" + |
23971 | 59 |
"</a></dd>\n" + |
60 |
"</dl>"}, |
|
10 | 61 |
|
62 |
// Make sure "All Implemented Interfaces": has substituted type parameters |
|
24072 | 63 |
{ "pkg/Child.html", |
23971 | 64 |
"<dl>\n" + |
65 |
"<dt>All Implemented Interfaces:</dt>\n" + |
|
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
66 |
"<dd><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" + |
23971 | 67 |
"Interface</a><T></dd>\n" + |
68 |
"</dl>" |
|
10 | 69 |
}, |
70 |
//Make sure Class Tree has substituted type parameters. |
|
24072 | 71 |
{ "pkg/Child.html", |
23971 | 72 |
"<ul class=\"inheritance\">\n" + |
73 |
"<li>java.lang.Object</li>\n" + |
|
74 |
"<li>\n" + |
|
75 |
"<ul class=\"inheritance\">\n" + |
|
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
76 |
"<li><a href=\"../pkg/Parent.html\" title=\"class in pkg\">" + |
23971 | 77 |
"pkg.Parent</a><T></li>\n" + |
78 |
"<li>\n" + |
|
79 |
"<ul class=\"inheritance\">\n" + |
|
80 |
"<li>pkg.Child<T></li>\n" + |
|
81 |
"</ul>\n" + |
|
82 |
"</li>\n" + |
|
83 |
"</ul>\n" + |
|
84 |
"</li>\n" + |
|
85 |
"</ul>" |
|
10 | 86 |
}, |
87 |
//Make sure "Direct Know Subclasses" omits type parameters |
|
24072 | 88 |
{ "pkg/Parent.html", |
23971 | 89 |
"<dl>\n" + |
90 |
"<dt>Direct Known Subclasses:</dt>\n" + |
|
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
91 |
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" + |
23971 | 92 |
"</a></dd>\n" + |
93 |
"</dl>" |
|
10 | 94 |
}, |
95 |
//Make sure "Specified By" has substituted type parameters. |
|
24072 | 96 |
{ "pkg/Child.html", |
23971 | 97 |
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" + |
21008
af0b915df7cc
8025633: Fix javadoc to generate valid anchor names
bpatel
parents:
19253
diff
changeset
|
98 |
"<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" + |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
99 |
"</code> in interface <code>" + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
100 |
"<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
101 |
"Interface</a><<a href=\"../pkg/Child.html\" title=\"type parameter in Child\">" + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
102 |
"T</a>></code></dd>" |
10 | 103 |
}, |
104 |
//Make sure "Overrides" has substituted type parameters. |
|
24072 | 105 |
{ "pkg/Child.html", |
23971 | 106 |
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" + |
21008
af0b915df7cc
8025633: Fix javadoc to generate valid anchor names
bpatel
parents:
19253
diff
changeset
|
107 |
"<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" + |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
108 |
"</code> in class <code><a href=\"../pkg/Parent.html\" " + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
109 |
"title=\"class in pkg\">Parent</a><<a href=\"../pkg/Child.html\" " + |
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
110 |
"title=\"type parameter in Child\">T</a>></code></dd>" |
10 | 111 |
}, |
112 |
}; |
|
113 |
private static final String[][] NEGATED_TEST = { |
|
24072 | 114 |
{ "pkg/Interface.html", |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
115 |
"public int method()"}, |
24072 | 116 |
{ "pkg/Interface.html", |
7614
cfadc977ca75
6851834: Javadoc doclet needs a structured approach to generate the output HTML.
bpatel
parents:
5520
diff
changeset
|
117 |
"public static final int field"}, |
10 | 118 |
}; |
119 |
||
120 |
/** |
|
121 |
* The entry point of the test. |
|
122 |
* @param args the array of command line arguments. |
|
123 |
*/ |
|
124 |
public static void main(String[] args) { |
|
125 |
TestInterface tester = new TestInterface(); |
|
24065
fc4022e50129
8041150: Avoid silly use of static methods in JavadocTester
jjg
parents:
23971
diff
changeset
|
126 |
tester.run(ARGS, TEST, NEGATED_TEST); |
10 | 127 |
tester.printSummary(); |
128 |
} |
|
129 |
} |