--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/modules/JVMAddModulePackage.java	Thu Mar 17 19:04:01 2016 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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
+ * @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 { }
+}
+