author | jjg |
Wed, 07 Feb 2018 11:28:23 -0800 | |
changeset 48759 | ffa68af7da87 |
parent 47216 | 71c04702a3d5 |
child 49139 | 771616d26ca1 |
permissions | -rw-r--r-- |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
1 |
/* |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
4 |
* |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
8 |
* |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
13 |
* accompanied this code). |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
14 |
* |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
18 |
* |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
21 |
* questions. |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
22 |
*/ |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
23 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
24 |
/* |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
25 |
* @test |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
26 |
* @bug 8178339 |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
27 |
* @summary Tests indirect exports and opens in the module summary page |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
28 |
* @modules jdk.javadoc/jdk.javadoc.internal.api |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
29 |
* jdk.javadoc/jdk.javadoc.internal.tool |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.api |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.main |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
32 |
* @library ../lib /tools/lib |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
33 |
* @build toolbox.ToolBox toolbox.ModuleBuilder JavadocTester |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
34 |
* @run main TestIndirectExportsOpens |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
35 |
*/ |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
36 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
37 |
import java.nio.file.Path; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
38 |
import java.nio.file.Paths; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
39 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
40 |
import toolbox.*; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
41 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
42 |
public class TestIndirectExportsOpens extends JavadocTester { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
43 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
44 |
public final ToolBox tb; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
45 |
public static void main(String... args) throws Exception { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
46 |
TestIndirectExportsOpens tester = new TestIndirectExportsOpens(); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
47 |
tester.runTests(m -> new Object[] { Paths.get(m.getName()) }); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
48 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
49 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
50 |
public TestIndirectExportsOpens() { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
51 |
tb = new ToolBox(); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
52 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
53 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
54 |
@Test |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
55 |
public void checkNoIndirects(Path base) throws Exception { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
56 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
57 |
ModuleBuilder mb0 = new ModuleBuilder(tb, "m") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
58 |
.classes("package pm; public class A {}"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
59 |
Path p0 = mb0.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
60 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
61 |
ModuleBuilder mb1 = new ModuleBuilder(tb, "a") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
62 |
.requiresTransitive("m", p0) |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
63 |
.classes("package pa; public class NoOp {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
64 |
.exports("pa"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
65 |
mb1.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
66 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
67 |
javadoc("-d", base.resolve("out-api").toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
68 |
"-quiet", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
69 |
"--module-source-path", base.toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
70 |
"--expand-requires", "transitive", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
71 |
"--module", "a"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
72 |
checkExit(Exit.OK); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
73 |
verifyIndirectExports(false); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
74 |
verifyIndirectOpens(false); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
75 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
76 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
77 |
@Test |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
78 |
public void checkExportsOpens(Path base) throws Exception { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
79 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
80 |
ModuleBuilder mb0 = new ModuleBuilder(tb, "m") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
81 |
.classes("package pm; public class A {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
82 |
.exports("pm") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
83 |
.opens("pm"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
84 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
85 |
Path p0 = mb0.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
86 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
87 |
ModuleBuilder mb1 = new ModuleBuilder(tb, "a") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
88 |
.requiresTransitive("m", p0) |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
89 |
.classes("package pa ; public class NoOp {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
90 |
.exports("pa"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
91 |
mb1.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
92 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
93 |
javadoc("-d", base.resolve("out-api").toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
94 |
"-quiet", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
95 |
"--module-source-path", base.toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
96 |
"--expand-requires", "transitive", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
97 |
"--module", "a"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
98 |
checkExit(Exit.OK); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
99 |
verifyIndirectExports(true); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
100 |
verifyIndirectOpens(true); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
101 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
102 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
103 |
@Test |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
104 |
public void checkExportsToOpensTo(Path base) throws Exception { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
105 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
106 |
ModuleBuilder mb0 = new ModuleBuilder(tb, "m") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
107 |
.classes("package pm; public class A {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
108 |
.exportsTo("pm", "x") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
109 |
.opensTo("pm", "x"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
110 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
111 |
Path p0 = mb0.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
112 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
113 |
ModuleBuilder mb1 = new ModuleBuilder(tb, "a") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
114 |
.requiresTransitive("m", p0) |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
115 |
.classes("package pa ; public class NoOp {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
116 |
.exports("pa"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
117 |
mb1.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
118 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
119 |
javadoc("-d", base.resolve("out-api").toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
120 |
"-quiet", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
121 |
"--module-source-path", base.toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
122 |
"--expand-requires", "transitive", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
123 |
"--module", "a"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
124 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
125 |
checkExit(Exit.OK); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
126 |
verifyIndirectExports(false); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
127 |
verifyIndirectOpens(false); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
128 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
129 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
130 |
@Test |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
131 |
public void checkExportsToOpensToDetailMode(Path base) throws Exception { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
132 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
133 |
ModuleBuilder mb0 = new ModuleBuilder(tb, "m") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
134 |
.classes("package exportsto; public class A {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
135 |
.classes("package opensto; public class A {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
136 |
.exportsTo("exportsto", "x") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
137 |
.opensTo("opensto", "x"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
138 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
139 |
Path p0 = mb0.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
140 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
141 |
ModuleBuilder mb1 = new ModuleBuilder(tb, "a") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
142 |
.requiresTransitive("m", p0) |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
143 |
.classes("package pa ; public class NoOp {}") |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
144 |
.exports("pa"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
145 |
mb1.write(base); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
146 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
147 |
javadoc("-d", base.resolve("out-detail").toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
148 |
"-quiet", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
149 |
"--module-source-path", base.toString(), |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
150 |
"--expand-requires", "transitive", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
151 |
"--show-module-contents", "all", |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
152 |
"--module", "a"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
153 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
154 |
checkExit(Exit.OK); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
155 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
156 |
// In details mode all kinds of packages from java.base, |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
157 |
// could be listed in the indirects section, so just |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
158 |
// check for minimal expected strings. |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
159 |
checkOutput("a/module-summary.html", true, |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
160 |
"Indirect Exports table", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
161 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
162 |
+ "<td class=\"colLast\"><a href=\"../m/exportsto/package-summary.html\">exportsto</a></td>\n" |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
163 |
+ "</tr>\n"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
164 |
|
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
165 |
checkOutput("a/module-summary.html", true, |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
166 |
"Indirect Opens table", |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
167 |
"<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
168 |
+ "<td class=\"colLast\">opensto</td>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
169 |
+ "</tr>\n"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
170 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
171 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
172 |
void verifyIndirectExports(boolean present) { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
173 |
verifyIndirects(present, false); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
174 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
175 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
176 |
void verifyIndirectOpens(boolean present) { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
177 |
verifyIndirects(present, true); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
178 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
179 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
180 |
void verifyIndirects(boolean present, boolean opens) { |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
181 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
182 |
String typeString = opens ? "Indirect Opens" : "Indirect Exports"; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
183 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
184 |
// Avoid false positives, just check for primary string absence. |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
185 |
if (!present) { |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
186 |
checkOutput("a/module-summary.html", false, typeString); |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
187 |
return; |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
188 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
189 |
|
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
190 |
checkOutput("a/module-summary.html", present, |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
191 |
"<table class=\"packagesSummary\" summary=\"" + typeString + " table, listing modules, and packages\">\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
192 |
+ "<caption><span>" + typeString + "</span><span class=\"tabEnd\"> </span></caption>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
193 |
+ "<tr>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
194 |
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
195 |
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
196 |
+ "</tr>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
197 |
+ "<tbody>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
198 |
+ "<tr class=\"altColor\">\n" |
48759
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
199 |
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n" |
ffa68af7da87
8195795: Organize output files by module/package, not just package
jjg
parents:
47216
diff
changeset
|
200 |
+ "<td class=\"colLast\"><a href=\"../m/pm/package-summary.html\">pm</a></td>\n" |
44807
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
201 |
+ "</tr>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
202 |
+ "</tbody>\n" |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
203 |
+ "</table>\n"); |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
204 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
205 |
|
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
206 |
} |
47e09e3f1829
8178339: javadoc includes qualified opens in "Additional Opened Packages" section
ksrini
parents:
diff
changeset
|
207 |