author | darcy |
Wed, 13 Jul 2016 17:28:29 -0700 | |
changeset 39672 | d13c2f465211 |
parent 30730 | d3ce7619db2c |
permissions | -rw-r--r-- |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
1 |
/* |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
26532
diff
changeset
|
2 |
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
4 |
* |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
8 |
* |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
13 |
* accompanied this code). |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
14 |
* |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
18 |
* |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
21 |
* questions. |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
22 |
*/ |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
23 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
24 |
/* |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
25 |
* @test |
21478
fa4c7cda1b41
8026567: Use meaningful style names for strong and italic styles.
bpatel
parents:
21041
diff
changeset
|
26 |
* @bug 8005091 8009686 8025633 8026567 |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
27 |
* @summary Make sure that type annotations are displayed correctly |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
28 |
* @author Bhavesh Patel |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
29 |
* @library ../lib |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
26532
diff
changeset
|
30 |
* @modules jdk.javadoc |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
31 |
* @build JavadocTester |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
32 |
* @run main TestTypeAnnotations |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
33 |
*/ |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
34 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
35 |
public class TestTypeAnnotations extends JavadocTester { |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
36 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
37 |
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
|
38 |
TestTypeAnnotations tester = new TestTypeAnnotations(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
39 |
tester.runTests(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
40 |
} |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
41 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
42 |
@Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
43 |
void test() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
44 |
javadoc("-d", "out", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
45 |
"-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
46 |
"-private", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
47 |
"typeannos"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
48 |
checkExit(Exit.OK); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
49 |
|
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
50 |
// Test for type annotations on Class Extends (ClassExtends.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
51 |
checkOutput("typeannos/MyClass.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
52 |
"extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
53 |
+ "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedClass.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
54 |
+ "title=\"class in typeannos\">ParameterizedClass</a><<a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
55 |
+ "../typeannos/ClassExtB.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
56 |
+ "@ClassExtB</a> java.lang.String>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
57 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
58 |
"implements <a href=\"../typeannos/ClassExtB.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
59 |
+ "annotation in typeannos\">@ClassExtB</a> java.lang.CharSequence, " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
60 |
+ "<a href=\"../typeannos/ClassExtA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
61 |
+ "typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedInterface.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
62 |
+ "title=\"interface in typeannos\">ParameterizedInterface</a><" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
63 |
+ "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
64 |
+ "typeannos\">@ClassExtB</a> java.lang.String></pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
65 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
66 |
checkOutput("typeannos/MyInterface.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
67 |
"extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
68 |
+ "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
69 |
+ "ParameterizedInterface.html\" title=\"interface in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
70 |
+ "ParameterizedInterface</a><<a href=\"../typeannos/ClassExtA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
71 |
+ "title=\"annotation in typeannos\">@ClassExtA</a> java.lang.String>, " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
72 |
+ "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
73 |
+ "typeannos\">@ClassExtB</a> java.lang.CharSequence</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
74 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
75 |
// Test for type annotations on Class Parameters (ClassParameters.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
76 |
checkOutput("typeannos/ExtendsBound.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
77 |
"class <span class=\"typeNameLabel\">ExtendsBound<K extends <a " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
78 |
+ "href=\"../typeannos/ClassParamA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
79 |
+ "typeannos\">@ClassParamA</a> java.lang.String></span>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
80 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
81 |
checkOutput("typeannos/ExtendsGeneric.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
82 |
"<pre>class <span class=\"typeNameLabel\">ExtendsGeneric<K extends " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
83 |
+ "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
84 |
+ "typeannos\">@ClassParamA</a> <a href=\"../typeannos/Unannotated.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
85 |
+ "title=\"class in typeannos\">Unannotated</a><<a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
86 |
+ "../typeannos/ClassParamB.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
87 |
+ "@ClassParamB</a> java.lang.String>></span>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
88 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
89 |
checkOutput("typeannos/TwoBounds.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
90 |
"<pre>class <span class=\"typeNameLabel\">TwoBounds<K extends <a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
91 |
+ "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
92 |
+ "@ClassParamA</a> java.lang.String,V extends <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
93 |
+ "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
94 |
+ "</a> java.lang.String></span>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
95 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
96 |
checkOutput("typeannos/Complex1.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
97 |
"class <span class=\"typeNameLabel\">Complex1<K extends <a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
98 |
+ "typeannos/ClassParamA.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
99 |
+ "@ClassParamA</a> java.lang.String & java.lang.Runnable></span>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
100 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
101 |
checkOutput("typeannos/Complex2.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
102 |
"class <span class=\"typeNameLabel\">Complex2<K extends java.lang." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
103 |
+ "String & <a href=\"../typeannos/ClassParamB.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
104 |
+ "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable></span>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
105 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
106 |
checkOutput("typeannos/ComplexBoth.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
107 |
"class <span class=\"typeNameLabel\">ComplexBoth<K extends <a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
108 |
+ "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
109 |
+ ">@ClassParamA</a> java.lang.String & <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
110 |
+ "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
111 |
+ "</a> java.lang.Runnable></span>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
112 |
|
16969
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
113 |
// Test for type annotations on fields (Fields.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
114 |
checkOutput("typeannos/DefaultScope.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
115 |
"<pre><a href=\"../typeannos/Parameterized.html\" title=\"class in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
116 |
+ "typeannos\">Parameterized</a><<a href=\"../typeannos/FldA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
117 |
+ "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
118 |
+ "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
119 |
+ "@FldB</a> java.lang.String> bothTypeArgs</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
120 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
121 |
"<pre><a href=\"../typeannos/FldA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
122 |
+ "typeannos\">@FldA</a> java.lang.String <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
123 |
+ "FldB.html\" title=\"annotation in typeannos\">@FldB</a> [] " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
124 |
+ "array1Deep</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
125 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
126 |
"<pre>java.lang.String[] <a href=\"../typeannos/FldB.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
127 |
+ "title=\"annotation in typeannos\">@FldB</a> [] array2SecondOld</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
128 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
129 |
"<pre><a href=\"../typeannos/FldD.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
130 |
+ "typeannos\">@FldD</a> java.lang.String <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
131 |
+ "FldC.html\" title=\"annotation in typeannos\">@FldC</a> <a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
132 |
+ "../typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
133 |
+ "</a> [] <a href=\"../typeannos/FldC.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
134 |
+ "typeannos\">@FldC</a> <a href=\"../typeannos/FldB.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
135 |
+ "annotation in typeannos\">@FldB</a> [] array2Deep</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
136 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
137 |
checkOutput("typeannos/ModifiedScoped.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
138 |
"<pre>public final <a href=\"../typeannos/Parameterized.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
139 |
+ "title=\"class in typeannos\">Parameterized</a><<a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
140 |
+ "typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA</a> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
141 |
+ "<a href=\"../typeannos/Parameterized.html\" title=\"class in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
142 |
+ "typeannos\">Parameterized</a><<a href=\"../typeannos/FldA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
143 |
+ "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
144 |
+ "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
145 |
+ "@FldB</a> java.lang.String>,<a href=\"../typeannos/FldB.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
146 |
+ "title=\"annotation in typeannos\">@FldB</a> java.lang.String> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
147 |
+ "nestedParameterized</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
148 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
149 |
"<pre>public final <a href=\"../typeannos/FldA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
150 |
+ "title=\"annotation in typeannos\">@FldA</a> java.lang.String[][] " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
151 |
+ "array2</pre>"); |
16969
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
152 |
|
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
153 |
// Test for type annotations on method return types (MethodReturnType.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
154 |
checkOutput("typeannos/MtdDefaultScope.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
155 |
"<pre>public <T> <a href=\"../typeannos/MRtnA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
156 |
+ "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
157 |
+ " method()</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
158 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
159 |
"<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
160 |
+ "typeannos\">@MRtnA</a> java.lang.String <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
161 |
+ "MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> [] <a " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
162 |
+ "href=\"../typeannos/MRtnB.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
163 |
+ "@MRtnB</a> [] array2Deep()</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
164 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
165 |
"<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
166 |
+ "typeannos\">@MRtnA</a> java.lang.String[][] array2()</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
167 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
168 |
checkOutput("typeannos/MtdModifiedScoped.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
169 |
"<pre>public final <a href=\"../typeannos/MtdParameterized.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
170 |
+ "title=\"class in typeannos\">MtdParameterized</a><<a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
171 |
+ "typeannos/MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
172 |
+ "<a href=\"../typeannos/MtdParameterized.html\" title=\"class in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
173 |
+ "typeannos\">MtdParameterized</a><<a href=\"../typeannos/MRtnA." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
174 |
+ "html\" title=\"annotation in typeannos\">@MRtnA</a> java.lang." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
175 |
+ "String,<a href=\"../typeannos/MRtnB.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
176 |
+ "typeannos\">@MRtnB</a> java.lang.String>,<a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
177 |
+ "MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> java." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
178 |
+ "lang.String> nestedMtdParameterized()</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
179 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
180 |
// Test for type annotations on method type parameters (MethodTypeParameters.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
181 |
checkOutput("typeannos/UnscopedUnmodified.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
182 |
"<pre><K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
183 |
+ "annotation in typeannos\">@MTyParamA</a> java.lang.String>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
184 |
+ " void methodExtends()</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
185 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
186 |
"<pre><K extends <a href=\"../typeannos/MTyParamA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
187 |
+ "annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
188 |
+ "MtdTyParameterized.html\" title=\"class in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
189 |
+ "MtdTyParameterized</a><<a href=\"../typeannos/MTyParamB.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
190 |
+ "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
191 |
+ ">> void nestedExtends()</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
192 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
193 |
checkOutput("typeannos/PublicModifiedMethods.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
194 |
"<pre>public final <K extends <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
195 |
+ "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
196 |
+ "java.lang.String> void methodExtends()</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
197 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
198 |
"<pre>public final <K extends <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
199 |
+ "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
200 |
+ "java.lang.String,V extends <a href=\"../typeannos/MTyParamA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
201 |
+ "title=\"annotation in typeannos\">@MTyParamA</a> <a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
202 |
+ "typeannos/MtdTyParameterized.html\" title=\"class in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
203 |
+ "MtdTyParameterized</a><<a href=\"../typeannos/MTyParamB.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
204 |
+ "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
205 |
+ ">> void dual()</pre>"); |
16969
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
206 |
|
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
207 |
// Test for type annotations on parameters (Parameters.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
208 |
checkOutput("typeannos/Parameters.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
209 |
"<pre>void unannotated(<a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
210 |
+ "ParaParameterized.html\" title=\"class in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
211 |
+ "ParaParameterized</a><java.lang.String,java.lang.String>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
212 |
+ " a)</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
213 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
214 |
"<pre>void nestedParaParameterized(<a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
215 |
+ "ParaParameterized.html\" title=\"class in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
216 |
+ "ParaParameterized</a><<a href=\"../typeannos/ParamA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
217 |
+ "title=\"annotation in typeannos\">@ParamA</a> <a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
218 |
+ "typeannos/ParaParameterized.html\" title=\"class in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
219 |
+ "ParaParameterized</a><<a href=\"../typeannos/ParamA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
220 |
+ "title=\"annotation in typeannos\">@ParamA</a> java.lang.String," |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
221 |
+ "<a href=\"../typeannos/ParamB.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
222 |
+ "typeannos\">@ParamB</a> java.lang.String>,<a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
223 |
+ "typeannos/ParamB.html\" title=\"annotation in typeannos\">@ParamB" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
224 |
+ "</a> java.lang.String> a)</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
225 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
226 |
"<pre>void array2Deep(<a href=\"../typeannos/ParamA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
227 |
+ "title=\"annotation in typeannos\">@ParamA</a> java.lang.String " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
228 |
+ "<a href=\"../typeannos/ParamA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
229 |
+ "typeannos\">@ParamA</a> [] <a href=\"../typeannos/ParamB.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
230 |
+ "title=\"annotation in typeannos\">@ParamB</a> [] a)</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
231 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
232 |
// Test for type annotations on throws (Throws.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
233 |
checkOutput("typeannos/ThrDefaultUnmodified.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
234 |
"<pre>void oneException()\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
235 |
+ " throws <a href=\"../typeannos/ThrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
236 |
+ "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
237 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
238 |
"<pre>void twoExceptions()\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
239 |
+ " throws <a href=\"../typeannos/ThrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
240 |
+ "annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
241 |
+ " <a href=\"../typeannos/ThrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
242 |
+ "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
243 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
244 |
checkOutput("typeannos/ThrPublicModified.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
245 |
"<pre>public final void oneException(java.lang.String a)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
246 |
+ " throws <a href=\"../typeannos/ThrA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
247 |
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
248 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
249 |
"<pre>public final void twoExceptions(java.lang.String a)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
250 |
+ " throws <a href=\"../typeannos/ThrA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
251 |
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
252 |
+ " <a href=\"../typeannos/ThrA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
253 |
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
254 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
255 |
checkOutput("typeannos/ThrWithValue.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
256 |
"<pre>void oneException()\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
257 |
+ " throws <a href=\"../typeannos/ThrB.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
258 |
+ "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
259 |
+ "ThrB.html#value--\">value</a>=\"m\") java.lang.Exception</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
260 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
261 |
"<pre>void twoExceptions()\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
262 |
+ " throws <a href=\"../typeannos/ThrB.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
263 |
+ "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
264 |
+ "ThrB.html#value--\">value</a>=\"m\") java.lang.RuntimeException,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
265 |
+ " <a href=\"../typeannos/ThrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
266 |
+ "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
267 |
|
16969
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
268 |
// Test for type annotations on type parameters (TypeParameters.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
269 |
checkOutput("typeannos/TestMethods.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
270 |
"<pre><K,V extends <a href=\"../typeannos/TyParaA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
271 |
+ "annotation in typeannos\">@TyParaA</a> java.lang.String> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
272 |
+ "void secondAnnotated()</pre>"); |
16969
b58d8a70d921
8009686: Generated javadoc documentation should be able to display type annotation on an array
bpatel
parents:
16964
diff
changeset
|
273 |
|
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
274 |
// Test for type annotations on wildcard type (Wildcards.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
275 |
checkOutput("typeannos/BoundTest.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
276 |
"<pre>void wcExtends(<a href=\"../typeannos/MyList.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
277 |
+ "title=\"class in typeannos\">MyList</a><? extends <a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
278 |
+ "../typeannos/WldA.html\" title=\"annotation in typeannos\">@WldA" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
279 |
+ "</a> java.lang.String> l)</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
280 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
281 |
"<pre><a href=\"../typeannos/MyList.html\" title=\"class in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
282 |
+ "typeannos\">MyList</a><? super <a href=\"../typeannos/WldA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
283 |
+ "title=\"annotation in typeannos\">@WldA</a> java.lang.String>" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
284 |
+ " returnWcSuper()</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
285 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
286 |
checkOutput("typeannos/BoundWithValue.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
287 |
"<pre>void wcSuper(<a href=\"../typeannos/MyList.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
288 |
+ "class in typeannos\">MyList</a><? super <a href=\"../typeannos/" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
289 |
+ "WldB.html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
290 |
+ "../typeannos/WldB.html#value--\">value</a>=\"m\") java.lang." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
291 |
+ "String> l)</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
292 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
293 |
"<pre><a href=\"../typeannos/MyList.html\" title=\"class in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
294 |
+ "typeannos\">MyList</a><? extends <a href=\"../typeannos/WldB." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
295 |
+ "html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
296 |
+ "typeannos/WldB.html#value--\">value</a>=\"m\") java.lang.String" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
297 |
+ "> returnWcExtends()</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
298 |
|
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
299 |
// Test for receiver annotations (Receivers.java). |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
300 |
checkOutput("typeannos/DefaultUnmodified.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
301 |
"<pre>void withException(<a href=\"../typeannos/RcvrA.html\" " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
302 |
+ "title=\"annotation in typeannos\">@RcvrA</a> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
303 |
+ "DefaultUnmodified this)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
304 |
+ " throws java." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
305 |
+ "lang.Exception</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
306 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
307 |
"<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrA." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
308 |
+ "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
309 |
+ "typeannos/RcvrB.html\" title=\"annotation in typeannos\">@RcvrB" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
310 |
+ "</a>(<a href=\"../typeannos/RcvrB.html#value--\">value</a>=\"m\")" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
311 |
+ " DefaultUnmodified this)</pre>", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
312 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
313 |
"<pre><T extends java.lang.Runnable> void accept(" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
314 |
+ "<a href=\"../typeannos/RcvrA.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
315 |
+ "typeannos\">@RcvrA</a> DefaultUnmodified this,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
316 |
+ " T r)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
317 |
+ " throws java.lang.Exception</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
318 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
319 |
checkOutput("typeannos/PublicModified.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
320 |
"<pre>public final java.lang.String nonVoid(<a href=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
321 |
+ "../typeannos/RcvrA.html\" title=\"annotation in typeannos\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
322 |
+ "@RcvrA</a> PublicModified this)</pre>", |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
323 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
324 |
"<pre>public final <T extends java.lang.Runnable> " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
325 |
+ "void accept(<a href=\"../typeannos/RcvrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
326 |
+ "annotation in typeannos\">@RcvrA</a> PublicModified this,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
327 |
+ " T r)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
328 |
+ " throws java.lang.Exception</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
329 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
330 |
checkOutput("typeannos/WithValue.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
331 |
"<pre><T extends java.lang.Runnable> void accept(" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
332 |
+ "<a href=\"../typeannos/RcvrB.html\" title=\"annotation in " |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
333 |
+ "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value--\">" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
334 |
+ "value</a>=\"m\") WithValue this,\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
335 |
+ " T r)\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
336 |
+ " throws java.lang.Exception</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
337 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
338 |
checkOutput("typeannos/WithFinal.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
339 |
"<pre>java.lang.String nonVoid(<a href=\"../typeannos/RcvrB." |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
340 |
+ "html\" title=\"annotation in typeannos\">@RcvrB</a>(<a href=\"../" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
341 |
+ "typeannos/RcvrB.html#value--\">value</a>=\"m\") WithFinal" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
342 |
+ " this)</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
343 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
344 |
checkOutput("typeannos/WithBody.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
345 |
"<pre>void field(<a href=\"../typeannos/RcvrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
346 |
+ "annotation in typeannos\">@RcvrA</a> WithBody this)</pre>"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
347 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
348 |
checkOutput("typeannos/Generic2.html", true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
349 |
"<pre>void test2(<a href=\"../typeannos/RcvrA.html\" title=\"" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24072
diff
changeset
|
350 |
+ "annotation in typeannos\">@RcvrA</a> Generic2<X> this)</pre>"); |
16964
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
351 |
} |
096de5815398
8005091: javadoc should be able to return the receiver type
bpatel
parents:
diff
changeset
|
352 |
} |