equal
deleted
inserted
replaced
22 */ |
22 */ |
23 |
23 |
24 /* |
24 /* |
25 * @test |
25 * @test |
26 * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202 |
26 * @bug 8072945 8081854 8141492 8148985 8150188 4649116 8173707 8151743 8169819 8183037 8182765 8196202 |
27 * 8202624 8210047 8184205 8221871 8223733 |
27 * 8202624 8210047 8184205 8221871 8223733 8223378 |
28 * @summary Test the version of HTML generated by the javadoc tool. |
28 * @summary Test the version of HTML generated by the javadoc tool. |
29 * @author bpatel |
29 * @author bpatel |
30 * @library ../../lib |
30 * @library ../../lib |
31 * @modules jdk.javadoc/jdk.javadoc.internal.tool |
31 * @modules jdk.javadoc/jdk.javadoc.internal.tool |
32 * @build javadoc.tester.* |
32 * @build javadoc.tester.* |
76 + "<!-- -->\n" |
76 + "<!-- -->\n" |
77 + "</a>", |
77 + "</a>", |
78 "<div class=\"overviewSummary\">\n" |
78 "<div class=\"overviewSummary\">\n" |
79 + "<table>\n" |
79 + "<table>\n" |
80 + "<caption>", |
80 + "<caption>", |
81 "<header role=\"banner\">\n" |
81 "<header role=\"banner\" class=\"flexHeader\">\n" |
82 + "<nav role=\"navigation\">\n" |
82 + "<nav role=\"navigation\">\n" |
83 + "<div class=\"fixedNav\">\n" |
|
84 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
83 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
85 "<footer role=\"contentinfo\">\n" |
84 "<footer role=\"contentinfo\">\n" |
86 + "<nav role=\"navigation\">\n" |
85 + "<nav role=\"navigation\">\n" |
87 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->"); |
86 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->"); |
88 |
87 |
92 "<meta name=\"dc.created\"", |
91 "<meta name=\"dc.created\"", |
93 "<a id=\"navbar.top.firstrow\">\n" |
92 "<a id=\"navbar.top.firstrow\">\n" |
94 + "<!-- -->\n" |
93 + "<!-- -->\n" |
95 + "</a>", |
94 + "</a>", |
96 "<div class=\"typeSummary\">\n<table>", |
95 "<div class=\"typeSummary\">\n<table>", |
97 "<header role=\"banner\">\n" |
96 "<header role=\"banner\" class=\"flexHeader\">\n" |
98 + "<nav role=\"navigation\">\n" |
97 + "<nav role=\"navigation\">\n" |
99 + "<div class=\"fixedNav\">\n" |
|
100 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
98 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
101 "<main role=\"main\">\n" |
99 "<main role=\"main\">\n" |
102 + "<div class=\"header\">", |
100 + "<div class=\"header\">", |
103 "<section class=\"packageDescription\"><a id=\"package.description\">\n" |
101 "<section class=\"packageDescription\"><a id=\"package.description\">\n" |
104 + "<!-- -->\n" |
102 + "<!-- -->\n" |
122 "<meta name=\"dc.created\"", |
120 "<meta name=\"dc.created\"", |
123 "<a id=\"navbar.top.firstrow\">\n" |
121 "<a id=\"navbar.top.firstrow\">\n" |
124 + "<!-- -->\n" |
122 + "<!-- -->\n" |
125 + "</a>", |
123 + "</a>", |
126 "<li class=\"circle\">", |
124 "<li class=\"circle\">", |
127 "<header role=\"banner\">\n" |
125 "<header role=\"banner\" class=\"flexHeader\">\n" |
128 + "<nav role=\"navigation\">\n" |
126 + "<nav role=\"navigation\">\n" |
129 + "<div class=\"fixedNav\">\n" |
|
130 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
127 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
131 "<main role=\"main\">\n" |
128 "<main role=\"main\">\n" |
132 + "<div class=\"header\">", |
129 + "<div class=\"header\">", |
133 "<section class=\"hierarchy\">\n" |
130 "<section class=\"hierarchy\">\n" |
134 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>", |
131 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>", |
148 "<meta name=\"dc.created\"", |
145 "<meta name=\"dc.created\"", |
149 "<a id=\"navbar.top.firstrow\">\n" |
146 "<a id=\"navbar.top.firstrow\">\n" |
150 + "<!-- -->\n" |
147 + "<!-- -->\n" |
151 + "</a>", |
148 + "</a>", |
152 "<div class=\"useSummary\">\n<table>", |
149 "<div class=\"useSummary\">\n<table>", |
153 "<header role=\"banner\">\n" |
150 "<header role=\"banner\" class=\"flexHeader\">\n" |
154 + "<nav role=\"navigation\">\n" |
151 + "<nav role=\"navigation\">\n" |
155 + "<div class=\"fixedNav\">\n" |
|
156 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
152 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
157 "<main role=\"main\">\n" |
153 "<main role=\"main\">\n" |
158 + "<div class=\"header\">", |
154 + "<div class=\"header\">", |
159 "<footer role=\"contentinfo\">\n" |
155 "<footer role=\"contentinfo\">\n" |
160 + "<nav role=\"navigation\">\n" |
156 + "<nav role=\"navigation\">\n" |
166 "<meta name=\"dc.created\"", |
162 "<meta name=\"dc.created\"", |
167 "<a id=\"navbar.top.firstrow\">\n" |
163 "<a id=\"navbar.top.firstrow\">\n" |
168 + "<!-- -->\n" |
164 + "<!-- -->\n" |
169 + "</a>", |
165 + "</a>", |
170 "<div class=\"constantsSummary\">\n<table>", |
166 "<div class=\"constantsSummary\">\n<table>", |
171 "<header role=\"banner\">\n" |
167 "<header role=\"banner\" class=\"flexHeader\">\n" |
172 + "<nav role=\"navigation\">\n" |
168 + "<nav role=\"navigation\">\n" |
173 + "<div class=\"fixedNav\">\n" |
|
174 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
169 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
175 "<main role=\"main\">\n" |
170 "<main role=\"main\">\n" |
176 + "<div class=\"header\">", |
171 + "<div class=\"header\">", |
177 "<section class=\"packages\">\n" |
172 "<section class=\"packages\">\n" |
178 + "<h2 title=\"Contents\">Contents</h2>\n", |
173 + "<h2 title=\"Contents\">Contents</h2>\n", |
188 "<meta name=\"dc.created\"", |
183 "<meta name=\"dc.created\"", |
189 "<a id=\"navbar.top.firstrow\">\n" |
184 "<a id=\"navbar.top.firstrow\">\n" |
190 + "<!-- -->\n" |
185 + "<!-- -->\n" |
191 + "</a>", |
186 + "</a>", |
192 "<div class=\"deprecatedSummary\">\n<table>", |
187 "<div class=\"deprecatedSummary\">\n<table>", |
193 "<header role=\"banner\">\n" |
188 "<header role=\"banner\" class=\"flexHeader\">\n" |
194 + "<nav role=\"navigation\">\n" |
189 + "<nav role=\"navigation\">\n" |
195 + "<div class=\"fixedNav\">\n" |
|
196 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
190 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
197 "<main role=\"main\">\n" |
191 "<main role=\"main\">\n" |
198 + "<div class=\"header\">", |
192 + "<div class=\"header\">", |
199 "<footer role=\"contentinfo\">\n" |
193 "<footer role=\"contentinfo\">\n" |
200 + "<nav role=\"navigation\">\n" |
194 + "<nav role=\"navigation\">\n" |
205 "<!DOCTYPE HTML>", |
199 "<!DOCTYPE HTML>", |
206 "<meta name=\"dc.created\"", |
200 "<meta name=\"dc.created\"", |
207 "<a id=\"navbar.top.firstrow\">\n" |
201 "<a id=\"navbar.top.firstrow\">\n" |
208 + "<!-- -->\n" |
202 + "<!-- -->\n" |
209 + "</a>", |
203 + "</a>", |
210 "<header role=\"banner\">\n" |
204 "<header role=\"banner\" class=\"flexHeader\">\n" |
211 + "<nav role=\"navigation\">\n" |
205 + "<nav role=\"navigation\">\n" |
212 + "<div class=\"fixedNav\">\n" |
|
213 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
206 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
214 "<main role=\"main\">\n" |
207 "<main role=\"main\">\n" |
215 + "<div class=\"header\">", |
208 + "<div class=\"header\">", |
216 "<section class=\"serializedPackageContainer\">\n" |
209 "<section class=\"serializedPackageContainer\">\n" |
217 + "<h2 title=\"Package\">Package pkg</h2>\n", |
210 + "<h2 title=\"Package\">Package pkg</h2>\n", |
225 "<meta name=\"dc.created\"", |
218 "<meta name=\"dc.created\"", |
226 "<a id=\"navbar.top.firstrow\">\n" |
219 "<a id=\"navbar.top.firstrow\">\n" |
227 + "<!-- -->\n" |
220 + "<!-- -->\n" |
228 + "</a>", |
221 + "</a>", |
229 "<li class=\"circle\">", |
222 "<li class=\"circle\">", |
230 "<header role=\"banner\">\n" |
223 "<header role=\"banner\" class=\"flexHeader\">\n" |
231 + "<nav role=\"navigation\">\n" |
224 + "<nav role=\"navigation\">\n" |
232 + "<div class=\"fixedNav\">\n" |
|
233 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
225 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
234 "<main role=\"main\">\n" |
226 "<main role=\"main\">\n" |
235 + "<div class=\"header\">", |
227 + "<div class=\"header\">", |
236 "<section class=\"hierarchy\">\n" |
228 "<section class=\"hierarchy\">\n" |
237 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>\n", |
229 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>\n", |
250 "<!DOCTYPE HTML>", |
242 "<!DOCTYPE HTML>", |
251 "<meta name=\"dc.created\"", |
243 "<meta name=\"dc.created\"", |
252 "<a id=\"navbar.top.firstrow\">\n" |
244 "<a id=\"navbar.top.firstrow\">\n" |
253 + "<!-- -->\n" |
245 + "<!-- -->\n" |
254 + "</a>", |
246 + "</a>", |
255 "<header role=\"banner\">\n" |
247 "<header role=\"banner\" class=\"flexHeader\">\n" |
256 + "<nav role=\"navigation\">\n" |
248 + "<nav role=\"navigation\">\n" |
257 + "<div class=\"fixedNav\">\n" |
|
258 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
249 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
259 "</header>\n" |
250 "</header>\n" |
|
251 + "<div class=\"flexContent\">\n" |
260 + "<main role=\"main\">", |
252 + "<main role=\"main\">", |
261 "<footer role=\"contentinfo\">\n" |
253 "<footer role=\"contentinfo\">\n" |
262 + "<nav role=\"navigation\">\n" |
254 + "<nav role=\"navigation\">\n" |
263 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->"); |
255 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->"); |
264 |
256 |
273 "<!DOCTYPE HTML>", |
265 "<!DOCTYPE HTML>", |
274 "<meta name=\"dc.created\"", |
266 "<meta name=\"dc.created\"", |
275 "<a id=\"navbar.top.firstrow\">\n" |
267 "<a id=\"navbar.top.firstrow\">\n" |
276 + "<!-- -->\n" |
268 + "<!-- -->\n" |
277 + "</a>", |
269 + "</a>", |
278 "<header role=\"banner\">\n" |
270 "<header role=\"banner\" class=\"flexHeader\">\n" |
279 + "<nav role=\"navigation\">\n" |
271 + "<nav role=\"navigation\">\n" |
280 + "<div class=\"fixedNav\">\n" |
|
281 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
272 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
282 "<main role=\"main\">\n" |
273 "<main role=\"main\">\n" |
283 + "<div class=\"header\">", |
274 + "<div class=\"header\">", |
284 "<section class=\"helpSection\">\n" |
275 "<section class=\"helpSection\">\n" |
285 + "<h2>Overview</h2>\n", |
276 + "<h2>Overview</h2>\n", |
296 "<!DOCTYPE HTML>", |
287 "<!DOCTYPE HTML>", |
297 "<meta name=\"dc.created\"", |
288 "<meta name=\"dc.created\"", |
298 "<a id=\"navbar.top.firstrow\">\n" |
289 "<a id=\"navbar.top.firstrow\">\n" |
299 + "<!-- -->\n" |
290 + "<!-- -->\n" |
300 + "</a>", |
291 + "</a>", |
301 "<header role=\"banner\">\n" |
292 "<header role=\"banner\" class=\"flexHeader\">\n" |
302 + "<nav role=\"navigation\">\n" |
293 + "<nav role=\"navigation\">\n" |
303 + "<div class=\"fixedNav\">\n" |
294 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
304 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
295 "<main role=\"main\">\n" |
305 "<main role=\"main\">\n" |
296 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
306 + "<div class=\"header\">", |
297 + "<div class=\"header\">", |
307 "<section class=\"nestedClassSummary\"><a id=\"nested.class.summary\">\n" |
298 "<section class=\"nestedClassSummary\"><a id=\"nested.class.summary\">\n" |
308 + "<!-- -->\n" |
299 + "<!-- -->\n" |
309 + "</a>\n" |
300 + "</a>\n" |
310 + "<h2>Nested Class Summary</h2>\n" |
301 + "<h2>Nested Class Summary</h2>\n" |
347 "<!DOCTYPE HTML>", |
338 "<!DOCTYPE HTML>", |
348 "<meta name=\"dc.created\"", |
339 "<meta name=\"dc.created\"", |
349 "<a id=\"navbar.top.firstrow\">\n" |
340 "<a id=\"navbar.top.firstrow\">\n" |
350 + "<!-- -->\n" |
341 + "<!-- -->\n" |
351 + "</a>", |
342 + "</a>", |
352 "<header role=\"banner\">\n" |
343 "<header role=\"banner\" class=\"flexHeader\">\n" |
353 + "<nav role=\"navigation\">\n" |
344 + "<nav role=\"navigation\">\n" |
354 + "<div class=\"fixedNav\">\n" |
345 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
355 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
346 "<main role=\"main\">\n" |
356 "<main role=\"main\">\n" |
347 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
357 + "<div class=\"header\">", |
348 + "<div class=\"header\">", |
358 "<section class=\"constantsSummary\"><a id=\"enum.constant.summary\">\n" |
349 "<section class=\"constantsSummary\"><a id=\"enum.constant.summary\">\n" |
359 + "<!-- -->\n" |
350 + "<!-- -->\n" |
360 + "</a>\n" |
351 + "</a>\n" |
361 + "<h2>Enum Constant Summary</h2>\n" |
352 + "<h2>Enum Constant Summary</h2>\n" |
386 "<!DOCTYPE HTML>", |
377 "<!DOCTYPE HTML>", |
387 "<meta name=\"dc.created\"", |
378 "<meta name=\"dc.created\"", |
388 "<a id=\"navbar.top.firstrow\">\n" |
379 "<a id=\"navbar.top.firstrow\">\n" |
389 + "<!-- -->\n" |
380 + "<!-- -->\n" |
390 + "</a>", |
381 + "</a>", |
391 "<header role=\"banner\">\n" |
382 "<header role=\"banner\" class=\"flexHeader\">\n" |
392 + "<nav role=\"navigation\">\n" |
383 + "<nav role=\"navigation\">\n" |
393 + "<div class=\"fixedNav\">\n" |
384 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
394 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
385 "<main role=\"main\">\n" |
395 "<main role=\"main\">\n" |
386 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
396 + "<div class=\"header\">", |
387 + "<div class=\"header\">", |
397 "<section class=\"methodSummary\"><a id=\"method.summary\">\n" |
388 "<section class=\"methodSummary\"><a id=\"method.summary\">\n" |
398 + "<!-- -->\n" |
389 + "<!-- -->\n" |
399 + "</a>\n" |
390 + "</a>\n" |
400 + "<h2>Method Summary</h2>\n" |
391 + "<h2>Method Summary</h2>\n" |
414 "<!DOCTYPE HTML>", |
405 "<!DOCTYPE HTML>", |
415 "<meta name=\"dc.created\"", |
406 "<meta name=\"dc.created\"", |
416 "<a id=\"navbar.top.firstrow\">\n" |
407 "<a id=\"navbar.top.firstrow\">\n" |
417 + "<!-- -->\n" |
408 + "<!-- -->\n" |
418 + "</a>", |
409 + "</a>", |
419 "<header role=\"banner\">\n" |
410 "<header role=\"banner\" class=\"flexHeader\">\n" |
420 + "<nav role=\"navigation\">\n" |
411 + "<nav role=\"navigation\">\n" |
421 + "<div class=\"fixedNav\">\n" |
412 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
422 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
413 "<main role=\"main\">\n" |
423 "<main role=\"main\">\n" |
414 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
424 + "<div class=\"header\">", |
415 + "<div class=\"header\">", |
425 "<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n" |
416 "<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n" |
426 + "<!-- -->\n" |
417 + "<!-- -->\n" |
427 + "</a>\n" |
418 + "</a>\n" |
428 + "<h2>Constructor Summary</h2>", |
419 + "<h2>Constructor Summary</h2>", |
440 "<!DOCTYPE HTML>", |
431 "<!DOCTYPE HTML>", |
441 "<meta name=\"dc.created\"", |
432 "<meta name=\"dc.created\"", |
442 "<a id=\"navbar.top.firstrow\">\n" |
433 "<a id=\"navbar.top.firstrow\">\n" |
443 + "<!-- -->\n" |
434 + "<!-- -->\n" |
444 + "</a>", |
435 + "</a>", |
445 "<header role=\"banner\">\n" |
436 "<header role=\"banner\" class=\"flexHeader\">\n" |
446 + "<nav role=\"navigation\">\n" |
437 + "<nav role=\"navigation\">\n" |
447 + "<div class=\"fixedNav\">\n" |
438 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
448 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
439 "<main role=\"main\">\n" |
449 "<main role=\"main\">\n" |
440 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
450 + "<div class=\"header\">", |
441 + "<div class=\"header\">", |
451 "<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n" |
442 "<section class=\"constructorSummary\"><a id=\"constructor.summary\">\n" |
452 + "<!-- -->\n" |
443 + "<!-- -->\n" |
453 + "</a>\n" |
444 + "</a>\n" |
454 + "<h2>Constructor Summary</h2>", |
445 + "<h2>Constructor Summary</h2>", |
466 "<!DOCTYPE HTML>", |
457 "<!DOCTYPE HTML>", |
467 "<meta name=\"dc.created\"", |
458 "<meta name=\"dc.created\"", |
468 "<a id=\"navbar.top.firstrow\">\n" |
459 "<a id=\"navbar.top.firstrow\">\n" |
469 + "<!-- -->\n" |
460 + "<!-- -->\n" |
470 + "</a>", |
461 + "</a>", |
471 "<header role=\"banner\">\n" |
462 "<header role=\"banner\" class=\"flexHeader\">\n" |
472 + "<nav role=\"navigation\">\n" |
463 + "<nav role=\"navigation\">\n" |
473 + "<div class=\"fixedNav\">\n" |
464 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
474 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
465 "<main role=\"main\">\n" |
475 "<main role=\"main\">\n" |
466 + "<!-- ======== START OF CLASS DATA ======== -->\n" |
476 + "<div class=\"header\">", |
467 + "<div class=\"header\">", |
477 "<section class=\"memberSummary\"><a id=\"annotation.type.required.element.summary\">\n" |
468 "<section class=\"memberSummary\"><a id=\"annotation.type.required.element.summary\">\n" |
478 + "<!-- -->\n" |
469 + "<!-- -->\n" |
479 + "</a>\n" |
470 + "</a>\n" |
480 + "<h2>Required Element Summary</h2>\n" |
471 + "<h2>Required Element Summary</h2>\n" |
498 "<!DOCTYPE HTML>", |
489 "<!DOCTYPE HTML>", |
499 "<meta name=\"dc.created\"", |
490 "<meta name=\"dc.created\"", |
500 "<a id=\"navbar.top.firstrow\">\n" |
491 "<a id=\"navbar.top.firstrow\">\n" |
501 + "<!-- -->\n" |
492 + "<!-- -->\n" |
502 + "</a>", |
493 + "</a>", |
503 "<header role=\"banner\">\n" |
494 "<header role=\"banner\" class=\"flexHeader\">\n" |
504 + "<nav role=\"navigation\">\n" |
495 + "<nav role=\"navigation\">\n" |
505 + "<div class=\"fixedNav\">\n" |
|
506 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
496 + "<!-- ========= START OF TOP NAVBAR ======= -->", |
507 "<main role=\"main\">\n" |
497 "<main role=\"main\">\n" |
508 + "<div class=\"header\">", |
498 + "<div class=\"header\">", |
509 "<div class=\"useSummary\">\n<table>", |
499 "<div class=\"useSummary\">\n<table>", |
510 "<section class=\"detail\"><a id=\"pkg\">\n" |
500 "<section class=\"detail\"><a id=\"pkg\">\n" |
526 + "<!-- -->\n" |
516 + "<!-- -->\n" |
527 + "</a>", |
517 + "</a>", |
528 "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
518 "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
529 + "<caption>", |
519 + "<caption>", |
530 "</noscript>\n" |
520 "</noscript>\n" |
531 + "<div class=\"fixedNav\">\n" |
|
532 + "<!-- ========= START OF TOP NAVBAR ======= -->"); |
521 + "<!-- ========= START OF TOP NAVBAR ======= -->"); |
533 |
522 |
534 // Negated test for package-summary page |
523 // Negated test for package-summary page |
535 checkOutput("pkg/package-summary.html", false, |
524 checkOutput("pkg/package-summary.html", false, |
536 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
525 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
572 "<a name=\"navbar.top.firstrow\">\n" |
561 "<a name=\"navbar.top.firstrow\">\n" |
573 + "<!-- -->\n" |
562 + "<!-- -->\n" |
574 + "</a>", |
563 + "</a>", |
575 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
564 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
576 + "</div>\n" |
565 + "</div>\n" |
577 + "<div class=\"navPadding\"> </div>\n" |
|
578 + "<script type=\"text/javascript\"><!--\n" |
|
579 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
580 + "//-->\n" |
|
581 + "</script>\n" |
|
582 + "<div class=\"header\">", |
566 + "<div class=\"header\">", |
583 "<div class=\"constantsSummary\">\n" |
567 "<div class=\"constantsSummary\">\n" |
584 + "<table summary=\"Constant Field Values table, listing constant fields, and values\">"); |
568 + "<table summary=\"Constant Field Values table, listing constant fields, and values\">"); |
585 |
569 |
586 // Negated test for deprecated-list page |
570 // Negated test for deprecated-list page |
590 "<a name=\"navbar.top.firstrow\">\n" |
574 "<a name=\"navbar.top.firstrow\">\n" |
591 + "<!-- -->\n" |
575 + "<!-- -->\n" |
592 + "</a>", |
576 + "</a>", |
593 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
577 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
594 + "</div>\n" |
578 + "</div>\n" |
595 + "<div class=\"navPadding\"> </div>\n" |
|
596 + "<script type=\"text/javascript\"><!--\n" |
|
597 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
598 + "//-->\n" |
|
599 + "</script>\n" |
|
600 + "<div class=\"header\">\n" |
579 + "<div class=\"header\">\n" |
601 + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n" |
580 + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n" |
602 + "<h2 title=\"Contents\">Contents</h2>", |
581 + "<h2 title=\"Contents\">Contents</h2>", |
603 "<div class=\"deprecatedSummary\">\n<table summary=\"Classes table, listing classes, and an explanation\">", |
582 "<div class=\"deprecatedSummary\">\n<table summary=\"Classes table, listing classes, and an explanation\">", |
604 "<div class=\"deprecatedSummary\">\n<table summary=\"Enums table, listing enums, and an explanation\">", |
583 "<div class=\"deprecatedSummary\">\n<table summary=\"Enums table, listing enums, and an explanation\">", |
618 "<a name=\"navbar.top.firstrow\">\n" |
597 "<a name=\"navbar.top.firstrow\">\n" |
619 + "<!-- -->\n" |
598 + "<!-- -->\n" |
620 + "</a>", |
599 + "</a>", |
621 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
600 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
622 + "</div>\n" |
601 + "</div>\n" |
623 + "<div class=\"navPadding\"> </div>\n" |
|
624 + "<script type=\"text/javascript\"><!--\n" |
|
625 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
626 + "//-->\n" |
|
627 + "</script>\n" |
|
628 + "<div class=\"header\">", |
602 + "<div class=\"header\">", |
629 "<li class=\"blockList\">\n" |
603 "<li class=\"blockList\">\n" |
630 + "<h2 title=\"Package\">Package pkg</h2>"); |
604 + "<h2 title=\"Package\">Package pkg</h2>"); |
631 |
605 |
632 // Negated test for overview-tree page |
606 // Negated test for overview-tree page |
636 "<a name=\"navbar.top.firstrow\">\n" |
610 "<a name=\"navbar.top.firstrow\">\n" |
637 + "<!-- -->\n" |
611 + "<!-- -->\n" |
638 + "</a>", |
612 + "</a>", |
639 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
613 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
640 + "</div>\n" |
614 + "</div>\n" |
641 + "<div class=\"navPadding\"> </div>\n" |
|
642 + "<script type=\"text/javascript\"><!--\n" |
|
643 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
644 + "//-->\n" |
|
645 + "</script>\n" |
|
646 + "<div class=\"header\">", |
615 + "<div class=\"header\">", |
647 "<div class=\"contentContainer\">\n" |
616 "<div class=\"contentContainer\">\n" |
648 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>", |
617 + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>", |
649 "</ul>\n" |
618 "</ul>\n" |
650 + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>", |
619 + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>", |
658 "<a name=\"navbar.top.firstrow\">\n" |
627 "<a name=\"navbar.top.firstrow\">\n" |
659 + "<!-- -->\n" |
628 + "<!-- -->\n" |
660 + "</a>", |
629 + "</a>", |
661 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
630 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
662 + "</div>\n" |
631 + "</div>\n" |
663 + "<div class=\"navPadding\"> </div>\n" |
|
664 + "<script type=\"text/javascript\"><!--\n" |
|
665 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
666 + "//-->\n" |
|
667 + "</script>\n" |
|
668 + "<div class=\"contentContainer\">"); |
632 + "<div class=\"contentContainer\">"); |
669 |
633 |
670 // Negated test for src-html page |
634 // Negated test for src-html page |
671 checkOutput("src-html/pkg/AnotherClass.html", false, |
635 checkOutput("src-html/pkg/AnotherClass.html", false, |
672 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
636 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
680 "<a name=\"navbar.top.firstrow\">\n" |
644 "<a name=\"navbar.top.firstrow\">\n" |
681 + "<!-- -->\n" |
645 + "<!-- -->\n" |
682 + "</a>", |
646 + "</a>", |
683 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
647 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
684 + "</div>\n" |
648 + "</div>\n" |
685 + "<div class=\"navPadding\"> </div>\n" |
|
686 + "<script type=\"text/javascript\"><!--\n" |
|
687 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
688 + "//-->\n" |
|
689 + "</script>\n" |
|
690 + "<div class=\"header\">", |
649 + "<div class=\"header\">", |
691 "<ul class=\"blockList\">\n" |
650 "<ul class=\"blockList\">\n" |
692 + "<li class=\"blockList\">\n" |
651 + "<li class=\"blockList\">\n" |
693 + "<h2>Overview</h2>", |
652 + "<h2>Overview</h2>", |
694 "<li class=\"blockList\">\n" |
653 "<li class=\"blockList\">\n" |
701 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
660 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
702 "<meta name=\"date\"", |
661 "<meta name=\"date\"", |
703 "<a name=\"navbar.top.firstrow\">\n" |
662 "<a name=\"navbar.top.firstrow\">\n" |
704 + "<!-- -->\n" |
663 + "<!-- -->\n" |
705 + "</a>", |
664 + "</a>", |
706 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
707 + "<div class=\"header\">", |
|
708 "<!-- ======== NESTED CLASS SUMMARY ======== -->\n" |
665 "<!-- ======== NESTED CLASS SUMMARY ======== -->\n" |
709 + "<ul class=\"blockList\">\n" |
666 + "<ul class=\"blockList\">\n" |
710 + "<li class=\"blockList\"><a name=\"nested.class.summary\">\n" |
667 + "<li class=\"blockList\"><a name=\"nested.class.summary\">\n" |
711 + "<!-- -->\n" |
668 + "<!-- -->\n" |
712 + "</a>\n" |
669 + "</a>\n" |
761 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
718 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
762 "<meta name=\"date\"", |
719 "<meta name=\"date\"", |
763 "<a name=\"navbar.top.firstrow\">\n" |
720 "<a name=\"navbar.top.firstrow\">\n" |
764 + "<!-- -->\n" |
721 + "<!-- -->\n" |
765 + "</a>", |
722 + "</a>", |
766 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
767 + "<div class=\"header\">", |
|
768 "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n" |
723 "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n" |
769 + "<ul class=\"blockList\">\n" |
724 + "<ul class=\"blockList\">\n" |
770 + "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n" |
725 + "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n" |
771 + "<!-- -->\n" |
726 + "<!-- -->\n" |
772 + "</a>\n" |
727 + "</a>\n" |
799 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
754 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
800 "<meta name=\"date\"", |
755 "<meta name=\"date\"", |
801 "<a name=\"navbar.top.firstrow\">\n" |
756 "<a name=\"navbar.top.firstrow\">\n" |
802 + "<!-- -->\n" |
757 + "<!-- -->\n" |
803 + "</a>", |
758 + "</a>", |
804 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
805 + "<div class=\"header\">", |
|
806 "<!-- ========== METHOD SUMMARY =========== -->\n" |
759 "<!-- ========== METHOD SUMMARY =========== -->\n" |
807 + "<ul class=\"blockList\">\n" |
760 + "<ul class=\"blockList\">\n" |
808 + "<li class=\"blockList\"><a name=\"method.summary\">\n" |
761 + "<li class=\"blockList\"><a name=\"method.summary\">\n" |
809 + "<!-- -->\n" |
762 + "<!-- -->\n" |
810 + "</a>\n" |
763 + "</a>\n" |
823 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
776 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
824 "<meta name=\"date\"", |
777 "<meta name=\"date\"", |
825 "<a name=\"navbar.top.firstrow\">\n" |
778 "<a name=\"navbar.top.firstrow\">\n" |
826 + "<!-- -->\n" |
779 + "<!-- -->\n" |
827 + "</a>", |
780 + "</a>", |
828 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
829 + "<div class=\"header\">", |
|
830 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" |
781 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" |
831 + "<ul class=\"blockList\">\n" |
782 + "<ul class=\"blockList\">\n" |
832 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n" |
783 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n" |
833 + "<!-- -->\n" |
784 + "<!-- -->\n" |
834 + "</a>\n" |
785 + "</a>\n" |
845 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
796 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
846 "<meta name=\"date\"", |
797 "<meta name=\"date\"", |
847 "<a name=\"navbar.top.firstrow\">\n" |
798 "<a name=\"navbar.top.firstrow\">\n" |
848 + "<!-- -->\n" |
799 + "<!-- -->\n" |
849 + "</a>", |
800 + "</a>", |
850 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
851 + "<div class=\"header\">", |
|
852 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" |
801 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n" |
853 + "<ul class=\"blockList\">\n" |
802 + "<ul class=\"blockList\">\n" |
854 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n" |
803 + "<li class=\"blockList\"><a name=\"constructor.summary\">\n" |
855 + "<!-- -->\n" |
804 + "<!-- -->\n" |
856 + "</a>\n" |
805 + "</a>\n" |
867 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
816 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">", |
868 "<meta name=\"date\"", |
817 "<meta name=\"date\"", |
869 "<a name=\"navbar.top.firstrow\">\n" |
818 "<a name=\"navbar.top.firstrow\">\n" |
870 + "<!-- -->\n" |
819 + "<!-- -->\n" |
871 + "</a>", |
820 + "</a>", |
872 "<!-- ======== START OF CLASS DATA ======== -->\n" |
|
873 + "<div class=\"header\">", |
|
874 "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n" |
821 "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n" |
875 + "<ul class=\"blockList\">\n" |
822 + "<ul class=\"blockList\">\n" |
876 + "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n" |
823 + "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n" |
877 + "<!-- -->\n" |
824 + "<!-- -->\n" |
878 + "</a>\n" |
825 + "</a>\n" |
901 "<a name=\"navbar.top.firstrow\">\n" |
848 "<a name=\"navbar.top.firstrow\">\n" |
902 + "<!-- -->\n" |
849 + "<!-- -->\n" |
903 + "</a>", |
850 + "</a>", |
904 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
851 "<!-- ========= END OF TOP NAVBAR ========= -->\n" |
905 + "</div>\n" |
852 + "</div>\n" |
906 + "<div class=\"navPadding\"> </div>\n" |
|
907 + "<script type=\"text/javascript\"><!--\n" |
|
908 + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n" |
|
909 + "//-->\n" |
|
910 + "</script>\n" |
|
911 + "<div class=\"header\">", |
853 + "<div class=\"header\">", |
912 "<div class=\"useSummary\">\n" |
854 "<div class=\"useSummary\">\n" |
913 + "<table summary=\"Use table, listing packages, and an explanation\">", |
855 + "<table summary=\"Use table, listing packages, and an explanation\">", |
914 "<li class=\"blockList\"><a name=\"pkg\">\n" |
856 "<li class=\"blockList\"><a name=\"pkg\">\n" |
915 + "<!-- -->\n" |
857 + "<!-- -->\n" |