author | alanb |
Fri, 10 Feb 2017 09:03:55 +0000 | |
changeset 43665 | 4bb003cad9b9 |
parent 40631 | ed82623d7831 |
child 45112 | fbec2bfa3839 |
permissions | -rw-r--r-- |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
1 |
/* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
2 |
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
4 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
8 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
13 |
* accompanied this code). |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
14 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
18 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
21 |
* questions. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
22 |
*/ |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
23 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
24 |
/* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
25 |
* @test |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
26 |
* @summary Ensure that a newly introduced java.base package placed within the --patch-module |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
27 |
* directory is considered part of the boot loader's visibility boundary |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
28 |
* @requires !(os.family == "windows") |
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
29 |
* @library /test/lib |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
30 |
* @modules java.base/jdk.internal.misc |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
31 |
* java.management |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
32 |
* @run main/othervm PatchModuleVisibility |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
33 |
*/ |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
34 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
35 |
import java.io.File; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
36 |
import java.nio.file.Files; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
37 |
import java.nio.file.Paths; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
38 |
|
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
39 |
import jdk.test.lib.InMemoryJavaCompiler; |
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
40 |
import jdk.test.lib.process.OutputAnalyzer; |
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
41 |
import jdk.test.lib.process.ProcessTools; |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
42 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
43 |
public class PatchModuleVisibility { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
44 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
45 |
public static void main(String[] args) throws Throwable { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
46 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
47 |
String Vis2_B_src = |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
48 |
"package p2;" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
49 |
"public class Vis2_B {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
50 |
" public void m() {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
51 |
" System.out.println(\"In B's m()\");" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
52 |
" }" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
53 |
"}"; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
54 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
55 |
String Vis2_A_src = |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
56 |
"import p2.*;" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
57 |
"public class Vis2_A {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
58 |
" public static void main(String args[]) throws Exception {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
59 |
// Try loading a class within a newly introduced java.base |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
60 |
// package. Make sure the class can be found via --patch-module. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
61 |
" try {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
62 |
" p2.Vis2_B b = new p2.Vis2_B();" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
63 |
" if (b.getClass().getClassLoader() != null) {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
64 |
" throw new RuntimeException(\"PatchModuleVisibility FAILED - class B " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
65 |
"should be loaded by boot class loader\\n\");" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
66 |
" }" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
67 |
" b.m();" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
68 |
" } catch (Throwable e) {" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
69 |
" throw new RuntimeException(\"PatchModuleVisibility FAILED - test " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
70 |
"should not throw an error or exception\\n\");" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
71 |
" }" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
72 |
" System.out.println(\"PatchModuleVisibility PASSED\\n\");" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
73 |
" }" + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
74 |
"}"; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
75 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
76 |
ClassFileInstaller.writeClassToDisk("p2/Vis2_B", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
77 |
InMemoryJavaCompiler.compile("p2.Vis2_B", Vis2_B_src), System.getProperty("test.classes")); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
78 |
ClassFileInstaller.writeClassToDisk("p2/Vis2_B", "mods2/java.base"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
79 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
80 |
ClassFileInstaller.writeClassToDisk("Vis2_A", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
81 |
InMemoryJavaCompiler.compile("Vis2_A", Vis2_A_src), System.getProperty("test.classes")); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
82 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
83 |
// Make sure the classes are actually being loaded from mods2 |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
84 |
Files.delete(Paths.get(System.getProperty("test.classes") + File.separator + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
85 |
"p2" + File.separator + "Vis2_B.class")); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
86 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
87 |
new OutputAnalyzer(ProcessTools.createJavaProcessBuilder( |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
88 |
"--patch-module=java.base=mods2/java.base", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
89 |
"--add-exports=java.base/p2=ALL-UNNAMED", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
90 |
"Vis2_A") |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
91 |
.start()).shouldHaveExitValue(0); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
92 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
93 |
} |