Store all classes that should be initialized at buildtime for earlier JDKs in a separate file

Author: dnestoro

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

@@ -44,6 +44,7 @@
 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;
@@ -58,7 +59,10 @@
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.platform.launcher.listeners.UniqueIdTrackingListener;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -99,6 +103,12 @@ 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) {
+            initializeClassesForJDKsBefore21();
+        }
+
         List<? extends DiscoverySelector> selectors = getSelectors();
         registerTestClassesForReflection(selectors);
 
@@ -221,4 +231,15 @@ private static Class<?> findClassOrNull(ClassLoader loader, String className) {
             return null;
         }
     }
+
+    private static void initializeClassesForJDKsBefore21() {
+        try (InputStream is = JUnitPlatformFeature.class.getResourceAsStream("/initialize-at-buildtime")) {
+            if (is != null) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                br.lines().forEach(RuntimeClassInitialization::initializeAtBuildTime);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -201,7 +201,7 @@ private static Path getTestIDsFromDefaultLocations() {
         System.out.println("[junit-platform-native] WARNING: -djunit.platform.listeners.uid.tracking.output.dir not specified, " +
                 "trying to find test-ids on default Gradle/Maven locations. " +
                 "As this is a fallback mode, it could take a while. " +
-                "This should only happen if you are running tests executable manually.");
+                "This should only happen if you are running tests executable manually and you didn't pass uid output directory with -djunit.platform.listeners.uid.tracking.output.dir=<path>.");
         Path defaultGradleTestIDsLocation = getGradleTestIdsDefaultLocation();
         Path defaultMavenTestIDsLocation = getMavenTestIDsDefaultLocation();
 

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

@@ -41,10 +41,6 @@
 
 package org.graalvm.junit.platform.config.core;
 
-import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
-
-import java.util.List;
-
 public abstract class PluginConfigProvider {
 
     protected ClassLoader applicationClassLoader;
@@ -59,10 +55,4 @@ 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

@@ -65,18 +65,8 @@
 
 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,22 +46,10 @@
 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

@@ -48,22 +48,11 @@
 
 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());

common/junit-platform-native/src/main/resources/initialize-at-buildtime

@@ -0,0 +1,55 @@
+org.junit.jupiter.api.condition.OS
+org.junit.jupiter.api.RandomOrdererUtils
+org.junit.jupiter.api.MethodOrderer$Random
+org.junit.jupiter.api.MethodOrderer$MethodName
+org.junit.jupiter.api.MethodOrderer$DisplayName
+org.junit.jupiter.params.provider.EnumSource$Mode
+org.junit.jupiter.engine.descriptor.DisplayNameUtils
+org.junit.jupiter.engine.descriptor.ClassTestDescriptor
+org.junit.jupiter.engine.descriptor.JupiterTestDescriptor
+org.junit.jupiter.engine.descriptor.JupiterTestDescriptor$1
+org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor
+org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor
+org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor
+org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor
+org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter
+org.junit.jupiter.engine.config.EnumConfigurationParameterConverter
+org.junit.jupiter.engine.execution.ConditionEvaluator
+org.junit.jupiter.engine.discovery.MethodFinder
+org.junit.jupiter.engine.discovery.MethodSelectorResolver
+org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType
+org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType$1
+org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType$2
+org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType$3
+org.junit.jupiter.engine.discovery.DiscoverySelectorResolver
+org.junit.jupiter.engine.discovery.AbstractOrderingVisitor
+org.junit.jupiter.engine.discovery.ClassOrderingVisitor
+org.junit.jupiter.engine.discovery.predicates.IsTestClassWithTests
+org.junit.platform.launcher.TestIdentifier
+org.junit.platform.launcher.EngineDiscoveryResult
+org.junit.platform.launcher.core.EngineFilterer
+org.junit.platform.launcher.core.EngineDiscoveryOrchestrator
+org.junit.platform.launcher.core.LauncherConfig
+org.junit.platform.launcher.core.LauncherConfigurationParameters
+org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners$LauncherDiscoveryListenerType
+org.junit.platform.engine.UniqueIdFormat
+org.junit.platform.engine.SelectorResolutionResult
+org.junit.platform.engine.support.discovery.SelectorResolver$Resolution
+org.junit.platform.commons.util.ClasspathScanner
+org.junit.platform.commons.util.ReflectionUtils
+org.junit.platform.commons.util.StringUtils
+org.junit.platform.commons.logging.LoggerFactory
+org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger
+org.junit.validator.PublicClassValidator
+org.junit.vintage.engine.discovery.DefensiveAllDefaultPossibilitiesBuilder
+org.junit.vintage.engine.discovery.VintageDiscoverer
+org.junit.vintage.engine.JUnit4VersionCheck
+org.junit.vintage.engine.support.UniqueIdStringifier
+org.junit.vintage.engine.support.UniqueIdReader
+org.junit.vintage.engine.descriptor.RunnerTestDescriptor
+org.junit.runner.Result
+org.junit.runner.Description
+org.junit.runners.BlockJUnit4ClassRunner
+org.junit.internal.runners.rules.RuleMemberValidator
+org.junit.runners.JUnit4
+java.beans.Introspector