author | bpatel |
Tue, 06 Mar 2018 10:45:47 -0800 | |
changeset 49139 | 771616d26ca1 |
parent 48654 | 36f58bd6269f |
child 50118 | 919c36db208c |
permissions | -rw-r--r-- |
10 | 1 |
/* |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
2 |
* Copyright (c) 2002, 2018, 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 |
|
47284
355349babaf4
8186332: Fix method signature in method summary table
bpatel
parents:
47216
diff
changeset
|
26 |
* @bug 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854 8071982 8162363 8175200 8186332 |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
27 |
* 8182765 |
26270
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
28 |
* @summary A simple test to ensure class-use files are correct. |
10 | 29 |
* @author jamieh |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
30 |
* @library ../lib |
36526 | 31 |
* @modules jdk.javadoc/jdk.javadoc.internal.tool |
10 | 32 |
* @build JavadocTester |
33 |
* @run main TestUseOption |
|
34 |
*/ |
|
35 |
||
36 |
public class TestUseOption extends JavadocTester { |
|
37 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
38 |
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
|
39 |
TestUseOption tester = new TestUseOption(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
40 |
tester.runTests(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
41 |
} |
10 | 42 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
43 |
@Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
44 |
void test1() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
45 |
javadoc("-d", "out-1", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
46 |
"-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
47 |
"-use", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
48 |
"pkg1", "pkg2"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
49 |
checkExit(Exit.OK); |
8841
b4422fa4f2e6
7006178: findbugs high priority issues in new javadoc
bpatel
parents:
5520
diff
changeset
|
50 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
51 |
// Eight tests for class use. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
52 |
for (int i = 1; i <= 8; i++) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
53 |
checkOutput("pkg1/class-use/C1.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
54 |
"Test " + i + " passes"); |
14060
ae69cea86e83
7068595: html files in class-use dir do not get loaded correctly when Frames link is clicked
bpatel
parents:
8841
diff
changeset
|
55 |
} |
ae69cea86e83
7068595: html files in class-use dir do not get loaded correctly when Frames link is clicked
bpatel
parents:
8841
diff
changeset
|
56 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
57 |
// Three more tests for package use. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
58 |
for (int i = 1; i <= 3; i++) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
59 |
checkOutput("pkg1/package-use.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
60 |
"Test " + i + " passes"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
61 |
} |
10 | 62 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
63 |
checkOrder("pkg1/class-use/UsedClass.html", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
64 |
"Field in C1.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
65 |
"Field in C2.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
66 |
"Field in C4.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
67 |
"Field in C5.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
68 |
"Field in C6.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
69 |
"Field in C7.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
70 |
"Field in C8.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
71 |
"Method in C1.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
72 |
"Method in C2.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
73 |
"Method in C4.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
74 |
"Method in C5.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
75 |
"Method in C6.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
76 |
"Method in C7.", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
77 |
"Method in C8." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
78 |
); |
14060
ae69cea86e83
7068595: html files in class-use dir do not get loaded correctly when Frames link is clicked
bpatel
parents:
8841
diff
changeset
|
79 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
80 |
checkOutput("pkg2/class-use/C3.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
81 |
"<a href=\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
82 |
+ "Frames</a></li>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
83 |
); |
25284
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
84 |
checkOutput("pkg1/class-use/UsedClass.html", true, |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
85 |
"that return types with arguments of type" |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
86 |
); |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
87 |
checkOutput("pkg1/class-use/UsedClass.html", true, |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
88 |
"<a href=\"../C1.html#methodInC1ReturningType()\">methodInC1ReturningType</a>" |
25284
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
89 |
); |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
90 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
91 |
"Classes in <a href=\"../package-summary.html\">pkg1</a> that implement " + |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
92 |
"<a href=\"../UsedInterface.html\" title=\"interface in pkg1\">UsedInterface</a>" |
25284
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
93 |
); |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
94 |
checkOutput("pkg1/class-use/UsedInterfaceA.html", true, |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
95 |
"Classes in <a href=\"../package-summary.html\">pkg1</a> that implement " + |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
96 |
"<a href=\"../UsedInterfaceA.html\" title=\"interface in pkg1\">UsedInterfaceA</a>" |
25284
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
97 |
); |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
98 |
checkOutput("pkg1/class-use/UsedClass.html", false, |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
99 |
"methodInC1Protected" |
e6a8d468b838
8047157: [javadoc] fixup tests for determinism and add classes uses
ksrini
parents:
24399
diff
changeset
|
100 |
); |
25450 | 101 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
102 |
"<a href=\"../AnAbstract.html\" title=\"class in pkg1\">AnAbstract</a>" |
25450 | 103 |
); |
104 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
|
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
105 |
"../C10.html#withReturningTypeParameters()" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
106 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
107 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
108 |
"../C10.html#withTypeParametersOfType(java.lang.Class)" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
109 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
110 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
111 |
"\"../package-summary.html\">pkg1</a> that return " + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
112 |
"<a href=\"../UsedInterface.html\" title=\"interface in pkg1\"" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
113 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
114 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
115 |
"<a href=\"../C10.html#addAll(pkg1.UsedInterface...)\">addAll</a>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
116 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
117 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
118 |
"<a href=\"../C10.html#create(pkg1.UsedInterfaceA,pkg1." + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
119 |
"UsedInterface,java.lang.String)\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
120 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
121 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
122 |
"<a href=\"../C10.html#withTypeParametersOfType(java.lang.Class)\">" + |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
123 |
"withTypeParametersOfType</a>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
124 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
125 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
126 |
"Subinterfaces of <a href=\"../UsedInterface.html\" title=\"interface in pkg1\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
127 |
+ "UsedInterface</a> in <a href=\"../package-summary.html\">pkg1", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
128 |
"<td class=\"colFirst\"><code>interface </code></td>\n<th class=\"colSecond\" scope=\"row\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
129 |
+ "<code><span class=\"memberNameLink\"><a href=\"../SubInterface.html\" " |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
130 |
+ "title=\"interface in pkg1\">SubInterface</a><T></span></code></th>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
131 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
132 |
checkOutput("pkg1/class-use/UsedThrowable.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
133 |
"Methods in <a href=\"../package-summary.html\">pkg1</a> that throw " |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
134 |
+ "<a href=\"../UsedThrowable.html\" title=\"class in pkg1\">UsedThrowable</a>", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
135 |
"<td class=\"colFirst\"><code>void</code></td>\n<th class=\"colSecond\" scope=\"row\"><span class=" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
136 |
+ "\"typeNameLabel\">C1.</span><code><span class=\"memberNameLink\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
137 |
+ "<a href=\"../C1.html#methodInC1ThrowsThrowable()\">methodInC1ThrowsThrowable" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
138 |
+ "</a></span>()</code></th>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
139 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
140 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
141 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
142 |
@Test |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
143 |
void test1_html4() { |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
144 |
javadoc("-d", "out-1-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
145 |
"-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
146 |
"-sourcepath", testSrc, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
147 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
148 |
"pkg1", "pkg2"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
149 |
checkExit(Exit.OK); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
150 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
151 |
checkOutput("pkg1/class-use/UsedClass.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
152 |
"<a href=\"../C1.html#methodInC1ReturningType--\">methodInC1ReturningType</a>" |
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 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
155 |
"../C10.html#withReturningTypeParameters--" |
25450 | 156 |
); |
157 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
|
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
158 |
"../C10.html#withTypeParametersOfType-java.lang.Class-" |
25450 | 159 |
); |
160 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
|
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
161 |
"<a href=\"../C10.html#addAll-pkg1.UsedInterface...-\">addAll</a>" |
25450 | 162 |
); |
163 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
|
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
164 |
"<a href=\"../C10.html#create-pkg1.UsedInterfaceA-pkg1." + |
25450 | 165 |
"UsedInterface-java.lang.String-\">" |
166 |
); |
|
167 |
checkOutput("pkg1/class-use/UsedInterface.html", true, |
|
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
168 |
"<a href=\"../C10.html#withTypeParametersOfType-java.lang.Class-\">" + |
25450 | 169 |
"withTypeParametersOfType</a>" |
170 |
); |
|
36705 | 171 |
checkOutput("pkg1/class-use/UsedThrowable.html", true, |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
172 |
"Methods in <a href=\"../package-summary.html\">pkg1</a> that throw " |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
173 |
+ "<a href=\"../UsedThrowable.html\" title=\"class in pkg1\">UsedThrowable</a>", |
41157
b235a429089a
8162363: Tables in javadoc documentation missing row headers
bpatel
parents:
36709
diff
changeset
|
174 |
"<td class=\"colFirst\"><code>void</code></td>\n<th class=\"colSecond\" scope=\"row\"><span class=" |
36705 | 175 |
+ "\"typeNameLabel\">C1.</span><code><span class=\"memberNameLink\">" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
176 |
+ "<a href=\"../C1.html#methodInC1ThrowsThrowable--\">methodInC1ThrowsThrowable" |
47284
355349babaf4
8186332: Fix method signature in method summary table
bpatel
parents:
47216
diff
changeset
|
177 |
+ "</a></span>()</code></th>" |
36705 | 178 |
); |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
179 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
180 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
181 |
@Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
182 |
void test2() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
183 |
javadoc("-d", "out-2", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
184 |
"-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
185 |
"-use", |
36705 | 186 |
testSrc("C.java"), testSrc("UsedInC.java"), "pkg3"); |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
187 |
checkExit(Exit.OK); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
188 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
189 |
checkOutput("class-use/UsedInC.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
190 |
"Uses of <a href=\"../UsedInC.html\" title=\"class in <Unnamed>\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
191 |
+ "UsedInC</a> in <a href=\"../package-summary.html\"><Unnamed></a>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
192 |
); |
26900
dccc7a72526d
8048351: tidy errors for attribute href, name for langtools javadoc tests needs investigation
bpatel
parents:
26270
diff
changeset
|
193 |
checkOutput("class-use/UsedInC.html", true, |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
194 |
"<li class=\"blockList\">\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
195 |
+ "<section role=\"region\"><a id=\"unnamed.package\">" |
26900
dccc7a72526d
8048351: tidy errors for attribute href, name for langtools javadoc tests needs investigation
bpatel
parents:
26270
diff
changeset
|
196 |
); |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
197 |
checkOutput("package-use.html", true, |
41157
b235a429089a
8162363: Tables in javadoc documentation missing row headers
bpatel
parents:
36709
diff
changeset
|
198 |
"<th class=\"colFirst\" scope=\"row\">" |
b235a429089a
8162363: Tables in javadoc documentation missing row headers
bpatel
parents:
36709
diff
changeset
|
199 |
+ "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a></th>", |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
200 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"#%3CUnnamed%3E\"><Unnamed></a></th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
201 |
+ "<td class=\"colLast\"> </td>" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
202 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
203 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
204 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
205 |
@Test |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
206 |
void test2_html4() { |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
207 |
javadoc("-d", "out-2-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
208 |
"-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
209 |
"-sourcepath", testSrc, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
210 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
211 |
testSrc("C.java"), testSrc("UsedInC.java"), "pkg3"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
212 |
checkExit(Exit.OK); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
213 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
214 |
checkOutput("class-use/UsedInC.html", true, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
215 |
"<li class=\"blockList\"><a name=\"unnamed.package\">" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
216 |
); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
217 |
checkOutput("package-use.html", true, |
41157
b235a429089a
8162363: Tables in javadoc documentation missing row headers
bpatel
parents:
36709
diff
changeset
|
218 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"#-Unnamed-\"><Unnamed></a></th>\n" |
36705 | 219 |
+ "<td class=\"colLast\"> </td>" |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
220 |
); |
10 | 221 |
} |
26270
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
222 |
|
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
223 |
@Test |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
224 |
void test3() { |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
225 |
javadoc("-d", "out-3", |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
226 |
"-sourcepath", testSrc, |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
227 |
"-use", |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
228 |
"-package", "unique"); |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
229 |
checkExit(Exit.OK); |
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
230 |
checkUnique("unique/class-use/UseMe.html", |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
231 |
"<a href=\"../C1.html#umethod1(unique.UseMe,unique.UseMe%5B%5D)\">", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
232 |
"<a href=\"../C1.html#umethod2(unique.UseMe,unique.UseMe)\">", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
233 |
"<a href=\"../C1.html#umethod3(unique.UseMe,unique.UseMe)\">", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
234 |
"<a href=\"../C1.html#%3Cinit%3E(unique.UseMe,unique.UseMe)\">"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
235 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
236 |
|
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
237 |
@Test |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
238 |
void test3_html4() { |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
239 |
javadoc("-d", "out-3-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
240 |
"-html4", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
241 |
"-sourcepath", testSrc, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
242 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
243 |
"-package", "unique"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
244 |
checkExit(Exit.OK); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48654
diff
changeset
|
245 |
checkUnique("unique/class-use/UseMe.html", |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
246 |
"<a href=\"../C1.html#umethod1-unique.UseMe-unique.UseMe:A-\">", |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
247 |
"<a href=\"../C1.html#umethod2-unique.UseMe-unique.UseMe-\">", |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
248 |
"<a href=\"../C1.html#umethod3-unique.UseMe-unique.UseMe-\">", |
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
47284
diff
changeset
|
249 |
"<a href=\"../C1.html#C1-unique.UseMe-unique.UseMe-\">"); |
26270
a3635e6d3d78
8050031: [javadoc] class-use pages have duplicates and missing entries
ksrini
parents:
25450
diff
changeset
|
250 |
} |
10 | 251 |
} |