8340004: [TestBug] Call ModuleLayer.Controller::enableNativeAccess directly rather than via reflection

Reviewed-by: angorya

Author: Ziad El Midaoui

tests/system/src/testapp7/java/mymod/myapp7/DataUrlWithModuleLayerLauncher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, 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
@@ -73,19 +73,13 @@ public void run() {
         Configuration cf = parent.configuration().resolve(finder, ModuleFinder.of(), Set.of("mymod"));
         ClassLoader scl = ClassLoader.getSystemClassLoader();
         ModuleLayer.Controller controller = ModuleLayer.defineModulesWithOneLoader(cf, List.of(parent), scl);
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        Method enableNativeAccessMethod = ModuleLayer.Controller.class.getMethod("enableNativeAccess", Module.class);
         ModuleLayer layer = controller.layer();
         ClassLoader moduleClassLoader = layer.findLoader("mymod");
         Class appClass = moduleClassLoader.loadClass("javafx.application.Application");
         Class webClass = moduleClassLoader.loadClass("javafx.scene.web.WebView");
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        //controller.enableNativeAccess(webClass.getModule());
-        enableNativeAccessMethod.invoke(controller, new Object[]{webClass.getModule()});
+        controller.enableNativeAccess(webClass.getModule());
         Class testClass = moduleClassLoader.loadClass("myapp7.DataUrlWithModuleLayer");
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        //controller.enableNativeAccess(appClass.getModule());
-        enableNativeAccessMethod.invoke(controller, new Object[]{appClass.getModule()});
+        controller.enableNativeAccess(appClass.getModule());
         Method launchMethod = appClass.getMethod("launch", Class.class, String[].class);
         launchMethod.invoke(null, new Object[]{testClass, args});
         System.exit(DataUrlWithModuleLayer.ERROR_UNEXPECTED_EXIT);

tests/system/src/testapp7/java/mymod/myapp7/LocalStorageAccessWithModuleLayerLauncher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, 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
@@ -73,18 +73,12 @@ public void run() {
         Configuration cf = parent.configuration().resolve(finder, ModuleFinder.of(), Set.of("mymod"));
         ClassLoader scl = ClassLoader.getSystemClassLoader();
         ModuleLayer.Controller controller = ModuleLayer.defineModulesWithOneLoader(cf, List.of(parent), scl);
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        Method enableNativeAccessMethod = ModuleLayer.Controller.class.getMethod("enableNativeAccess", Module.class);
         ModuleLayer layer = controller.layer();
         ClassLoader moduleClassLoader = layer.findLoader("mymod");
         Class webClass = moduleClassLoader.loadClass("javafx.scene.web.WebView");
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        //controller.enableNativeAccess(webClass.getModule());
-        enableNativeAccessMethod.invoke(controller, new Object[]{webClass.getModule()});
+        controller.enableNativeAccess(webClass.getModule());
         Class appClass = moduleClassLoader.loadClass("javafx.application.Application");
-        // Remove reflection once JDK 22 is minimum. See JDK-8340004.
-        //controller.enableNativeAccess(appClass.getModule());
-        enableNativeAccessMethod.invoke(controller, new Object[]{appClass.getModule()});
+        controller.enableNativeAccess(appClass.getModule());
         Class testClass = moduleClassLoader.loadClass("myapp7.LocalStorageAccessWithModuleLayer");
         Method launchMethod = appClass.getMethod("launch", Class.class, String[].class);
         launchMethod.invoke(null, new Object[]{testClass, args});