1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 8175346
* @summary Test patch module options
* @modules
* jdk.javadoc/jdk.javadoc.internal.api
* jdk.javadoc/jdk.javadoc.internal.tool
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @library /tools/lib
* @build toolbox.ToolBox toolbox.TestRunner
* @run main PatchModules
*/
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.*;
public class PatchModules extends ModuleTestBase {
public static void main(String... args) throws Exception {
new PatchModules().runTests();
}
// Case A.1, m2 augmenting m1
@Test
public void testPatchModuleOption(Path base) throws Exception {
Path src = base.resolve("src");
Path modulePath = base.resolve("modules");
Path patchPath = base.resolve("patch");
ModuleBuilder mb1 = new ModuleBuilder(tb, "m1");
mb1.comment("Module on module path.")
.exports("pkg1")
.classes("package pkg1; /** Class A */ public class A { }")
.build(modulePath);
tb.writeJavaFiles(patchPath, "package pkg1; /** Class A */ public class A { public static int k; }");
new JavacTask(tb)
.files(patchPath.resolve("pkg1/A.java"))
.run();
ModuleBuilder mb2 = new ModuleBuilder(tb, "m2");
mb2.comment("The second module.")
.exports("pkg2")
.requires("m1")
.classes("package pkg2; /** Class B */ public class B { /** Field f */ public int f = pkg1.A.k; }")
.write(src);
execTask("--module-source-path", src.toString(),
"--patch-module", "m1=" + patchPath.toString(),
"--module-path", modulePath.toString(),
"--module", "m2");
checkModulesSpecified("m2");
checkPackagesIncluded("pkg2");
checkMembersSelected("pkg2.B.f");
}
// Case A.2: use package, source form of m1 augmenting binary form of m1
@Test
public void testPatchModuleWithPackage(Path base) throws Exception {
Path modulePath = base.resolve("modules");
Path moduleSrcPath = base.resolve("modulesSrc");
Path mpath = Paths.get(moduleSrcPath.toString(), "m1");
ModuleBuilder mb1 = new ModuleBuilder(tb, "m1");
mb1.comment("Module m1.")
.exports("pkg1")
.classes("package pkg1; /** Class A */ public class A { }")
.classes("package pkg1.pkg2; /** Class B */ public class B { }")
.build(modulePath);
execTask("-hasDocComments",
"--module-path", modulePath.toString(),
"--add-modules", "m1",
"--patch-module", "m1=" + mpath.toString(),
"pkg1");
checkTypesIncluded("pkg1.A hasDocComments");
}
// Case A.2: use subpackages, source form of m1 augmenting binary form of m1
@Test
public void testPatchModuleWithSubPackages(Path base) throws Exception {
Path modulePath = base.resolve("modules");
Path moduleSrcPath = base.resolve("modulesSrc");
Path mpath = Paths.get(moduleSrcPath.toString(), "m1");
ModuleBuilder mb1 = new ModuleBuilder(tb, "m1");
mb1.comment("Module m1.")
.exports("pkg1")
.classes("package pkg1; /** Class A */ public class A { }")
.classes("package pkg1.pkg2; /** Class B */ public class B { }")
.build(modulePath);
execTask("-hasDocComments",
"--module-path", modulePath.toString(),
"--add-modules", "m1",
"--patch-module", "m1=" + mpath.toString(),
"-subpackages", "pkg1");
checkTypesIncluded("pkg1.A hasDocComments");
checkTypesIncluded("pkg1.pkg2.B hasDocComments");
}
// Case B.1: (jsr166) augment and override system module
@Test
public void testPatchModuleModifyingSystemModule(Path base) throws Exception {
Path patchSrc = base.resolve("patch");
// build the patching sources
tb.writeJavaFiles(patchSrc, "package java.util;\n" +
"/** Class Collection */\n" +
"public interface Collection<K> {}");
tb.writeJavaFiles(patchSrc, "package java.util;\n"
+ "/** Class MyCollection */\n" +
"public interface MyCollection<K> extends Collection {}");
execTask("-hasDocComments", "--patch-module", "java.base=" + patchSrc.toString(),
"java.util");
checkPackagesSpecified("java.util");
checkTypesIncluded("java.util.Collection hasDocComments",
"java.util.MyCollection hasDocComments");
}
// Case C.1: patch a user module's sources using source path
@Test
public void testPatchModuleUsingSourcePath(Path base) throws Exception {
Path src = base.resolve("src");
Path patchSrc = base.resolve("patch");
ModuleBuilder mb1 = new ModuleBuilder(tb, "m1");
mb1.comment("Module m1.")
.exports("pkg1")
.classes("package pkg1; /** Class A */ public class A { }")
.write(src);
// build the patching module
tb.writeJavaFiles(patchSrc, "package pkg1;\n" +
"/** Class A */ public class A extends java.util.ArrayList { }");
tb.writeJavaFiles(patchSrc, "package pkg1;\n"
+ "/** Class B */ public class B { }");
Path m1src = Paths.get(src.toString(), "m1");
execTask("--source-path", m1src.toString(),
"--patch-module", "m1=" + patchSrc.toString(),
"pkg1");
checkPackagesSpecified("pkg1");
checkModulesIncluded("m1");
checkTypesIncluded("pkg1.A", "pkg1.B");
}
// Case C.2: patch a user module's sources using module source path
@Test
public void testPatchModuleWithModuleSourcePath(Path base) throws Exception {
Path src = base.resolve("src");
Path patchSrc = base.resolve("patch");
ModuleBuilder mb1 = new ModuleBuilder(tb, "m1");
mb1.comment("Module on module-source-path.")
.exports("pkg1")
.classes("package pkg1; /** Class A */ public class A { }")
.write(src);
// build the patching module
tb.writeJavaFiles(patchSrc, "package pkg1;\n" +
"/** Class A */ public class A extends java.util.ArrayList { }");
tb.writeJavaFiles(patchSrc, "package pkg1;\n"
+ "/** Class B */ public class B { }");
execTask("--module-source-path", src.toString(),
"--add-modules", "m1",
"--patch-module", "m1=" + patchSrc.toString(),
"pkg1");
checkPackagesSpecified("pkg1");
checkModulesIncluded("m1");
checkTypesIncluded("pkg1.A", "pkg1.B");
}
}
|
