8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Christian Tornqvist <christian.tornqvist@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: George Triantafillou <george.triantafillou@oracle.com>
Co-authored-by: Igor Ignatyev <igor.ignatyev@oracle.com>
Co-authored-by: Ioi Lam <ioi.lam@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jiangli Zhou <jiangli.zhou@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: acorn, ccheung, coleenp, ctornqvi, dholmes, dsimms, gtriantafill, iklam, jiangli, mgronlun, mseledtsov, cjplummer, sspitsyn, stefank, twisti, hseigel, lfoltan, alanb, mchung, dfazunen
2016-03-17 19:04:01 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2016, 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
|
2016-05-01 09:47:00 +00:00
|
|
|
* @modules java.base/jdk.internal.misc
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Christian Tornqvist <christian.tornqvist@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: George Triantafillou <george.triantafillou@oracle.com>
Co-authored-by: Igor Ignatyev <igor.ignatyev@oracle.com>
Co-authored-by: Ioi Lam <ioi.lam@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jiangli Zhou <jiangli.zhou@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: acorn, ccheung, coleenp, ctornqvi, dholmes, dsimms, gtriantafill, iklam, jiangli, mgronlun, mseledtsov, cjplummer, sspitsyn, stefank, twisti, hseigel, lfoltan, alanb, mchung, dfazunen
2016-03-17 19:04:01 +00:00
|
|
|
* @library /testlibrary /test/lib /compiler/whitebox ..
|
|
|
|
* @build sun.hotspot.WhiteBox
|
|
|
|
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
|
|
|
|
* @run main ClassFileInstaller sun.hotspot.WhiteBox
|
|
|
|
* sun.hotspot.WhiteBox$WhiteBoxPermission
|
|
|
|
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddModulePackage
|
|
|
|
*/
|
|
|
|
|
|
|
|
import static jdk.test.lib.Asserts.*;
|
|
|
|
|
|
|
|
public class JVMAddModulePackage {
|
|
|
|
|
|
|
|
public static void main(String args[]) throws Throwable {
|
|
|
|
MyClassLoader cl1 = new MyClassLoader();
|
|
|
|
MyClassLoader cl3 = new MyClassLoader();
|
|
|
|
Object module1, module2, module3;
|
|
|
|
boolean result;
|
|
|
|
|
|
|
|
module1 = ModuleHelper.ModuleObject("module1", cl1, new String[] { "mypackage" });
|
|
|
|
assertNotNull(module1, "Module should not be null");
|
|
|
|
ModuleHelper.DefineModule(module1, "9.0", "module1/here", new String[] { "mypackage" });
|
|
|
|
module2 = ModuleHelper.ModuleObject("module2", cl1, new String[] { "yourpackage" });
|
|
|
|
assertNotNull(module2, "Module should not be null");
|
|
|
|
ModuleHelper.DefineModule(module2, "9.0", "module2/here", new String[] { "yourpackage" });
|
|
|
|
module3 = ModuleHelper.ModuleObject("module3", cl3, new String[] { "package/num3" });
|
|
|
|
assertNotNull(module3, "Module should not be null");
|
|
|
|
ModuleHelper.DefineModule(module3, "9.0", "module3/here", new String[] { "package/num3" });
|
|
|
|
|
|
|
|
// Simple call
|
|
|
|
ModuleHelper.AddModulePackage(module1, "new_package");
|
|
|
|
|
|
|
|
// Add a package and export it
|
|
|
|
ModuleHelper.AddModulePackage(module1, "package/num3");
|
|
|
|
ModuleHelper.AddModuleExportsToAll(module1, "package/num3");
|
|
|
|
|
|
|
|
// Null module argument, expect an NPE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(null, "new_package");
|
|
|
|
throw new RuntimeException("Failed to get the expected NPE");
|
|
|
|
} catch(NullPointerException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bad module argument, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(cl1, "new_package");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Null package argument, expect an NPE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, null);
|
|
|
|
throw new RuntimeException("Failed to get the expected NPE");
|
|
|
|
} catch(NullPointerException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Existing package, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, "yourpackage");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalid package name, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, "your.package");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalid package name, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, ";your/package");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalid package name, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, "7[743");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
// Empty package name, expect an IAE
|
|
|
|
try {
|
|
|
|
ModuleHelper.AddModulePackage(module1, "");
|
|
|
|
throw new RuntimeException("Failed to get the expected IAE");
|
|
|
|
} catch(IllegalArgumentException e) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static class MyClassLoader extends ClassLoader { }
|
|
|
|
}
|
|
|
|
|