author | hannesw |
Wed, 27 Nov 2019 13:08:16 +0100 | |
changeset 59294 | 48b88b9c11eb |
parent 54821 | 85ccac8a8c13 |
permissions | -rw-r--r-- |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
1 |
/* |
53562 | 2 |
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
4 |
* |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
8 |
* |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
13 |
* accompanied this code). |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
14 |
* |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
18 |
* |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
21 |
* questions. |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
22 |
*/ |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
23 |
|
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
24 |
/* |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
25 |
* @test |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
26 |
* @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 |
47861
4fab795915b6
8191464: jdk/javadoc/doclet/testModules/TestModules.java 2 of 333 subtests failed
jjg
parents:
47847
diff
changeset
|
27 |
* 8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218 |
4fab795915b6
8191464: jdk/javadoc/doclet/testModules/TestModules.java 2 of 333 subtests failed
jjg
parents:
47847
diff
changeset
|
28 |
* 8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464 |
51895
707e4291f685
8202628: javadoc generates bad links in TestModules.java
pmuthuswamy
parents:
51862
diff
changeset
|
29 |
8164407 8192007 8182765 8196200 8196201 8196202 8196202 8205593 8202462 |
59294
48b88b9c11eb
8223378: CSS solution for navbar problem with <a> elements is not ideal
hannesw
parents:
54821
diff
changeset
|
30 |
8184205 8219060 8223378 |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
31 |
* @summary Test modules support in javadoc. |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
32 |
* @author bpatel |
53097 | 33 |
* @library ../../lib |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
34 |
* @modules jdk.javadoc/jdk.javadoc.internal.tool |
53097 | 35 |
* @build javadoc.tester.* |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
36 |
* @run main TestModules |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
37 |
*/ |
53097 | 38 |
import javadoc.tester.JavadocTester; |
39 |
||
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
40 |
public class TestModules extends JavadocTester { |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
41 |
|
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
42 |
public static void main(String... args) throws Exception { |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
43 |
TestModules tester = new TestModules(); |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
44 |
tester.runTests(); |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
45 |
} |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
46 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
47 |
/** |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
48 |
* Test generated module pages for HTML 5. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
49 |
*/ |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
50 |
@Test |
53097 | 51 |
public void testHtml5() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
52 |
javadoc("-d", "out-html5", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
53 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
54 |
"-Xdoclint:none", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
55 |
"-overview", testSrc("overview.html"), |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
40229
diff
changeset
|
56 |
"--module-source-path", testSrc, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
57 |
"--module", "moduleA,moduleB", |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
58 |
"testpkgmdlA", "testpkgmdlB"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
59 |
checkExit(Exit.OK); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
60 |
checkHtml5Description(true); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
61 |
checkHtml5NoDescription(false); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
62 |
checkHtml5OverviewSummaryModules(); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
63 |
checkModuleLink(); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
64 |
checkModuleFilesAndLinks(true); |
40511 | 65 |
checkModulesInSearch(true); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
66 |
checkAllPkgsAllClasses(true); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
67 |
} |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
68 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
69 |
/** |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
70 |
* Test generated module pages for HTML 5 with -nocomment option. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
71 |
*/ |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
72 |
@Test |
53097 | 73 |
public void testHtml5NoComment() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
74 |
javadoc("-d", "out-html5-nocomment", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
75 |
"-nocomment", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
76 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
77 |
"-Xdoclint:none", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
78 |
"-overview", testSrc("overview.html"), |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
40229
diff
changeset
|
79 |
"--module-source-path", testSrc, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
80 |
"--module", "moduleA,moduleB", |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
81 |
"testpkgmdlA", "testpkgmdlB"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
82 |
checkExit(Exit.OK); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
83 |
checkHtml5Description(false); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
84 |
checkHtml5NoDescription(true); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
85 |
checkModuleLink(); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
86 |
checkModuleFilesAndLinks(true); |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
87 |
} |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
88 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
89 |
/** |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
90 |
* Test generated pages, in an unnamed module, for HTML 5. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
91 |
*/ |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
92 |
@Test |
53097 | 93 |
public void testHtml5UnnamedModule() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
94 |
javadoc("-d", "out-html5-nomodule", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
95 |
"-use", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
96 |
"-overview", testSrc("overview.html"), |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
97 |
"-sourcepath", testSrc, |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
98 |
"testpkgnomodule", "testpkgnomodule1"); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
99 |
checkExit(Exit.OK); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
100 |
checkHtml5OverviewSummaryPackages(); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
101 |
checkModuleFilesAndLinks(false); |
40511 | 102 |
checkModulesInSearch(false); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
103 |
} |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
104 |
|
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
105 |
/** |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
106 |
* Test generated module pages with javadoc tags. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
107 |
*/ |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
108 |
@Test |
53097 | 109 |
public void testJDTagsInModules() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
110 |
javadoc("-d", "out-mdltags", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
111 |
"-author", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
112 |
"-version", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
113 |
"-Xdoclint:none", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
114 |
"-tag", "regular:a:Regular Tag:", |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
115 |
"-tag", "moduletag:s:Module Tag:", |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
40229
diff
changeset
|
116 |
"--module-source-path", testSrc, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
117 |
"--module", "moduletags,moduleB", |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
118 |
"testpkgmdltags", "testpkgmdlB"); |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
119 |
checkExit(Exit.OK); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
120 |
checkModuleTags(); |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
121 |
} |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
122 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
123 |
/** |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
124 |
* Test generated module summary page. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
125 |
*/ |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
126 |
@Test |
53097 | 127 |
public void testModuleSummary() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
128 |
javadoc("-d", "out-moduleSummary", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
129 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
130 |
"-Xdoclint:none", |
40599
be40838eb215
8164887: update tests to remove use of old-style options
jjg
parents:
40511
diff
changeset
|
131 |
"--module-source-path", testSrc, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
132 |
"--module", "moduleA,moduleB", |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
133 |
"testpkgmdlA", "testpkgmdlB", "moduleB/testpkg2mdlB"); |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
134 |
checkExit(Exit.OK); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
135 |
checkModuleSummary(); |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
136 |
checkNegatedModuleSummary(); |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
137 |
} |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
138 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
139 |
/** |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
140 |
* Test generated module summary page of an aggregating module. |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
141 |
*/ |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
142 |
@Test |
53097 | 143 |
public void testAggregatorModuleSummary() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
144 |
javadoc("-d", "out-aggregatorModuleSummary", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
145 |
"-use", |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
146 |
"--module-source-path", testSrc, |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
147 |
"--expand-requires", "transitive", |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
148 |
"--module", "moduleT"); |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
149 |
checkExit(Exit.OK); |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
150 |
checkAggregatorModuleSummary(); |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
151 |
} |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
152 |
|
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
153 |
/** |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
154 |
* Test generated module pages and pages with link to modules. |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
155 |
*/ |
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
156 |
@Test |
53097 | 157 |
public void testModuleFilesAndLinks() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
158 |
javadoc("-d", "out-modulelinks", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
159 |
"-Xdoclint:none", |
40599
be40838eb215
8164887: update tests to remove use of old-style options
jjg
parents:
40511
diff
changeset
|
160 |
"--module-source-path", testSrc, |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
161 |
"--module", "moduleA,moduleB", |
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
162 |
"testpkgmdlA", "testpkgmdlB"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
163 |
checkExit(Exit.OK); |
40508
74ef30d16fb9
8159305: Enhance the javadoc tool to support module related options
ksrini
parents:
40503
diff
changeset
|
164 |
checkModuleFilesAndLinks(true); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
165 |
} |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
166 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
167 |
/** |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
168 |
* Test generated module pages for a deprecated module. |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
169 |
*/ |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
170 |
@Test |
53097 | 171 |
public void testModuleDeprecation() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
172 |
javadoc("-d", "out-moduledepr", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
173 |
"-Xdoclint:none", |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
174 |
"-tag", "regular:a:Regular Tag:", |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
175 |
"-tag", "moduletag:s:Module Tag:", |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
176 |
"--module-source-path", testSrc, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
177 |
"--module", "moduleA,moduleB,moduletags", |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
178 |
"testpkgmdlA", "testpkgmdlB", "testpkgmdltags"); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
179 |
checkExit(Exit.OK); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
180 |
checkModuleDeprecation(true); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
181 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
182 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
183 |
/** |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
184 |
* Test annotations on modules. |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
185 |
*/ |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
186 |
@Test |
53097 | 187 |
public void testModuleAnnotation() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
188 |
javadoc("-d", "out-moduleanno", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
189 |
"-Xdoclint:none", |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
190 |
"--module-source-path", testSrc, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
191 |
"--module", "moduleA,moduleB", |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
192 |
"testpkgmdlA", "testpkgmdlB"); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
193 |
checkExit(Exit.OK); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
194 |
checkModuleAnnotation(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
195 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
196 |
|
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
197 |
/** |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
198 |
* Test module summary pages in "api" mode. |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
199 |
*/ |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
200 |
@Test |
53097 | 201 |
public void testApiMode() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
202 |
javadoc("-d", "out-api", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
203 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
204 |
"--show-module-contents=api", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
205 |
"-author", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
206 |
"-version", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
207 |
"-Xdoclint:none", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
208 |
"-tag", "regular:a:Regular Tag:", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
209 |
"-tag", "moduletag:s:Module Tag:", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
210 |
"--module-source-path", testSrc, |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
211 |
"--module", "moduleA,moduleB,moduleC,moduletags", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
212 |
"testpkgmdlA", "moduleA/concealedpkgmdlA", "testpkgmdlB", "testpkg2mdlB", "testpkgmdlC", "testpkgmdltags"); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
213 |
checkExit(Exit.OK); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
214 |
checkModuleModeCommon(); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
215 |
checkModuleModeApi(true); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
216 |
checkModuleModeAll(false); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
217 |
} |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
218 |
|
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
219 |
/** |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
220 |
* Test module summary pages in "all" mode. |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
221 |
*/ |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
222 |
@Test |
53097 | 223 |
public void testAllMode() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
224 |
javadoc("-d", "out-all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
225 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
226 |
"--show-module-contents=all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
227 |
"-author", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
228 |
"-version", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
229 |
"-Xdoclint:none", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
230 |
"-tag", "regular:a:Regular Tag:", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
231 |
"-tag", "moduletag:s:Module Tag:", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
232 |
"--module-source-path", testSrc, |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
233 |
"--module", "moduleA,moduleB,moduleC,moduletags", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
234 |
"testpkgmdlA", "moduleA/concealedpkgmdlA", "testpkgmdlB", "testpkg2mdlB", "testpkgmdlC", "testpkgmdltags"); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
235 |
checkExit(Exit.OK); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
236 |
checkModuleModeCommon(); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
237 |
checkModuleModeApi(false); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
238 |
checkModuleModeAll(true); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
239 |
} |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
240 |
|
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
241 |
/** |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
242 |
* Test generated module summary page of a module with no exported package. |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
243 |
*/ |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
244 |
@Test |
53097 | 245 |
public void testModuleSummaryNoExportedPkgAll() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
246 |
javadoc("-d", "out-ModuleSummaryNoExportedPkgAll", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
247 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
248 |
"--show-module-contents=all", |
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
249 |
"-sourcepath", testSrc + "/moduleNoExport", |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
250 |
"--module", "moduleNoExport", |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
251 |
"testpkgmdlNoExport"); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
252 |
checkExit(Exit.OK); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
253 |
checkModuleSummaryNoExported(true); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
254 |
} |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
255 |
|
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
256 |
/** |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
257 |
* Test generated module summary page of a module with no exported package. |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
258 |
*/ |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
259 |
@Test |
53097 | 260 |
public void testModuleSummaryNoExportedPkgApi() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
261 |
javadoc("-d", "out-ModuleSummaryNoExportedPkgApi", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
262 |
"-use", |
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
263 |
"-sourcepath", testSrc + "/moduleNoExport", |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
264 |
"--module", "moduleNoExport", |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
265 |
"testpkgmdlNoExport"); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
266 |
checkExit(Exit.OK); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
267 |
checkModuleSummaryNoExported(false); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
268 |
} |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
269 |
|
44879
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
270 |
/** |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
271 |
* Test generated module pages for javadoc run for a single module having a single package. |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
272 |
*/ |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
273 |
@Test |
53097 | 274 |
public void testSingleModuleSinglePkg() { |
44879
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
275 |
javadoc("-d", "out-singlemod", |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
276 |
"--module-source-path", testSrc, |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
277 |
"--module", "moduleC", |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
278 |
"testpkgmdlC"); |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
279 |
checkExit(Exit.OK); |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
280 |
} |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
281 |
|
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
282 |
/** |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
283 |
* Test generated module pages for javadoc run for a single module having multiple packages. |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
284 |
*/ |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
285 |
@Test |
53097 | 286 |
public void testSingleModuleMultiplePkg() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
287 |
javadoc("-d", "out-singlemodmultiplepkg", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
288 |
"--show-module-contents=all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
289 |
"-Xdoclint:none", |
44879
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
290 |
"--module-source-path", testSrc, |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
291 |
"--module", "moduleB", |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
292 |
"testpkg2mdlB", "testpkgmdlB"); |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
293 |
checkExit(Exit.OK); |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
294 |
} |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
295 |
|
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
296 |
/** |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
297 |
* Test -group option for modules. The overview-summary.html page should group the modules accordingly. |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
298 |
*/ |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
299 |
@Test |
53097 | 300 |
public void testGroupOption() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
301 |
javadoc("-d", "out-group", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
302 |
"--show-module-contents=all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
303 |
"-Xdoclint:none", |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
304 |
"-tag", "regular:a:Regular Tag:", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
305 |
"-tag", "moduletag:s:Module Tag:", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
306 |
"--module-source-path", testSrc, |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
307 |
"-group", "Module Group A", "moduleA*", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
308 |
"-group", "Module Group B & C", "moduleB*:moduleC*", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
309 |
"-group", "Java SE Modules", "java*", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
310 |
"--module", "moduleA,moduleB,moduleC,moduletags", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
311 |
"moduleA/concealedpkgmdlA", "testpkgmdlA", "testpkg2mdlB", "testpkgmdlB", "testpkgmdlC", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
312 |
"testpkgmdltags"); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
313 |
checkExit(Exit.OK); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
314 |
checkGroupOption(); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
315 |
} |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
316 |
|
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
317 |
/** |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
318 |
* Test -group option for modules and the ordering of module groups. |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
319 |
* The overview-summary.html page should group the modules accordingly and display the group tabs in |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
320 |
* the order it was provided on the command-line. |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
321 |
*/ |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
322 |
@Test |
53097 | 323 |
public void testGroupOptionOrdering() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
324 |
javadoc("-d", "out-groupOrder", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
325 |
"--show-module-contents=all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
326 |
"-Xdoclint:none", |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
327 |
"-tag", "regular:a:Regular Tag:", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
328 |
"-tag", "moduletag:s:Module Tag:", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
329 |
"--module-source-path", testSrc, |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
330 |
"-group", "B Group", "moduleB*", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
331 |
"-group", "C Group", "moduleC*", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
332 |
"-group", "A Group", "moduleA*", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
333 |
"-group", "Java SE Modules", "java*", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
334 |
"--module", "moduleA,moduleB,moduleC,moduletags", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
335 |
"moduleA/concealedpkgmdlA", "testpkgmdlA", "testpkg2mdlB", "testpkgmdlB", "testpkgmdlC", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
336 |
"testpkgmdltags"); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
337 |
checkExit(Exit.OK); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
338 |
checkGroupOptionOrdering(); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
339 |
} |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
340 |
|
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
341 |
/** |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
342 |
* Test -group option for unnamed modules. The overview-summary.html page should group the packages accordingly. |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
343 |
*/ |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
344 |
@Test |
53097 | 345 |
public void testUnnamedModuleGroupOption() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
346 |
javadoc("-d", "out-groupnomodule", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
347 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
348 |
"-Xdoclint:none", |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
349 |
"-overview", testSrc("overview.html"), |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
350 |
"-sourcepath", testSrc, |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
351 |
"-group", "Package Group 0", "testpkgnomodule", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
352 |
"-group", "Package Group 1", "testpkgnomodule1", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
353 |
"testpkgnomodule", "testpkgnomodule1"); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
354 |
checkExit(Exit.OK); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
355 |
checkUnnamedModuleGroupOption(); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
356 |
} |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
357 |
|
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
358 |
/** |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
359 |
* Test -group option for unnamed modules and the ordering of package groups. |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
360 |
* The overview-summary.html page should group the packages accordingly and display the group tabs in |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
361 |
* the order it was provided on the command-line. |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
362 |
*/ |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
363 |
@Test |
53097 | 364 |
public void testGroupOptionPackageOrdering() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
365 |
javadoc("-d", "out-groupPkgOrder", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
366 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
367 |
"-Xdoclint:none", |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
368 |
"-overview", testSrc("overview.html"), |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
369 |
"-sourcepath", testSrc, |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
370 |
"-group", "Z Group", "testpkgnomodule", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
371 |
"-group", "A Group", "testpkgnomodule1", |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
372 |
"testpkgnomodule", "testpkgnomodule1"); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
373 |
checkExit(Exit.OK); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
374 |
checkGroupOptionPackageOrdering(); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
375 |
} |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
376 |
|
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
377 |
/** |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
378 |
* Test -group option for a single module. |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
379 |
*/ |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
380 |
@Test |
53097 | 381 |
public void testGroupOptionSingleModule() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
382 |
javadoc("-d", "out-groupsinglemodule", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
383 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
384 |
"-Xdoclint:none", |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
385 |
"--module-source-path", testSrc, |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
386 |
"-group", "Module Group B", "moduleB*", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
387 |
"--module", "moduleB", |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
388 |
"testpkg2mdlB", "testpkgmdlB"); |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
389 |
checkExit(Exit.OK); |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
390 |
checkGroupOptionSingleModule(); |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
391 |
} |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
392 |
|
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
393 |
/** |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
394 |
* Test -group option for a single module. |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
395 |
*/ |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
396 |
@Test |
53097 | 397 |
public void testModuleName() { |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
398 |
javadoc("-d", "out-modulename", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
399 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
400 |
"-Xdoclint:none", |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
401 |
"--module-source-path", testSrc, |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
402 |
"--module", "moduleB,test.moduleFullName", |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
403 |
"testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname"); |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
404 |
checkExit(Exit.OK); |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
405 |
checkModuleName(true); |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
406 |
} |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
407 |
|
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
408 |
/** |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
409 |
* Test -linkoffline option. |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
410 |
*/ |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
411 |
@Test |
53097 | 412 |
public void testLinkOffline() { |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
413 |
String url = "https://docs.oracle.com/javase/9/docs/api/"; |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
414 |
javadoc("-d", "out-linkoffline", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
415 |
"-use", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
416 |
"--show-module-contents=all", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
417 |
"-Xdoclint:none", |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
418 |
"--module-source-path", testSrc, |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
419 |
"--module", "moduleA,moduleB", |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
420 |
"-linkoffline", url, testSrc + "/jdk", |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
421 |
"testpkgmdlA", "testpkgmdlB", "testpkg3mdlB"); |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
422 |
checkExit(Exit.OK); |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
423 |
checkLinkOffline(); |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
424 |
} |
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
425 |
|
54821 | 426 |
/** |
427 |
* Test -linksource option. |
|
428 |
*/ |
|
429 |
@Test |
|
430 |
public void testLinkSource() { |
|
431 |
javadoc("-d", "out-linksource", |
|
432 |
"-use", |
|
433 |
"-linksource", |
|
434 |
"-Xdoclint:none", |
|
435 |
"--module-source-path", testSrc, |
|
436 |
"--module", "moduleA,moduleB"); |
|
437 |
checkExit(Exit.OK); |
|
438 |
checkLinks(); |
|
439 |
checkLinkSource(false); |
|
440 |
} |
|
441 |
||
442 |
/** |
|
443 |
* Test -linksource option combined with -private. |
|
444 |
*/ |
|
445 |
@Test |
|
446 |
public void testLinkSourcePrivate() { |
|
447 |
javadoc("-d", "out-linksource-private", |
|
448 |
"-use", |
|
449 |
"-private", |
|
450 |
"-linksource", |
|
451 |
"-Xdoclint:none", |
|
452 |
"--module-source-path", testSrc, |
|
453 |
"--module", "moduleA,moduleB"); |
|
454 |
checkExit(Exit.OK); |
|
455 |
checkLinks(); |
|
456 |
checkLinkSource(true); |
|
457 |
} |
|
458 |
||
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
459 |
void checkDescription(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
460 |
checkOutput("moduleA/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
461 |
"<!-- ============ MODULE DESCRIPTION =========== -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
462 |
+ "<a name=\"module.description\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
463 |
+ "<!-- -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
464 |
+ "</a>\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
465 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
466 |
+ "phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>.</div>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
467 |
checkOutput("moduleB/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
468 |
"<!-- ============ MODULE DESCRIPTION =========== -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
469 |
+ "<a name=\"module.description\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
470 |
+ "<!-- -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
471 |
+ "</a>\n" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
472 |
+ "<div class=\"block\">This is a test description for the moduleB module. Search " |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
473 |
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
474 |
checkOutput("index.html", found, |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
475 |
"</script>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
476 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
477 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
478 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
479 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
480 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
481 |
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
482 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
483 |
checkOutput("index.html", false, |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
484 |
"</table>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
485 |
+ "</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
486 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
487 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
488 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
489 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
490 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
491 |
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
492 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
493 |
} |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
494 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
495 |
void checkNoDescription(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
496 |
checkOutput("moduleA/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
497 |
"<div class=\"contentContainer\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
498 |
+ "<ul class=\"blockList\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
499 |
+ "<li class=\"blockList\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
500 |
+ "<ul class=\"blockList\">\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
501 |
+ "<li class=\"blockList\">\n" |
44564 | 502 |
+ "<!-- ============ PACKAGES SUMMARY =========== -->"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
503 |
checkOutput("moduleB/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
504 |
"<div class=\"contentContainer\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
505 |
+ "<ul class=\"blockList\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
506 |
+ "<li class=\"blockList\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
507 |
+ "<ul class=\"blockList\">\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
508 |
+ "<li class=\"blockList\">\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
509 |
+ "<!-- ============ PACKAGES SUMMARY =========== -->"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
510 |
} |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
511 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
512 |
void checkHtml5Description(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
513 |
checkOutput("moduleA/module-summary.html", found, |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
514 |
"<section class=\"moduleDescription\">\n" |
47272 | 515 |
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal:" |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
516 |
+ " This API element is subject to removal in a future version.</span>\n" |
47300
a905ce398074
8074407: javadoc: using <pre> after @deprecated tag causes warnings
bpatel
parents:
47299
diff
changeset
|
517 |
+ "<div class=\"deprecationComment\">This module is deprecated.</div>\n" |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
518 |
+ "</div>\n" |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
519 |
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
520 |
+ "<a id=\"module.description\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
521 |
+ "<!-- -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
522 |
+ "</a>\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
523 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
524 |
+ "phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>.</div>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
525 |
checkOutput("moduleB/module-summary.html", found, |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
526 |
"<section class=\"moduleDescription\">\n" |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
527 |
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
528 |
+ "<a id=\"module.description\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
529 |
+ "<!-- -->\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
530 |
+ "</a>\n" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
531 |
+ "<div class=\"block\">This is a test description for the moduleB module. Search " |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
532 |
+ "word <a id=\"search_word\" class=\"searchTagResult\">search_word</a> with no description.</div>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
533 |
checkOutput("index.html", found, |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
534 |
"</nav>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
535 |
+ "</header>\n" |
59294
48b88b9c11eb
8223378: CSS solution for navbar problem with <a> elements is not ideal
hannesw
parents:
54821
diff
changeset
|
536 |
+ "<div class=\"flexContent\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
537 |
+ "<main role=\"main\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
538 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
539 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
540 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
541 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
542 |
+ "<div class=\"overviewSummary\">\n<table>\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
543 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
544 |
checkOutput("index.html", false, |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
545 |
"</table>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
546 |
+ "</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
547 |
+ "</main>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
548 |
+ "<main role=\"main\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
549 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
550 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
551 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
552 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
553 |
+ "<div class=\"overviewSummary\">\n<table>\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
554 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
555 |
} |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
556 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
557 |
void checkHtml5NoDescription(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
558 |
checkOutput("moduleA/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
559 |
"<div class=\"contentContainer\">\n" |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
560 |
+ "<section class=\"summary\">\n" |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
561 |
+ "<ul class=\"blockList\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
562 |
+ "<li class=\"blockList\">\n" |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
563 |
+ "<section class=\"packagesSummary\">\n" |
44564 | 564 |
+ "<!-- ============ PACKAGES SUMMARY =========== -->"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
565 |
checkOutput("moduleB/module-summary.html", found, |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
566 |
"<div class=\"contentContainer\">\n" |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
567 |
+ "<section class=\"summary\">\n" |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
568 |
+ "<ul class=\"blockList\">\n" |
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
569 |
+ "<li class=\"blockList\">\n" |
54596
86c1da00dd6a
8219998: Eliminate inherently singleton lists
pmuthuswamy
parents:
54444
diff
changeset
|
570 |
+ "<section class=\"packagesSummary\">\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
571 |
+ "<!-- ============ PACKAGES SUMMARY =========== -->"); |
37747
878801512393
8154119: Module summary page should display module description
bpatel
parents:
diff
changeset
|
572 |
} |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
573 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
574 |
void checkModuleLink() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
575 |
checkOutput("index.html", true, |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
576 |
"<li>Module</li>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
577 |
checkOutput("moduleA/module-summary.html", true, |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
578 |
"<li class=\"navBarCell1Rev\">Module</li>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
579 |
checkOutput("moduleB/module-summary.html", true, |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
580 |
"<li class=\"navBarCell1Rev\">Module</li>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
581 |
checkOutput("moduleA/testpkgmdlA/class-use/TestClassInModuleA.html", true, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
582 |
"<li><a href=\"../../module-summary.html\">Module</a></li>"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
583 |
checkOutput("moduleB/testpkgmdlB/package-summary.html", true, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
584 |
"<li><a href=\"../module-summary.html\">Module</a></li>"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
585 |
checkOutput("moduleB/testpkgmdlB/TestClassInModuleB.html", true, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
586 |
"<li><a href=\"../module-summary.html\">Module</a></li>"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
587 |
checkOutput("moduleB/testpkgmdlB/class-use/TestClassInModuleB.html", true, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
588 |
"<li><a href=\"../../module-summary.html\">Module</a></li>"); |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
589 |
} |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
590 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
591 |
void checkNoModuleLink() { |
37943
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
592 |
checkOutput("testpkgnomodule/package-summary.html", true, |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
593 |
"<ul class=\"navList\" title=\"Navigation\">\n" |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
594 |
+ "<li><a href=\"../testpkgnomodule/package-summary.html\">Package</a></li>"); |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
595 |
checkOutput("testpkgnomodule/TestClassNoModule.html", true, |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
596 |
"<ul class=\"navList\" title=\"Navigation\">\n" |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
597 |
+ "<li><a href=\"../testpkgnomodule/package-summary.html\">Package</a></li>"); |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
598 |
checkOutput("testpkgnomodule/class-use/TestClassNoModule.html", true, |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
599 |
"<ul class=\"navList\" title=\"Navigation\">\n" |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
600 |
+ "<li><a href=\"../../testpkgnomodule/package-summary.html\">Package</a></li>"); |
2efb75c09230
8154262: Navigation bar in javadoc generated pages needs to be updated to display module information
bpatel
parents:
37747
diff
changeset
|
601 |
} |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
602 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
603 |
void checkModuleTags() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
604 |
checkOutput("moduletags/module-summary.html", true, |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
605 |
"Type Link: <a href=\"testpkgmdltags/TestClassInModuleTags.html\" title=\"class in " |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
606 |
+ "testpkgmdltags\"><code>TestClassInModuleTags</code></a>.", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
607 |
"Member Link: <a href=\"testpkgmdltags/TestClassInModuleTags.html#" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
608 |
+ "testMethod(java.lang.String)\"><code>testMethod(String)</code></a>.", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
609 |
"Package Link: <a href=\"testpkgmdltags/package-summary.html\"><code>testpkgmdltags</code></a>.", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
610 |
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
611 |
+ "<dd>JDK 9</dd>", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
612 |
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
613 |
+ "<dd>\"Test see tag\", \n" |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
614 |
+ "<a href=\"testpkgmdltags/TestClassInModuleTags.html\" title=\"class in testpkgmdltags\"><code>" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
615 |
+ "TestClassInModuleTags</code></a></dd>", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
616 |
"<dt><span class=\"simpleTagLabel\">Regular Tag:</span></dt>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
617 |
+ "<dd>Just a regular simple tag.</dd>", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
618 |
"<dt><span class=\"simpleTagLabel\">Module Tag:</span></dt>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
619 |
+ "<dd>Just a simple module tag.</dd>", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
620 |
"<dt><span class=\"simpleTagLabel\">Version:</span></dt>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
621 |
+ "<dd>1.0</dd>", |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
622 |
"<dt><span class=\"simpleTagLabel\">Author:</span></dt>\n" |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
623 |
+ "<dd>Bhavesh Patel</dd>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
624 |
checkOutput("moduletags/testpkgmdltags/TestClassInModuleTags.html", false, |
38911
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
625 |
"<dt><span class=\"simpleTagLabel\">Module Tag:</span></dt>\n" |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
626 |
+ "<dd>Just a simple module tag.</dd>"); |
48a00b5ee366
8156077: Support javadoc tags in module documentation
bpatel
parents:
37943
diff
changeset
|
627 |
} |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
628 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
629 |
void checkOverviewSummaryModules() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
630 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
631 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
632 |
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
633 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
634 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
635 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
636 |
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
637 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
638 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
639 |
+ "</thead>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
640 |
checkOutput("overview-summary.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
641 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
642 |
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
643 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
644 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
645 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
646 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
647 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
648 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
649 |
+ "</thead>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
650 |
} |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
651 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
652 |
void checkOverviewSummaryPackages() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
653 |
checkOutput("index.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
654 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
655 |
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
656 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
657 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
658 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
659 |
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
660 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
661 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
662 |
+ "</thead>", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
663 |
"</table>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
664 |
+ "</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
665 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
666 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
667 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
668 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
669 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
670 |
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
671 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
672 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
673 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
674 |
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
675 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
676 |
+ "<thead>n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
677 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
678 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
679 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
680 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
681 |
+ "</thead>\n", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
682 |
"</script>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
683 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
684 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
685 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
686 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
687 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
688 |
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
689 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
690 |
} |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
691 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
692 |
void checkHtml5OverviewSummaryModules() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
693 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
694 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
695 |
+ "<table>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
696 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
697 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
698 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
699 |
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
700 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
701 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
702 |
+ "</thead>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
703 |
checkOutput("overview-summary.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
704 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
705 |
+ "<table>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
706 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
707 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
708 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
709 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
710 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
711 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
712 |
+ "</thead>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
713 |
} |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
714 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
715 |
void checkHtml5OverviewSummaryPackages() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
716 |
checkOutput("index.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
717 |
"<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
718 |
+ "<table>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
719 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
720 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
721 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
722 |
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
723 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
724 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
725 |
+ "</thead>", |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
726 |
"</table>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
727 |
+ "</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
728 |
+ "</main>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
729 |
+ "<main role=\"main\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
730 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
731 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
732 |
+ "</div>\n" |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
733 |
+ "<div class=\"contentContainer\"><a id=\"Packages\">\n" |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
734 |
+ "<!-- -->\n" |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
735 |
+ "</a>\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
736 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
737 |
+ "<table>\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
738 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
739 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
740 |
"<div class=\"overviewSummary\">\n<table>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
741 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
742 |
+ "<thead>\n" |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
743 |
+ "<tr>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
744 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
745 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
746 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
747 |
+ "</thead>", |
59294
48b88b9c11eb
8223378: CSS solution for navbar problem with <a> elements is not ideal
hannesw
parents:
54821
diff
changeset
|
748 |
"</nav>\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
749 |
+ "</header>\n" |
59294
48b88b9c11eb
8223378: CSS solution for navbar problem with <a> elements is not ideal
hannesw
parents:
54821
diff
changeset
|
750 |
+ "<div class=\"flexContent\">\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
751 |
+ "<main role=\"main\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
752 |
+ "<div class=\"contentContainer\">\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
753 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
754 |
+ "</div>\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
755 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
756 |
+ "<div class=\"overviewSummary\">\n<table>\n" |
44195
5860769fe2f4
8175799: module summary page shows duplicated output
bpatel
parents:
42842
diff
changeset
|
757 |
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>"); |
39586
e35b6ab55e00
8157987: overview-summary.html generated by javadoc should include module information
bpatel
parents:
38911
diff
changeset
|
758 |
} |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
759 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
760 |
void checkModuleSummary() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
761 |
checkOutput("moduleA/module-summary.html", true, |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
762 |
"<ul class=\"subNavList\">\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
763 |
+ "<li>Module: </li>\n" |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
764 |
+ "<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
765 |
+ "<li><a href=\"#modules.summary\">Modules</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
766 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
767 |
+ "<li>Services</li>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
768 |
+ "</ul>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
769 |
"<!-- ============ MODULES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
770 |
+ "<a id=\"modules.summary\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
771 |
+ "<!-- -->\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
772 |
+ "</a>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
773 |
"<tr class=\"altColor\" id=\"i0\">\n" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
774 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
775 |
+ "<td class=\"colLast\"> </td>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
776 |
+ "</tr>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
777 |
"<!-- ============ PACKAGES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
778 |
+ "<a id=\"packages.summary\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
779 |
+ "<!-- -->\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
780 |
+ "</a>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
781 |
"<tr class=\"altColor\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
782 |
+ "<td class=\"colFirst\">transitive</td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
783 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
784 |
+ "<td class=\"colLast\">\n" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
785 |
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
786 |
+ "</td>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
787 |
+ "</tr>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
788 |
checkOutput("moduleB/module-summary.html", true, |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
789 |
"<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
790 |
+ "<li>Modules | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
791 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
792 |
+ "<li><a href=\"#services.summary\">Services</a></li>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
793 |
"<!-- ============ PACKAGES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
794 |
+ "<a id=\"packages.summary\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
795 |
+ "<!-- -->\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
796 |
+ "</a>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
797 |
"<tr class=\"altColor\" id=\"i0\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
798 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
799 |
+ "<td class=\"colLast\"> </td>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
800 |
+ "</tr>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
801 |
"<!-- ============ PACKAGES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
802 |
+ "<a id=\"packages.summary\">\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
803 |
+ "<!-- -->\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
804 |
+ "</a>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
805 |
"<!-- ============ SERVICES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
806 |
+ "<a id=\"services.summary\">\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
807 |
+ "<!-- -->\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
808 |
+ "</a>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
809 |
"<tr class=\"altColor\">\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
810 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n" |
48437
dd3b97564ed7
8192007: javadoc @uses and @provides tags in the modules documentation appears before the first-sentence summary of the service type.
bpatel
parents:
48325
diff
changeset
|
811 |
+ "<td class=\"colLast\">\n" |
dd3b97564ed7
8192007: javadoc @uses and @provides tags in the modules documentation appears before the first-sentence summary of the service type.
bpatel
parents:
48325
diff
changeset
|
812 |
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
813 |
+ "</tr>", |
44564 | 814 |
"<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
815 |
+ "<thead>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
816 |
+ "<tr>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
817 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
818 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
819 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
820 |
+ "</thead>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
821 |
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
822 |
+ "<thead>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
823 |
+ "<tr>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
824 |
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
825 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
826 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
827 |
+ "</thead>", |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
828 |
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
829 |
+ "<thead>\n" |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
830 |
+ "<tr>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
831 |
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n" |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
832 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
833 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
834 |
+ "</thead>"); |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
835 |
} |
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
836 |
|
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
837 |
void checkAggregatorModuleSummary() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
838 |
checkOutput("moduleT/module-summary.html", true, |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
839 |
"<div class=\"header\">\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
840 |
+ "<h1 title=\"Module\" class=\"title\">Module moduleT</h1>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
841 |
+ "</div>", |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
842 |
"<div class=\"block\">This is a test description for the moduleT module. " |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
843 |
+ "Search phrase <a id=\"searchphrase\" class=\"searchTagResult\">search phrase</a>. " |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
844 |
+ "Make sure there are no exported packages.</div>", |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
845 |
"<tbody>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
846 |
+ "<tr class=\"altColor\">\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
847 |
+ "<td class=\"colFirst\">transitive</td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
848 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n" |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
849 |
+ "<td class=\"colLast\">\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
850 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
51862 | 851 |
+ "phrase search phrase.</div>\n" |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
852 |
+ "</td>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
853 |
+ "</tr>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
854 |
+ "<tr class=\"rowColor\">\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
855 |
+ "<td class=\"colFirst\">transitive</td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
856 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n" |
44293
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
857 |
+ "<td class=\"colLast\">\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
858 |
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
859 |
+ "</td>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
860 |
+ "</tr>\n" |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
861 |
+ "</tbody>"); |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
862 |
} |
2f47b2c16612
8176778: javadoc does not produce summary pages for aggregated modules
ksrini
parents:
44196
diff
changeset
|
863 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
864 |
void checkNegatedModuleSummary() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
865 |
checkOutput("moduleA/module-summary.html", false, |
39670
9d1eafbf29c6
8154261: Module summary page should display directives for the module
bpatel
parents:
39586
diff
changeset
|
866 |
"<!-- ============ SERVICES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
867 |
+ "<a id=\"services.summary\">\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
868 |
+ "<!-- -->\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
869 |
+ "</a>"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
870 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
871 |
|
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
872 |
void checkModuleFilesAndLinks(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
873 |
checkFileAndOutput("moduleA/testpkgmdlA/package-summary.html", found, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
874 |
"<li><a href=\"../module-summary.html\">Module</a></li>", |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
875 |
"<div class=\"subTitle\"><span class=\"moduleLabelInPackage\">Module</span> " |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
876 |
+ "<a href=\"../module-summary.html\">moduleA</a></div>"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
877 |
checkFileAndOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", found, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
878 |
"<li><a href=\"../module-summary.html\">Module</a></li>", |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
879 |
"<div class=\"subTitle\"><span class=\"moduleLabelInType\">Module</span> " |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
880 |
+ "<a href=\"../module-summary.html\">moduleA</a></div>"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
881 |
checkFileAndOutput("moduleB/testpkgmdlB/AnnotationType.html", found, |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
882 |
"<div class=\"subTitle\"><span class=\"moduleLabelInType\">Module</span> " |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
883 |
+ "<a href=\"../module-summary.html\">moduleB</a></div>", |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
884 |
"<div class=\"subTitle\"><span class=\"packageLabelInType\">" |
48654
36f58bd6269f
8195796: Reduce the size of relative URLs in generated docs
jjg
parents:
48437
diff
changeset
|
885 |
+ "Package</span> <a href=\"package-summary.html\">testpkgmdlB</a></div>"); |
40503
cb34fd6e8071
8135291: [javadoc] broken link in Package com.sun.tools.jconsole
bpatel
parents:
40308
diff
changeset
|
886 |
checkFiles(found, |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
887 |
"moduleA/module-summary.html"); |
44879
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
888 |
} |
49beafe2faf3
8166306: Broken link for All Packages in java.jnlp module
bpatel
parents:
44807
diff
changeset
|
889 |
|
40511 | 890 |
void checkModulesInSearch(boolean found) { |
891 |
checkOutput("index-all.html", found, |
|
892 |
"<dl>\n" |
|
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
893 |
+ "<dt><a href=\"moduleA/module-summary.html\">moduleA</a> - module moduleA</dt>\n" |
40511 | 894 |
+ "<dd>\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
895 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
51862 | 896 |
+ "phrase search phrase.</div>\n" |
40511 | 897 |
+ "</dd>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
898 |
+ "<dt><a href=\"moduleB/module-summary.html\">moduleB</a> - module moduleB</dt>\n" |
40511 | 899 |
+ "<dd>\n" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
900 |
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n" |
40511 | 901 |
+ "</dd>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
902 |
+ "</dl>", |
40511 | 903 |
"<dl>\n" |
50856
1857ca5aca37
8190876: javadoc search on "java.se" shows "java.se" the last one among other modules
hannesw
parents:
50421
diff
changeset
|
904 |
+ "<dt><span class=\"searchTagLink\"><a href=\"moduleB/module-summary.html#search_word\">" |
1857ca5aca37
8190876: javadoc search on "java.se" shows "java.se" the last one among other modules
hannesw
parents:
50421
diff
changeset
|
905 |
+ "search_word</a></span> - Search tag in moduleB</dt>\n" |
1857ca5aca37
8190876: javadoc search on "java.se" shows "java.se" the last one among other modules
hannesw
parents:
50421
diff
changeset
|
906 |
+ "<dd> </dd>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
907 |
+ "<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">" |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42494
diff
changeset
|
908 |
+ "search phrase</a></span> - Search tag in moduleA</dt>\n" |
40511 | 909 |
+ "<dd>with description</dd>\n" |
910 |
+ "</dl>"); |
|
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
911 |
checkOutput("index-all.html", false, |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
912 |
"<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
913 |
+ "search phrase</a></span> - Search tag in moduleA</dt>\n" |
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
914 |
+ "<dd>with description</dd>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
915 |
+ "<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
916 |
+ "search phrase</a></span> - Search tag in moduleA</dt>\n" |
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
917 |
+ "<dd>with description</dd>"); |
44196
f88c0e9cb102
8174974: Annotation type pages generated by javadoc is missing module information
bpatel
parents:
44195
diff
changeset
|
918 |
} |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
919 |
|
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
920 |
void checkModuleModeCommon() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
921 |
checkOutput("index.html", true, |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
922 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
923 |
+ "<td class=\"colLast\">\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
924 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
51862 | 925 |
+ "phrase search phrase.</div>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
926 |
+ "</td>", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
927 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"moduleB/module-summary.html\">moduleB</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
928 |
+ "<td class=\"colLast\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
929 |
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
930 |
+ "</td>", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
931 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"moduletags/module-summary.html\">moduletags</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
932 |
+ "<td class=\"colLast\">\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
933 |
+ "<div class=\"block\">This is a test description for the moduletags module.<br>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
934 |
+ " Type Link: <a href=\"moduletags/testpkgmdltags/TestClassInModuleTags.html\" title=\"class in testpkgmdltags\"><code>TestClassInModuleTags</code></a>.<br>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
935 |
+ " Member Link: <a href=\"moduletags/testpkgmdltags/TestClassInModuleTags.html#testMethod(java.lang.String)\"><code>testMethod(String)</code></a>.<br>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
936 |
+ " Package Link: <a href=\"moduletags/testpkgmdltags/package-summary.html\"><code>testpkgmdltags</code></a>.<br></div>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
937 |
+ "</td>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
938 |
checkOutput("moduleA/module-summary.html", true, |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
939 |
"<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
940 |
+ "<li><a href=\"#modules.summary\">Modules</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
941 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
942 |
+ "<li>Services</li>", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
943 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n" |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
944 |
+ "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n"); |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
945 |
checkOutput("moduleB/module-summary.html", true, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
946 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n" |
48437
dd3b97564ed7
8192007: javadoc @uses and @provides tags in the modules documentation appears before the first-sentence summary of the service type.
bpatel
parents:
48325
diff
changeset
|
947 |
+ "<td class=\"colLast\">\n" |
dd3b97564ed7
8192007: javadoc @uses and @provides tags in the modules documentation appears before the first-sentence summary of the service type.
bpatel
parents:
48325
diff
changeset
|
948 |
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
949 |
checkOutput("moduletags/module-summary.html", true, |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
950 |
"<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
951 |
+ "<li><a href=\"#modules.summary\">Modules</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
952 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
953 |
+ "<li>Services</li>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
954 |
"<div class=\"requiresSummary\">\n<table>\n" |
44564 | 955 |
+ "<caption><span>Indirect Requires</span><span class=\"tabEnd\"> </span></caption>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
956 |
"<td class=\"colFirst\">transitive</td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
957 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
958 |
+ "<td class=\"colLast\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
959 |
+ "<div class=\"block\">This is a test description for the moduleB module.</div>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
960 |
+ "</td>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
961 |
"<div class=\"packagesSummary\">\n<table>\n" |
44564 | 962 |
+ "<caption><span>Indirect Exports</span><span class=\"tabEnd\"> </span></caption>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
963 |
"<td class=\"colFirst\">transitive static</td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
964 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
965 |
+ "<td class=\"colLast\">\n" |
45913
90f6a96c1603
8181622: new {@index} tag generates multiple index entries
bpatel
parents:
45771
diff
changeset
|
966 |
+ "<div class=\"block\">This is a test description for the moduleA module with a Search " |
51862 | 967 |
+ "phrase search phrase.</div>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
968 |
+ "</td>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
969 |
"<div class=\"requiresSummary\">\n<table>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
970 |
+ "<caption><span>Requires</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
971 |
+ "<thead>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
972 |
+ "<tr>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
973 |
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
974 |
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
975 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
976 |
"<div class=\"requiresSummary\">\n<table>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
977 |
+ "<caption><span>Indirect Requires</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
978 |
+ "<thead>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
979 |
+ "<tr>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
980 |
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
981 |
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
982 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
983 |
"<div class=\"packagesSummary\">\n<table>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
984 |
+ "<caption><span>Indirect Opens</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
985 |
+ "<thead>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
986 |
+ "<tr>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
987 |
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
988 |
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
989 |
+ "</tr>\n", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
990 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
991 |
+ "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
992 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
993 |
|
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
994 |
void checkModuleModeApi(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
995 |
checkOutput("moduleA/module-summary.html", found, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
996 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
997 |
+ "<td class=\"colLast\"> </td>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
998 |
checkOutput("moduleB/module-summary.html", found, |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
999 |
"<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1000 |
+ "<li>Modules | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1001 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1002 |
+ "<li><a href=\"#services.summary\">Services</a></li>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1003 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1004 |
+ "<td class=\"colLast\"> </td>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1005 |
"<div class=\"packagesSummary\">\n<table>\n" |
44564 | 1006 |
+ "<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1007 |
+ "<thead>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1008 |
+ "<tr>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1009 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1010 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1011 |
+ "</tr>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1012 |
+ "</thead>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1013 |
+ "<tbody>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1014 |
+ "<tr class=\"altColor\" id=\"i0\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1015 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1016 |
+ "<td class=\"colLast\"> </td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1017 |
+ "</tr>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1018 |
+ "</tbody>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1019 |
+ "</table>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1020 |
checkOutput("moduletags/module-summary.html", true, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1021 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1022 |
+ "<td class=\"colLast\"> </td>"); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1023 |
} |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1024 |
|
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1025 |
void checkModuleModeAll(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1026 |
checkOutput("moduleA/module-summary.html", found, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1027 |
"<td class=\"colFirst\"> </td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1028 |
+ "<th class=\"colSecond\" scope=\"row\">java.base</th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1029 |
+ "<td class=\"colLast\"> </td>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1030 |
"<td class=\"colFirst\"> </td>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1031 |
+ "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1032 |
+ "<td class=\"colLast\">\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1033 |
+ "<div class=\"block\">This is a test description for the moduleC module.</div>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1034 |
+ "</td>", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1035 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n" |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1036 |
+ "<td class=\"colLast\"><a href=\"../moduleC/testpkgmdlC/package-summary.html\">testpkgmdlC</a></td>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1037 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1038 |
+ "<td class=\"colSecond\">All Modules</td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1039 |
+ "<td class=\"colLast\"> </td>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1040 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1041 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1042 |
+ " class=\"activeTableTab\">All Packages</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1043 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1044 |
+ " class=\"tableTab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1045 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1046 |
+ " class=\"tableTab\" onclick=\"show(4);\">Concealed</button></div>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1047 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"concealedpkgmdlA/package-summary.html\">concealedpkgmdlA</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1048 |
+ "<td class=\"colSecond\">None</td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1049 |
+ "<td class=\"colLast\"> </td>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1050 |
checkOutput("moduleB/module-summary.html", found, |
49551
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1051 |
"<li><a href=\"#module.description\">Description</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1052 |
+ "<li><a href=\"#modules.summary\">Modules</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1053 |
+ "<li><a href=\"#packages.summary\">Packages</a> | </li>\n" |
0d4786e42471
8196200: Implement a navigation builder in javadoc
bpatel
parents:
49139
diff
changeset
|
1054 |
+ "<li><a href=\"#services.summary\">Services</a></li>", |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1055 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n" |
48325 | 1056 |
+ "<td class=\"colSecond\">None</td>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1057 |
+ "<td class=\"colSecond\">All Modules</td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1058 |
+ "<td class=\"colLast\"> </td>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1059 |
"<td class=\"colFirst\"> </td>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1060 |
+ "<th class=\"colSecond\" scope=\"row\">java.base</th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1061 |
+ "<td class=\"colLast\"> </td>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1062 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClass2InModuleB.html\" title=\"class in testpkgmdlB\">TestClass2InModuleB</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1063 |
+ "<td class=\"colLast\"> </td>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1064 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterface2InModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterface2InModuleB</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1065 |
+ "<td class=\"colLast\"> <br>(<span class=\"implementationLabel\">Implementation(s):</span> <a href=\"testpkgmdlB/TestClass2InModuleB.html\" " |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1066 |
+ "title=\"class in testpkgmdlB\">TestClass2InModuleB</a>)</td>", |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1067 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterfaceInModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterfaceInModuleB</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1068 |
+ "<td class=\"colLast\"> <br>(<span class=\"implementationLabel\">Implementation(s):</span> <a href=\"testpkgmdlB/TestClassInModuleB.html\" " |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1069 |
+ "title=\"class in testpkgmdlB\">TestClassInModuleB</a>)</td>", |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1070 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1071 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1072 |
+ " class=\"activeTableTab\">All Packages</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1073 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1074 |
+ " class=\"tableTab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1075 |
+ " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1076 |
+ " class=\"tableTab\" onclick=\"show(2);\">Opens</button></div>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1077 |
checkOutput("moduleC/module-summary.html", found, |
44564 | 1078 |
"<caption><span>Exports</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1079 |
+ "<thead>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1080 |
+ "<tr>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1081 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
48325 | 1082 |
+ "<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n" |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1083 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1084 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1085 |
+ "</thead>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1086 |
checkOutput("moduletags/module-summary.html", true, |
42831
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1087 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n" |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1088 |
+ "<td class=\"colLast\"> </td>"); |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1089 |
} |
feff6f296019
8160196: Module summary page should display information based on "api" or "detail" mode.
bpatel
parents:
42823
diff
changeset
|
1090 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1091 |
void checkModuleDeprecation(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1092 |
checkOutput("moduleA/module-summary.html", found, |
47272 | 1093 |
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal:" |
44567
126285be00b9
8175218: The fix for JDK-8141492 broke formatting of some javadoc documentation.
bpatel
parents:
44564
diff
changeset
|
1094 |
+ " This API element is subject to removal in a future version.</span>\n" |
47300
a905ce398074
8074407: javadoc: using <pre> after @deprecated tag causes warnings
bpatel
parents:
47299
diff
changeset
|
1095 |
+ "<div class=\"deprecationComment\">This module is deprecated.</div>\n" |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1096 |
+ "</div>"); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1097 |
checkOutput("deprecated-list.html", found, |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1098 |
"<ul>\n" |
47299 | 1099 |
+ "<li><a href=\"#forRemoval\">For Removal</a></li>\n" |
1100 |
+ "<li><a href=\"#module\">Modules</a></li>\n" |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1101 |
+ "</ul>", |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1102 |
"<tr class=\"altColor\">\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1103 |
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n" |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1104 |
+ "<td class=\"colLast\">\n" |
47300
a905ce398074
8074407: javadoc: using <pre> after @deprecated tag causes warnings
bpatel
parents:
47299
diff
changeset
|
1105 |
+ "<div class=\"deprecationComment\">This module is deprecated.</div>\n" |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1106 |
+ "</td>\n" |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1107 |
+ "</tr>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1108 |
checkOutput("moduleB/module-summary.html", !found, |
47272 | 1109 |
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" |
47300
a905ce398074
8074407: javadoc: using <pre> after @deprecated tag causes warnings
bpatel
parents:
47299
diff
changeset
|
1110 |
+ "<div class=\"deprecationComment\">This module is deprecated using just the javadoc tag.</div>\n"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1111 |
checkOutput("moduletags/module-summary.html", found, |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1112 |
"<p>@Deprecated\n" |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1113 |
+ "</p>", |
47272 | 1114 |
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>"); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1115 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1116 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41157
diff
changeset
|
1117 |
void checkModuleAnnotation() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1118 |
checkOutput("moduleB/module-summary.html", true, |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1119 |
"<p><a href=\"testpkgmdlB/AnnotationType.html\" title=\"annotation in testpkgmdlB\">@AnnotationType</a>(<a href=\"testpkgmdlB/AnnotationType.html#optional()\">optional</a>=\"Module Annotation\",\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1120 |
+ " <a href=\"testpkgmdlB/AnnotationType.html#required()\">required</a>=2016)\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1121 |
+ "</p>"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1122 |
checkOutput("moduleB/module-summary.html", false, |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1123 |
"@AnnotationTypeUndocumented"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1124 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1125 |
|
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1126 |
void checkModuleSummaryNoExported(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1127 |
checkOutput("moduleNoExport/module-summary.html", found, |
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1128 |
"<!-- ============ PACKAGES SUMMARY =========== -->\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1129 |
+ "<a id=\"packages.summary\">\n" |
44689
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1130 |
+ "<!-- -->\n" |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1131 |
+ "</a>", |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1132 |
"<caption><span>Concealed</span><span class=\"tabEnd\"> </span></caption>"); |
53c703004306
8175823: doclet crashes when documenting a single class in a module.
bpatel
parents:
44684
diff
changeset
|
1133 |
} |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1134 |
|
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1135 |
void checkGroupOption() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1136 |
checkOutput("index.html", true, |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1137 |
"<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1138 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1139 |
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1140 |
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1141 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1142 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1143 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1144 |
+ " onclick=\"show(1);\">Module Group A</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1145 |
+ " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1146 |
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Module Group B & C</button><button" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1147 |
+ " role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1148 |
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1149 |
+ "Other Modules</button></div>\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1150 |
+ "<div id=\"overviewSummary_tabpanel\" role=\"tabpanel\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1151 |
+ "<table aria-labelledby=\"t0\">", |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1152 |
"var data = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1153 |
+ "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1154 |
+ "var altColor = \"altColor\";\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1155 |
+ "var rowColor = \"rowColor\";\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1156 |
+ "var tableTab = \"tableTab\";\n" |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1157 |
+ "var activeTableTab = \"activeTableTab\";"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1158 |
checkOutput("index.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1159 |
"<div class=\"overviewSummary\">\n<table>\n" |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1160 |
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>", |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1161 |
"Java SE Modules"); |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1162 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1163 |
|
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1164 |
void checkGroupOptionOrdering() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1165 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1166 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1167 |
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1168 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1169 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1170 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1171 |
+ " onclick=\"show(1);\">B Group</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1172 |
+ " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1173 |
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">C Group</button><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1174 |
+ " aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1175 |
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">A Group" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1176 |
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1177 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"tableTab\" onclick=\"show(8);\">" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1178 |
+ "Other Modules</button></div>", |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1179 |
"var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"B Group\"],2:[\"t2\",\"C Group\"]," |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1180 |
+ "4:[\"t4\",\"A Group\"],8:[\"t8\",\"Other Modules\"]};"); |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1181 |
checkOutput("index.html", false, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1182 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1183 |
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1184 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1185 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1186 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1187 |
+ " onclick=\"show(1);\">A Group</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1188 |
+ " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1189 |
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">B Group</button><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1190 |
+ " aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1191 |
+ " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">C Group" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1192 |
+ "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1193 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1194 |
+ " onclick=\"show(8);\">Other Modules</button></div>", |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1195 |
"Java SE Modules"); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1196 |
} |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1197 |
|
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1198 |
void checkUnnamedModuleGroupOption() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1199 |
checkOutput("index.html", true, |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1200 |
"<div class=\"contentContainer\">\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1201 |
+ "<div class=\"block\">The overview summary page header.</div>\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1202 |
+ "</div>\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1203 |
+ "<div class=\"contentContainer\">\n" |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1204 |
+ "<div class=\"overviewSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1205 |
+ "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1206 |
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1207 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1208 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1209 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1210 |
+ " onclick=\"show(1);\">Package Group 0</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1211 |
+ " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1212 |
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Package Group 1</button></div>\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1213 |
+ "<div id=\"overviewSummary_tabpanel\" role=\"tabpanel\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1214 |
+ "<table aria-labelledby=\"t0\">", |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1215 |
"var data = {\"i0\":1,\"i1\":2};\n" |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1216 |
+ "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Package Group 0\"],2:[\"t2\",\"Package Group 1\"]};\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1217 |
+ "var altColor = \"altColor\";\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1218 |
+ "var rowColor = \"rowColor\";\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1219 |
+ "var tableTab = \"tableTab\";\n" |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1220 |
+ "var activeTableTab = \"activeTableTab\";"); |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1221 |
} |
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1222 |
|
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1223 |
void checkGroupOptionPackageOrdering() { |
54350
4f9772f4403d
8215599: Remove support for javadoc "frames" mode
pmuthuswamy
parents:
54137
diff
changeset
|
1224 |
checkOutput("index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1225 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1226 |
+ " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1227 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1228 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1229 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1230 |
+ " onclick=\"show(1);\">Z Group</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1231 |
+ " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1232 |
+ " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">A Group</button></div>", |
47447
9887d1bc3e9c
8183037: Overview summary page should have a table with tabs for groups
bpatel
parents:
47300
diff
changeset
|
1233 |
"var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Z Group\"],2:[\"t2\",\"A Group\"]};"); |
45157
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1234 |
} |
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1235 |
|
f5f796453339
8178043: Support grouping modules in unified javadoc
bpatel
parents:
44879
diff
changeset
|
1236 |
void checkGroupOptionSingleModule() { |
50421
ac888403369e
8190875: modules not listed in overview/index page
pmuthuswamy
parents:
50293
diff
changeset
|
1237 |
checkOutput("index.html", true, |
ac888403369e
8190875: modules not listed in overview/index page
pmuthuswamy
parents:
50293
diff
changeset
|
1238 |
"window.location.replace('moduleB/module-summary.html')"); |
49139
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1239 |
} |
771616d26ca1
8182765: HTML5 must be the default javadoc codegen mode in the near future
bpatel
parents:
48759
diff
changeset
|
1240 |
|
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1241 |
void checkModuleName(boolean found) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1242 |
checkOutput("test.moduleFullName/module-summary.html", found, |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1243 |
"<div class=\"header\">\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1244 |
+ "<h1 title=\"Module\" class=\"title\">Module test.moduleFullName</h1>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1245 |
+ "</div>"); |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1246 |
checkOutput("index-all.html", found, |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1247 |
"<h2 class=\"title\">T</h2>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1248 |
+ "<dl>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1249 |
+ "<dt><a href=\"test.moduleFullName/module-summary.html\">test.moduleFullName</a> - module test.moduleFullName</dt>\n" |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1250 |
+ "<dd>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1251 |
+ "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1252 |
+ "</dd>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1253 |
checkOutput("test.moduleFullName/module-summary.html", !found, |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1254 |
"<div class=\"header\">\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1255 |
+ "<h1 title=\"Module\" class=\"title\">Module moduleFullName</h1>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1256 |
+ "</div>"); |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1257 |
checkOutput("index-all.html", !found, |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1258 |
"<dl>\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1259 |
+ "<dt><a href=\"test.moduleFullName/module-summary.html\">moduleFullName</a> - module moduleFullName</dt>\n" |
45771
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1260 |
+ "<dd>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1261 |
+ "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1262 |
+ "</dd>\n" |
e447c20c3ff9
8182736: javadoc generates bad names and broken module graph links
jjg
parents:
45157
diff
changeset
|
1263 |
+ "</dl>"); |
47300
a905ce398074
8074407: javadoc: using <pre> after @deprecated tag causes warnings
bpatel
parents:
47299
diff
changeset
|
1264 |
} |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1265 |
|
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1266 |
void checkLinkOffline() { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1267 |
checkOutput("moduleB/testpkg3mdlB/package-summary.html", true, |
51861
f7d40158eb2f
8205593: Javadoc -link makes broken links if module name matches package name
pmuthuswamy
parents:
50895
diff
changeset
|
1268 |
"<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/String.html?is-external=true\" " |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1269 |
+ "title=\"class or interface in java.lang\" class=\"externalLink\"><code>Link to String Class</code></a>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1270 |
checkOutput("moduleB/testpkg3mdlB/package-summary.html", true, |
51861
f7d40158eb2f
8205593: Javadoc -link makes broken links if module name matches package name
pmuthuswamy
parents:
50895
diff
changeset
|
1271 |
"<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/package-summary.html?is-external=true\" " |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1272 |
+ "class=\"externalLink\"><code>Link to java.lang package</code></a>"); |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1273 |
checkOutput("moduleB/testpkg3mdlB/package-summary.html", true, |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
48654
diff
changeset
|
1274 |
"<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/module-summary.html?is-external=true\" " |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1275 |
+ "class=\"externalLink\"><code>Link to java.base module</code></a>"); |
54821 | 1276 |
} |
1277 |
||
1278 |
void checkLinkSource(boolean includePrivate) { |
|
1279 |
checkOutput("moduleA/module-summary.html", !includePrivate, |
|
1280 |
"<table>\n<caption><span>Exports</span><span class=\"tabEnd\"> </span></caption>\n" |
|
1281 |
+ "<thead>\n<tr>\n<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
|
1282 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n</tr>\n</thead>\n" |
|
1283 |
+ "<tbody>\n<tr class=\"altColor\" id=\"i0\">\n" |
|
1284 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n" |
|
1285 |
+ "<td class=\"colLast\"> </td>\n</tr>\n</tbody>\n</table>"); |
|
1286 |
checkOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", true, |
|
1287 |
"<section class=\"description\">\n<hr>\n" |
|
1288 |
+ "<pre>public class <a href=\"../../src-html/moduleA/testpkgmdlA/TestClassInModuleA.html#line.25\">" |
|
1289 |
+ "TestClassInModuleA</a>\nextends java.lang.Object</pre>\n</section>"); |
|
1290 |
checkOutput("src-html/moduleA/testpkgmdlA/TestClassInModuleA.html", true, |
|
1291 |
"<span class=\"sourceLineNo\">019</span><a id=\"line.19\"> * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</a>\n" |
|
1292 |
+ "<span class=\"sourceLineNo\">020</span><a id=\"line.20\"> * or visit www.oracle.com if you need additional information or have any</a>\n" |
|
1293 |
+ "<span class=\"sourceLineNo\">021</span><a id=\"line.21\"> * questions.</a>\n" |
|
1294 |
+ "<span class=\"sourceLineNo\">022</span><a id=\"line.22\"> */</a>\n" |
|
1295 |
+ "<span class=\"sourceLineNo\">023</span><a id=\"line.23\">package testpkgmdlA;</a>\n" |
|
1296 |
+ "<span class=\"sourceLineNo\">024</span><a id=\"line.24\"></a>\n" |
|
1297 |
+ "<span class=\"sourceLineNo\">025</span><a id=\"line.25\">public class TestClassInModuleA {</a>\n" |
|
1298 |
+ "<span class=\"sourceLineNo\">026</span><a id=\"line.26\">}</a>"); |
|
1299 |
if (includePrivate) { |
|
1300 |
checkOutput("src-html/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.html", true, |
|
1301 |
"<span class=\"sourceLineNo\">024</span><a id=\"line.24\">package concealedpkgmdlA;</a>\n" |
|
1302 |
+ "<span class=\"sourceLineNo\">025</span><a id=\"line.25\"></a>\n" |
|
1303 |
+ "<span class=\"sourceLineNo\">026</span><a id=\"line.26\">public class ConcealedClassInModuleA {</a>\n" |
|
1304 |
+ "<span class=\"sourceLineNo\">027</span><a id=\"line.27\"> public void testMethodConcealedClass() { }</a>\n" |
|
1305 |
+ "<span class=\"sourceLineNo\">028</span><a id=\"line.28\">}</a>"); |
|
1306 |
} |
|
1307 |
} |
|
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1308 |
|
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1309 |
void checkAllPkgsAllClasses(boolean found) { |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1310 |
checkOutput("allclasses-index.html", true, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1311 |
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1312 |
+ " aria-selected=\"true\" aria-controls=\"typeSummary_tabpanel\" tabindex=\"0\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1313 |
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Classes</button>" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1314 |
+ "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"typeSummary_tabpanel\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1315 |
+ " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1316 |
+ " onclick=\"show(2);\">Class Summary</button><button role=\"tab\" aria-selected=\"false\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1317 |
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\"" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1318 |
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n", |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1319 |
"<thead>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1320 |
+ "<tr>\n" |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1321 |
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n" |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1322 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1323 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1324 |
+ "</thead>\n"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1325 |
checkOutput("allpackages-index.html", true, |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1326 |
"<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1327 |
+ "<thead>\n" |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1328 |
+ "<tr>\n" |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1329 |
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n" |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1330 |
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n" |
54137
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1331 |
+ "</tr>\n" |
943cfab99051
8219691: method summary table head should be enclosed in <thead>
jjg
parents:
53991
diff
changeset
|
1332 |
+ "</thead>"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1333 |
checkOutput("allclasses-index.html", found, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1334 |
"<table aria-labelledby=\"t0\">\n"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1335 |
checkOutput("allpackages-index.html", found, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1336 |
"<div class=\"packagesSummary\">\n<table>\n"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1337 |
checkOutput("allclasses-index.html", !found, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1338 |
"<table summary=\"Class Summary table, listing classes, and an explanation\" aria-labelledby=\"t0\">"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1339 |
checkOutput("allpackages-index.html", !found, |
52616
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1340 |
"<div class=\"packagesSummary\">\n" |
1a395165c09b
8184205: Captions on tabbed tables are squashed together
pmuthuswamy
parents:
51895
diff
changeset
|
1341 |
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">"); |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1342 |
checkOutput("type-search-index.js", true, |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1343 |
"{\"l\":\"All Classes\",\"url\":\"allclasses-index.html\"}"); |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1344 |
checkOutput("package-search-index.js", true, |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1345 |
"{\"l\":\"All Packages\",\"url\":\"allpackages-index.html\"}"); |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1346 |
checkOutput("index-all.html", true, |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1347 |
"<br><a href=\"allclasses-index.html\">All Classes</a> " |
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1348 |
+ "<a href=\"allpackages-index.html\">All Packages</a>"); |
48295
c79d31ba84b9
8164407: Add module support for -link and -linkoffline javadoc option
bpatel
parents:
47861
diff
changeset
|
1349 |
} |
50167
cc705c956798
8196201: Generate pages to list all classes and all packages in javadoc output
bpatel
parents:
50118
diff
changeset
|
1350 |
} |