Use several specific packages instead of one general when initializing at buildtime

Author: dnestoro

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/JUnitPlatformFeature.java

@@ -44,7 +44,6 @@
 import org.graalvm.junit.platform.config.core.PluginConfigProvider;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 
 import org.junit.platform.engine.DiscoverySelector;
@@ -100,13 +99,6 @@ public void duringSetup(DuringSetupAccess access) {
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
-        /* Before GraalVM version 22 we couldn't have classes initialized at run-time
-           that are also used at build-time but not added to the image heap */
-        if (Runtime.version().feature() <= 21) {
-            RuntimeClassInitialization.initializeAtBuildTime("org.junit");
-            RuntimeClassInitialization.initializeAtBuildTime("java");
-        }
-
         List<? extends DiscoverySelector> selectors = getSelectors();
         registerTestClassesForReflection(selectors);
 

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/core/PluginConfigProvider.java

@@ -41,6 +41,10 @@
 
 package org.graalvm.junit.platform.config.core;
 
+import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
+
+import java.util.List;
+
 public abstract class PluginConfigProvider {
 
     protected ClassLoader applicationClassLoader;
@@ -55,4 +59,10 @@ public final void initialize(ClassLoader classLoader, NativeImageConfiguration n
         applicationClassLoader = classLoader;
         nativeImageConfigImpl = nic;
     }
+
+    protected void initializeClassesForOlderJDKs(List<String> packages) {
+        if (Runtime.version().feature() <= 21) {
+            packages.forEach(RuntimeClassInitialization::initializeAtBuildTime);
+        }
+    }
 }

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/jupiter/JupiterConfigProvider.java

@@ -44,6 +44,7 @@
 import org.graalvm.junit.platform.config.core.NativeImageConfiguration;
 import org.graalvm.junit.platform.config.core.PluginConfigProvider;
 import org.graalvm.junit.platform.config.util.AnnotationUtils;
+import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.IndicativeSentencesGeneration;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -65,8 +66,18 @@
 
 public class JupiterConfigProvider extends PluginConfigProvider {
 
+    /* Before GraalVM version 22 we couldn't have classes initialized at run-time
+    that are also used at build-time but not added to the image heap */
+    private final List<String> packagesForOldInitializationStrategy = List.of(
+            "org.junit.jupiter.engine",
+            "org.junit.jupiter.api",
+            "org.junit.jupiter.params",
+            "java.beans.Introspector");
+
     @Override
     public void onLoad(NativeImageConfiguration config) {
+        initializeClassesForOlderJDKs(packagesForOldInitializationStrategy);
+
         /* Provide support for Timeout annotation */
         config.registerAllClassMembersForReflection(
                 "org.junit.jupiter.engine.extension.TimeoutExtension$ExecutorResource",

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java

@@ -46,11 +46,22 @@
 import org.graalvm.nativeimage.hosted.RuntimeSerialization;
 import org.junit.platform.launcher.TestIdentifier;
 
+import java.util.List;
+
 
 public class PlatformConfigProvider extends PluginConfigProvider {
 
+    /* Before GraalVM version 22 we couldn't have classes initialized at run-time
+    that are also used at build-time but not added to the image heap */
+    private final List<String> packagesForOldInitializationStrategy = List.of(
+            "org.junit.platform.engine",
+            "org.junit.platform.launcher",
+            "org.junit.platform.commons",
+            "org.junit.validator.PublicClassValidator");
+
     @Override
     public void onLoad(NativeImageConfiguration config) {
+        initializeClassesForOlderJDKs(packagesForOldInitializationStrategy);
         RuntimeSerialization.register(TestIdentifier.class.getDeclaredClasses());
     }
 

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/vintage/VintageConfigProvider.java

@@ -43,16 +43,28 @@
 
 import org.graalvm.junit.platform.config.core.NativeImageConfiguration;
 import org.graalvm.junit.platform.config.core.PluginConfigProvider;
+import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.hosted.RuntimeSerialization;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.List;
 
 public class VintageConfigProvider extends PluginConfigProvider {
 
+    /* Before GraalVM version 22 we couldn't have classes initialized at run-time
+    that are also used at build-time but not added to the image heap */
+    private final List<String> packagesForOldInitializationStrategy = List.of(
+            "org.junit.vintage.engine",
+            "org.junit.runner",
+            "org.junit.runners",
+            "org.junit.internal.runners.rules.RuleMemberValidator");
+
     @Override
     public void onLoad(NativeImageConfiguration config) {
+        initializeClassesForOlderJDKs(packagesForOldInitializationStrategy);
+
         try {
             RuntimeSerialization.register(Class.forName("org.junit.runner.Result").getDeclaredClasses());
             RuntimeReflection.register(Class.forName("org.junit.runner.Description").getDeclaredFields());

samples/junit-tests/gradle.properties

@@ -1 +1 @@
-native.gradle.plugin.version = 0.10.6-SNAPSHOT
+native.gradle.plugin.version = 0.10.7-SNAPSHOT

samples/junit-tests/pom.xml

@@ -52,8 +52,8 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.jupiter.version>5.11.0</junit.jupiter.version>
-        <native.maven.plugin.version>0.10.6-SNAPSHOT</native.maven.plugin.version>
-        <junit.platform.native.version>0.10.6-SNAPSHOT</junit.platform.native.version>
+        <native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
+        <junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
         <imageName>example-app</imageName>
     </properties>