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
|
/*
* Copyright (c) 2021, 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
* @library /test/lib
* @modules jdk.compiler
* @build PatchTest
* jdk.test.lib.compiler.CompilerUtils
* jdk.test.lib.util.JarUtils
* jdk.test.lib.process.ProcessTools
* @run testng PatchTest
* @bug 8259395
* @summary Tests patching an automatic module
*/
import java.io.File;
import java.util.List;
import java.nio.file.Files;
import java.nio.file.Path;
import jdk.test.lib.compiler.CompilerUtils;
import jdk.test.lib.util.JarUtils;
import static jdk.test.lib.process.ProcessTools.*;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
import static org.testng.Assert.*;
public class PatchTest {
private static final String APP_NAME = "myapp";
private static final String MODULE_NAME = "somelib";
private static final String EXTEND_PATCH_NAME = "patch1";
private static final String AUGMENT_PATCH_NAME = "patch2";
private static final String APP_MAIN = "myapp.Main";
private static final String EXTEND_PATCH_MAIN = "somelib.test.TestMain";
private static final String AUGMENT_PATCH_MAIN = "somelib.Dummy";
private static final String TEST_SRC = System.getProperty("test.src");
private static final Path APP_SRC = Path.of(TEST_SRC, APP_NAME);
private static final Path APP_CLASSES = Path.of("classes", APP_NAME);
private static final Path SOMELIB_SRC = Path.of(TEST_SRC, MODULE_NAME);
private static final Path SOMELIB_EXTEND_PATCH_SRC = Path.of(TEST_SRC, EXTEND_PATCH_NAME);
private static final Path SOMELIB_AUGMENT_PATCH_SRC = Path.of(TEST_SRC, AUGMENT_PATCH_NAME);
private static final Path SOMELIB_CLASSES = Path.of("classes", MODULE_NAME);
private static final Path SOMELIB_EXTEND_PATCH_CLASSES = Path.of("classes", EXTEND_PATCH_NAME);
private static final Path SOMELIB_AUGMENT_PATCH_CLASSES = Path.of("classes", AUGMENT_PATCH_NAME);
private static final Path SOMELIB_JAR = Path.of("mods", MODULE_NAME + "-0.19.jar");
private static final String MODULE_PATH = String.join(File.pathSeparator, SOMELIB_JAR.toString(), APP_CLASSES.toString());
/**
* The test consists of 2 modules:
*
* somelib - dummy automatic module.
* myapp - explicit module, uses somelib
*
* And two patches:
*
* patch1 - adds an additional package. (extend)
* patch2 - only replaces existing classes. (augment)
*
*/
@BeforeClass
public void compile() throws Exception {
boolean compiled;
// create mods/somelib-0.19.jar
compiled = CompilerUtils.compile(SOMELIB_SRC, SOMELIB_CLASSES);
assertTrue(compiled);
JarUtils.createJarFile(SOMELIB_JAR, SOMELIB_CLASSES);
// compile patch 1
compiled = CompilerUtils.compile(SOMELIB_EXTEND_PATCH_SRC, SOMELIB_EXTEND_PATCH_CLASSES,
"--module-path", SOMELIB_JAR.toString(),
"--add-modules", MODULE_NAME,
"--patch-module", MODULE_NAME + "=" + SOMELIB_EXTEND_PATCH_SRC);
assertTrue(compiled);
// compile patch 2
compiled = CompilerUtils.compile(SOMELIB_AUGMENT_PATCH_SRC, SOMELIB_AUGMENT_PATCH_CLASSES,
"--module-path", SOMELIB_JAR.toString(),
"--add-modules", MODULE_NAME,
"--patch-module", MODULE_NAME + "=" + SOMELIB_AUGMENT_PATCH_SRC);
assertTrue(compiled);
// compile app
compiled = CompilerUtils.compile(APP_SRC, APP_CLASSES,
"--module-path", SOMELIB_JAR.toString());
assertTrue(compiled);
}
@Test
public void testExtendAutomaticModuleOnModulePath() throws Exception {
int exitValue
= executeTestJava("--module-path", MODULE_PATH,
"--patch-module", MODULE_NAME + "=" + SOMELIB_EXTEND_PATCH_CLASSES,
"-m", APP_NAME + "/" + APP_MAIN, "patch1")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
@Test
public void testAugmentAutomaticModuleOnModulePath() throws Exception {
int exitValue
= executeTestJava("--module-path", MODULE_PATH,
"--patch-module", MODULE_NAME + "=" + SOMELIB_AUGMENT_PATCH_CLASSES,
"-m", APP_NAME + "/" + APP_MAIN, "patch2")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
@Test
public void testExtendAutomaticModuleAsInitialModule() throws Exception {
int exitValue
= executeTestJava("--module-path", SOMELIB_JAR.toString(),
"--patch-module", MODULE_NAME + "=" + SOMELIB_EXTEND_PATCH_CLASSES,
"-m", MODULE_NAME + "/" + EXTEND_PATCH_MAIN)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
@Test
public void testAugmentAutomaticModuleAsInitialModule() throws Exception {
int exitValue
= executeTestJava("--module-path", SOMELIB_JAR.toString(),
"--patch-module", MODULE_NAME + "=" + SOMELIB_AUGMENT_PATCH_CLASSES,
"-m", MODULE_NAME + "/" + AUGMENT_PATCH_MAIN)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
}
|
