Extend mx hellomodule to test --add-exports and --add-opens

Author: olpaw

substratevm/mx.substratevm/mx_substratevm.py

@@ -1156,7 +1156,11 @@ def hellomodule(args):
         # Build module into native image
         mx.log('Building image from java modules: ' + str(module_path))
         module_path_sep = ';' if mx.is_windows() else ':'
-        built_image = native_image(['--verbose', '-ea', '-H:Path=' + build_dir, '-p', module_path_sep.join(module_path), '-m', 'moduletests.hello.app'])
+        built_image = native_image([
+            '--verbose', '-ea', '-H:Path=' + build_dir,
+            '--add-exports=moduletests.hello.lib/hello.privateLib=moduletests.hello.app',
+            '--add-exports=moduletests.hello.lib/hello.privateLib2=moduletests.hello.app',
+            '-p', module_path_sep.join(module_path), '-m', 'moduletests.hello.app'])
         mx.log('Running image ' + built_image + ' built from module:')
         mx.run([built_image])
 

substratevm/src/native-image-module-tests/hello.app/pom.xml

@@ -50,6 +50,11 @@ questions.
                 <configuration>
                     <source>11</source>
                     <target>11</target>
+                    <compilerArgs>
+                        <arg>--add-exports=moduletests.hello.lib/hello.privateLib=moduletests.hello.app</arg>
+                        <arg>--add-exports=moduletests.hello.lib/hello.privateLib2=moduletests.hello.app</arg>
+                        <arg>--add-opens=moduletests.hello.lib/hello.privateLib2=moduletests.hello.app</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

substratevm/src/native-image-module-tests/hello.app/src/main/java/hello/Main.java

@@ -26,8 +26,11 @@
 
 import hello.lib.Greeter;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 public class Main {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Module helloAppModule = Main.class.getModule();
         assert helloAppModule.getName().equals("moduletests.hello.app");
         assert helloAppModule.isExported("hello");
@@ -41,5 +44,13 @@ public static void main(String[] args) {
 
         System.out.println("Basic Module test involving " + helloAppModule + " and " + helloLibModule);
         Greeter.greet();
+
+        System.out.println("Now accessing package that is not exported in " + helloLibModule);
+        hello.privateLib.Greeter.greet();
+
+        System.out.println("Now accessing private method from not exported package in " + helloLibModule);
+        Method greetMethod = hello.privateLib2.PrivateGreeter.class.getDeclaredMethod("greet");
+        greetMethod.setAccessible(true);
+        greetMethod.invoke(null);
     }
 }

substratevm/src/native-image-module-tests/hello.lib/src/main/java/hello/privateLib/Greeter.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package hello.privateLib;
+
+public class Greeter {
+    public static void greet() {
+        System.out.println("Seeing this requires --add-exports");
+    }
+}

substratevm/src/native-image-module-tests/hello.lib/src/main/java/hello/privateLib2/PrivateGreeter.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package hello.privateLib2;
+
+public class PrivateGreeter {
+    private static void greet() {
+        System.out.println("Seeing this requires --add-opens");
+    }
+}