Provide support for earlier JUnit versions without JUnit duplicates on claspath

Author: dnestoro

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

@@ -264,7 +264,13 @@ private static void initializeClassesForJDK21OrEarlier() {
         try (InputStream is = JUnitPlatformFeature.class.getResourceAsStream("/initialize-at-buildtime")) {
             if (is != null) {
                 try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
-                    br.lines().forEach(RuntimeClassInitialization::initializeAtBuildTime);
+                    br.lines().forEach(cls -> {
+                        try {
+                            RuntimeClassInitialization.initializeAtBuildTime(cls);
+                        } catch (NoClassDefFoundError e) {
+                            // if users use older JUnit versions some classes might not be available
+                        }
+                    });
                 }
             }
         } catch (IOException e) {

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

@@ -54,8 +54,8 @@
 import org.junit.jupiter.params.converter.ConvertWith;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.FieldSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -86,9 +86,15 @@ public void onTestClassRegistered(Class<?> testClass, NativeImageConfiguration r
         AnnotationUtils.forEachAnnotatedMethodParameter(testClass, AggregateWith.class, annotation -> registry.registerAllClassMembersForReflection(annotation.value()));
         AnnotationUtils.forEachAnnotatedMethod(testClass, EnumSource.class, (m, annotation) -> handleEnumSource(m, annotation, registry));
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, MethodSource.class, JupiterConfigProvider::handleMethodSource);
-        AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, FieldSource.class, JupiterConfigProvider::handleFieldSource);
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, EnabledIf.class, JupiterConfigProvider::handleEnabledIf);
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, DisabledIf.class, JupiterConfigProvider::handleDisabledIf);
+
+        try {
+            AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, FieldSource.class, JupiterConfigProvider::handleFieldSource);
+        } catch (NoClassDefFoundError e) {
+            // if users use JUnit version older than 5.11, FieldSource class won't be available
+        }
+
     }
 
     private static Class<?>[] handleMethodSource(MethodSource annotation) {

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

@@ -46,6 +46,7 @@ org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType$3
 org.junit.jupiter.engine.discovery.predicates.IsTestClassWithTests
 org.junit.jupiter.engine.discovery.predicates.IsTestFactoryMethod
 org.junit.jupiter.engine.execution.ConditionEvaluator
+org.junit.jupiter.engine.execution.ExecutableInvoker
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall$VoidMethodInterceptorCall
@@ -78,6 +79,7 @@ org.junit.platform.launcher.core.DiscoveryIssueNotifier
 org.junit.platform.launcher.core.EngineDiscoveryOrchestrator
 org.junit.platform.launcher.core.EngineExecutionOrchestrator
 org.junit.platform.launcher.core.EngineFilterer
+org.junit.platform.launcher.core.EngineIdValidator
 org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
 org.junit.platform.launcher.core.InternalTestPlan
 org.junit.platform.launcher.core.LauncherConfig
@@ -90,6 +92,8 @@ org.junit.platform.launcher.core.LauncherDiscoveryResult
 org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
 org.junit.platform.launcher.core.LauncherListenerRegistry
 org.junit.platform.launcher.core.ListenerRegistry
+org.junit.platform.launcher.core.ServiceLoaderRegistry
+org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry
 org.junit.platform.launcher.core.SessionPerRequestLauncher
 org.junit.platform.launcher.EngineDiscoveryResult
 org.junit.platform.launcher.LauncherSessionListener$1

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java

@@ -60,16 +60,9 @@
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.resolution.DependencyResult;
-import org.graalvm.buildtools.utils.FileUtils;
 import org.graalvm.buildtools.utils.JUnitUtils;
 import org.graalvm.buildtools.utils.NativeImageConfigurationUtils;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -82,7 +75,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -141,8 +133,6 @@ protected void addDependenciesToClasspath() throws MojoExecutionException {
             .filter(it -> it.getGroupId().startsWith(NativeImageConfigurationUtils.MAVEN_GROUP_ID) || it.getGroupId().startsWith("org.junit"))
             .map(it -> it.getFile().toPath())
             .forEach(imageClasspath::add);
-
-        modules.addAll(collectJUnitModulesAlreadyOnClasspath());
         var jars = findJunitPlatformNativeJars(modules);
         imageClasspath.addAll(jars);
     }
@@ -318,51 +308,6 @@ private List<Path> findJunitPlatformNativeJars(Set<Module> modulesAlreadyOnClass
             .collect(Collectors.toList());
     }
 
-    private Set<Module> collectJUnitModulesAlreadyOnClasspath() {
-        Set<Module> artifacts = new HashSet<>();
-        for (Path entry : imageClasspath) {
-            if (isJUnitArtifact(entry)) {
-                File pom = getArtifactPOM(entry);
-                if (pom != null) {
-                    artifacts.add(getModuleFromPOM(pom));
-                }
-            }
-        }
-
-        return artifacts;
-    }
-
-    private boolean isJUnitArtifact(Path entry) {
-        return entry.toString().contains("junit");
-    }
-
-    private File getArtifactPOM(Path classpathEntry) {
-        List<File> artifactContent = getArtifactContent(classpathEntry.getParent());
-        List<File> candidates = artifactContent.stream().filter(f -> f.getName().endsWith(".pom")).collect(Collectors.toList());
-        return candidates.size() != 1 ? null : candidates.get(0);
-    }
-
-    private List<File> getArtifactContent(Path path) {
-        File[] content = path.toFile().listFiles();
-        return content == null ? List.of() : List.of(content);
-    }
-
-    private Module getModuleFromPOM(File pom) {
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setIgnoringElementContentWhitespace(true);
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(pom);
-
-            String groupId = doc.getElementsByTagName("groupId").item(0).getFirstChild().getTextContent();
-            String artifactId = doc.getElementsByTagName("artifactId").item(0).getFirstChild().getTextContent();
-
-            return new Module(groupId, artifactId);
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            throw new RuntimeException("Cannot get maven coordinates from " + pom.getPath() + ". Reason: " + e.getMessage());
-        }
-    }
-
     private static final class Module {
         private final String groupId;
         private final String artifactId;