51 |
51 |
52 // Test for normal run of javadoc in which various ClassDocs and |
52 // Test for normal run of javadoc in which various ClassDocs and |
53 // serialized form should have properly nested definition list tags |
53 // serialized form should have properly nested definition list tags |
54 // enclosing comments, tags and deprecated information. |
54 // enclosing comments, tags and deprecated information. |
55 private static final String[][] TEST_CMNT_DEPR = { |
55 private static final String[][] TEST_CMNT_DEPR = { |
56 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + |
56 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + |
57 "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
57 "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
58 "<dd>JDK1.0</dd></dl>"}, |
58 "<dd>JDK1.0</dd>" + NL + "</dl>"}, |
59 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + |
59 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
60 "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + |
60 "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:</span></dt>" + NL + |
61 "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" + |
61 "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" + |
62 "C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + |
62 "C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + |
63 "Serialized Form</a></dd></dl>"}, |
63 "Serialized Form</a></dd>" + NL + "</dl>"}, |
64 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + |
64 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
65 "<dd>1.4</dd>" + NL + |
65 "<dd>1.4</dd>" + NL + |
66 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + |
66 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + |
67 "<a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
67 "<a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
68 "<code>setUndecorated(boolean)</code></a></dd></dl>"}, |
68 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
69 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + |
69 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>title" + |
70 "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + |
70 "</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" + |
71 "</dd>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + |
71 "</dd>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + |
72 "<dd><code>java.lang.IllegalArgumentException</code> - if the " + |
72 "<dd><code>java.lang.IllegalArgumentException</code> - if the " + |
73 "<code>owner</code>'s" + NL + |
73 "<code>owner</code>'s" + NL + |
74 " <code>GraphicsConfiguration</code> is not from a screen " + |
74 " <code>GraphicsConfiguration</code> is not from a screen " + |
75 "device</dd>" + NL + "<dd><code>HeadlessException</code></dd></dl>"}, |
75 "device</dd>" + NL + "<dd><code>HeadlessException</code></dd>" + NL + "</dl>"}, |
76 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + |
76 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" + |
77 "</code> - <code>true</code> if no decorations are" + NL + |
77 "</code> - <code>true</code> if no decorations are" + NL + |
78 " to be enabled;" + NL + " <code>false</code> " + |
78 " to be enabled;" + NL + " <code>false</code> " + |
79 "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + |
79 "if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"strong\">Since:" + |
80 "</span></dt>" + NL + "<dd>1.4</dd>" + NL + |
80 "</span></dt>" + NL + "<dd>1.4</dd>" + NL + |
81 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + |
81 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd>" + |
82 "<a href=\"../pkg1/C1.html#readObject()\"><code>readObject()" + |
82 "<a href=\"../pkg1/C1.html#readObject()\"><code>readObject()" + |
83 "</code></a></dd></dl>"}, |
83 "</code></a></dd>" + NL + "</dl>"}, |
84 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Throws:</span></dt>" + NL + |
84 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span></dt>" + NL + |
85 "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + |
85 "<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:" + |
86 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
86 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
87 "<code>setUndecorated(boolean)</code></a></dd></dl>"}, |
87 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
88 {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl><dt><span class=\"strong\">Parameters:" + |
88 {BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + |
89 "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + |
89 "</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"strong\">" + |
90 "Since:</span></dt>" + NL + "<dd>1.4</dd></dl>"}, |
90 "Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "</dl>"}, |
91 {BUG_ID + FS + "serialized-form.html", "<dl><dt><span class=\"strong\">Throws:</span>" + |
91 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + |
92 "</dt>" + NL + "<dd><code>" + |
92 "</dt>" + NL + "<dd><code>" + |
93 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
93 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
94 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
94 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
95 "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, |
95 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
96 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
96 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
97 " <i>As of JDK version 1.5, replaced by" + NL + |
97 " <i>As of JDK version 1.5, replaced by" + NL + |
98 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
98 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
99 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
99 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
100 "<div class=\"block\">This field indicates whether the C1 is " + |
100 "<div class=\"block\">This field indicates whether the C1 is " + |
101 "undecorated.</div>" + NL + " " + NL + "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + |
101 "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
102 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
102 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
103 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
103 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
104 "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, |
104 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
105 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
105 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
106 " <i>As of JDK version 1.5, replaced by" + NL + |
106 " <i>As of JDK version 1.5, replaced by" + NL + |
107 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
107 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
108 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
108 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
109 "<div class=\"block\">Reads the object stream.</div>" + NL + |
109 "<div class=\"block\">Reads the object stream.</div>" + NL + |
110 "<dl><dt><span class=\"strong\">Throws:" + |
110 "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + |
111 "</span></dt>" + NL + "<dd><code><code>" + |
111 "</span></dt>" + NL + "<dd><code><code>" + |
112 "IOException</code></code></dd>" + NL + |
112 "IOException</code></code></dd>" + NL + |
113 "<dd><code>java.io.IOException</code></dd></dl>"}, |
113 "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, |
114 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
114 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
115 " </div>" + NL + |
115 " </div>" + NL + |
116 "<div class=\"block\">The name for this class.</div>"}}; |
116 "<div class=\"block\">The name for this class.</div>"}}; |
117 |
117 |
118 // Test with -nodeprecated option. The ClassDocs should have properly nested |
118 // Test with -nodeprecated option. The ClassDocs should have properly nested |
119 // definition list tags enclosing comments and tags. The ClassDocs should not |
119 // definition list tags enclosing comments and tags. The ClassDocs should not |
120 // display definition list for deprecated information. The serialized form |
120 // display definition list for deprecated information. The serialized form |
121 // should display properly nested definition list tags for comments, tags |
121 // should display properly nested definition list tags for comments, tags |
122 // and deprecated information. |
122 // and deprecated information. |
123 private static final String[][] TEST_NODEPR = { |
123 private static final String[][] TEST_NODEPR = { |
124 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + |
124 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + |
125 "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
125 "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
126 "<dd>JDK1.0</dd></dl>"}, |
126 "<dd>JDK1.0</dd>" + NL + "</dl>"}, |
127 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Since:</span>" + |
127 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Since:</span>" + |
128 "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:" + |
128 "</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"strong\">See Also:" + |
129 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" + |
129 "</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" + |
130 "<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + |
130 "<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" + |
131 "Serialized Form</a></dd></dl>"}, |
131 "Serialized Form</a></dd>" + NL + "</dl>"}, |
132 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:" + |
132 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + |
133 "</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" + |
133 "</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" + |
134 "test</code> - boolean value</dd>" + NL + "<dt><span class=\"strong\">Throws:" + |
134 "test</code> - boolean value</dd>" + NL + "<dt><span class=\"strong\">Throws:" + |
135 "</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" + |
135 "</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" + |
136 "</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" + |
136 "</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" + |
137 "</code> is not from a screen device</dd>" + NL + "<dd><code>" + |
137 "</code> is not from a screen device</dd>" + NL + "<dd><code>" + |
138 "HeadlessException</code></dd></dl>"}, |
138 "HeadlessException</code></dd>" + NL + "</dl>"}, |
139 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Parameters:" + |
139 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Parameters:" + |
140 "</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" + |
140 "</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" + |
141 " if no decorations are" + NL + " to be enabled;" + NL + |
141 " if no decorations are" + NL + " to be enabled;" + NL + |
142 " <code>false</code> if decorations are to be enabled." + |
142 " <code>false</code> if decorations are to be enabled." + |
143 "</dd>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + |
143 "</dd>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + |
144 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject()\">" + |
144 "<dt><span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject()\">" + |
145 "<code>readObject()</code></a></dd></dl>"}, |
145 "<code>readObject()</code></a></dd>" + NL + "</dl>"}, |
146 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl><dt><span class=\"strong\">Throws:</span>" + |
146 {BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + |
147 "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + |
147 "</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" + |
148 "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
148 "<span class=\"strong\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated(boolean)\">" + |
149 "<code>setUndecorated(boolean)</code></a></dd></dl>"}, |
149 "<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
150 {BUG_ID + FS + "serialized-form.html", "<dl><dt><span class=\"strong\">Throws:</span>" + |
150 {BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"strong\">Throws:</span>" + |
151 "</dt>" + NL + "<dd><code>" + |
151 "</dt>" + NL + "<dd><code>" + |
152 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
152 "java.io.IOException</code></dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
153 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
153 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
154 "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, |
154 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
155 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
155 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
156 " <i>As of JDK version 1.5, replaced by" + NL + |
156 " <i>As of JDK version 1.5, replaced by" + NL + |
157 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
157 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
158 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
158 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
159 "<div class=\"block\">This field indicates whether the C1 is " + |
159 "<div class=\"block\">This field indicates whether the C1 is " + |
160 "undecorated.</div>" + NL + " " + NL + "<dl><dt><span class=\"strong\">Since:</span></dt>" + NL + |
160 "undecorated.</div>" + NL + " " + NL + "<dl>" + NL + "<dt><span class=\"strong\">Since:</span></dt>" + NL + |
161 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
161 "<dd>1.4</dd>" + NL + "<dt><span class=\"strong\">See Also:</span>" + |
162 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
162 "</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
163 "<code>C1.setUndecorated(boolean)</code></a></dd></dl>"}, |
163 "<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"}, |
164 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
164 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
165 " <i>As of JDK version 1.5, replaced by" + NL + |
165 " <i>As of JDK version 1.5, replaced by" + NL + |
166 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
166 " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">" + |
167 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
167 "<code>setUndecorated(boolean)</code></a>.</i></div>" + NL + |
168 "<div class=\"block\">Reads the object stream.</div>" + NL + |
168 "<div class=\"block\">Reads the object stream.</div>" + NL + |
169 "<dl><dt><span class=\"strong\">Throws:" + |
169 "<dl>" + NL + "<dt><span class=\"strong\">Throws:" + |
170 "</span></dt>" + NL + "<dd><code><code>" + |
170 "</span></dt>" + NL + "<dd><code><code>" + |
171 "IOException</code></code></dd>" + NL + |
171 "IOException</code></code></dd>" + NL + |
172 "<dd><code>java.io.IOException</code></dd></dl>"}, |
172 "<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"}, |
173 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
173 {BUG_ID + FS + "serialized-form.html", "<span class=\"strong\">Deprecated.</span>" + |
174 " </div>" + NL + "<div class=\"block\">" + |
174 " </div>" + NL + "<div class=\"block\">" + |
175 "The name for this class.</div>"}}; |
175 "The name for this class.</div>"}}; |
176 |
176 |
177 // Test with -nocomment and -nodeprecated options. The ClassDocs whould |
177 // Test with -nocomment and -nodeprecated options. The ClassDocs whould |