Check for JUnit 5 and 6 conflicts with junit-jupiter-engine and not with

junit-platform-engine

Fixes: #2045

Author: trancexpress

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/JUnitLaunchValidationOperation.java

@@ -17,24 +17,28 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
 import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.osgi.service.resolver.ExportPackageDescription;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.launching.launcher.LaunchValidationOperation;
-import org.osgi.framework.Version;
 
 public class JUnitLaunchValidationOperation extends LaunchValidationOperation {
 
-	private static final Set<String> JUNIT_PLATFORM_ENGINE_BUNLDES = Set.of(new String[] { //
-			"junit-platform-engine", //$NON-NLS-1$
-			"org.junit.platform.engine", //$NON-NLS-1$
+	private static final String JUNIT_ORBIT_BUNDLE_PREFIX = "org.junit"; //$NON-NLS-1$
+	private static final String JUNIT_MAVEN_BUNDLE_PREFIX = "junit"; //$NON-NLS-1$
+
+	private static final String ORG_JUNIT_JUPITER_ENGINE_PACKAGE = "org.junit.jupiter.engine"; //$NON-NLS-1$
+
+	private static final Set<String> JUNIT_JUPITER_ENGINE_BUNDLES = Set.of(new String[] { //
+			"junit-jupiter-engine", //$NON-NLS-1$
+			"org.junit.jupiter.engine", //$NON-NLS-1$
 	});
 
 	private final Map<Object, Object[]> fErrors = new HashMap<>(2);
@@ -58,17 +62,34 @@ private void checkJunitVersion(ILaunchConfiguration configuration, Set<IPluginMo
 		if (testKind.isNull()) {
 			return;
 		}
-		Set<Version> junitPlatformBundlesVersions = junitPlatformBundleVersions(models);
 		String testKindId = testKind.getId();
 		switch (testKindId) {
 			case TestKindRegistry.JUNIT3_TEST_KIND_ID, TestKindRegistry.JUNIT4_TEST_KIND_ID -> {
 			} // nothing to check
 			case TestKindRegistry.JUNIT5_TEST_KIND_ID -> {
-				// JUnit 5 platform bundles have version range [1.0,2.0)
-				junitPlatformBundlesVersions.stream().map(Version::getMajor).filter(i -> i.intValue() != 1).findFirst().ifPresent(otherVersion -> {
-					String message = NLS.bind(PDEMessages.JUnitLaunchConfiguration_error_JUnitLaunchAndRuntimeMissmatch, 5, otherVersion);
-					addError(message);
-				});
+				for (IPluginModelBase model : models) {
+					BundleDescription description = model.getBundleDescription();
+					String symbolicName = description.getSymbolicName();
+					if (symbolicName.startsWith(JUNIT_MAVEN_BUNDLE_PREFIX) || symbolicName.startsWith(JUNIT_ORBIT_BUNDLE_PREFIX)) {
+						continue;
+					}
+					BundleDescription[] requires = description.getResolvedRequires();
+					for (BundleDescription required : requires) {
+						if (JUNIT_JUPITER_ENGINE_BUNDLES.contains(required.getSymbolicName()) && required.getVersion().getMajor() == 6) {
+							String message = NLS.bind(PDEMessages.JUnitLaunchConfiguration_error_JUnitLaunchAndRuntimeMissmatch, 5, required.getVersion().getMajor(), symbolicName);
+							addError(message);
+							break;
+						}
+					}
+					ExportPackageDescription[] resolvedImports = description.getResolvedImports();
+					for (ExportPackageDescription resolvedImport : resolvedImports) {
+						if (resolvedImport.getName().startsWith(ORG_JUNIT_JUPITER_ENGINE_PACKAGE) && resolvedImport.getVersion().getMajor() == 6) {
+							String message = NLS.bind(PDEMessages.JUnitLaunchConfiguration_error_JUnitLaunchAndRuntimeMissmatch, 5, resolvedImport.getVersion().getMajor(), symbolicName);
+							addError(message);
+							break;
+						}
+					}
+				}
 			}
 			default -> throw new CoreException(Status.error("Unsupported test kind: " + testKindId)); //$NON-NLS-1$
 		}
@@ -89,10 +110,4 @@ public Map<Object, Object[]> getInput() {
 		map.putAll(fErrors);
 		return map;
 	}
-
-	private static Set<Version> junitPlatformBundleVersions(Set<IPluginModelBase> models) {
-		return models.stream().map(IPluginModelBase::getBundleDescription) //
-				.filter(d -> JUNIT_PLATFORM_ENGINE_BUNLDES.contains(d.getSymbolicName())) //
-				.map(BundleDescription::getVersion).collect(Collectors.toSet());
-	}
 }

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/pderesources.properties

@@ -31,7 +31,7 @@ Therefore this launch is expected to fail.\n\
 Either update the launch configuration to target JUnit {1},\n\
 or restrict the versions of JUnit Jupiter and JUnit Platform\n\
 by specifying corresponding version bounds\n\
-in your test-project to match only JUnit {0}.
+of bundle {2} to match only JUnit {0}.
 
 OSGiLaunchConfiguration_cannotFindLaunchConfiguration=Cannot find the {0} OSGi framework.
 OSGiLaunchConfiguration_selected=selected