test

Author: trancexpress

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BundleValidationOperation.java

@@ -31,13 +31,15 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.build.BundleHelper;
+import org.osgi.framework.hooks.resolver.ResolverHook;
 
 public class BundleValidationOperation implements IWorkspaceRunnable {
 
 	private static StateObjectFactory FACTORY;
 
 	private final Set<IPluginModelBase> fModels;
 	private final Dictionary<String, String>[] fProperties;
+	private ResolverHook fResolverHook;
 	private State fState;
 
 	@SuppressWarnings("unchecked")
@@ -50,13 +52,20 @@ public BundleValidationOperation(Set<IPluginModelBase> models, Dictionary<String
 		fProperties = properties;
 	}
 
+	public void setResolverHook(ResolverHook resolverHook) {
+		fResolverHook = resolverHook;
+	}
+
 	@Override
 	public void run(IProgressMonitor monitor) throws CoreException {
 		if (FACTORY == null) {
 			FACTORY = BundleHelper.getPlatformAdmin().getFactory();
 		}
 		SubMonitor subMonitor = SubMonitor.convert(monitor, fModels.size() + 1);
 		fState = FACTORY.createState(true);
+		if (fResolverHook != null) {
+			fState.setResolverHookFactory(c -> fResolverHook);
+		}
 		long id = 1;
 		for (IPluginModelBase fModel : fModels) {
 			BundleDescription bundle = fModel.getBundleDescription();

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java

@@ -38,13 +38,15 @@
 import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.internal.core.BundleValidationOperation;
 import org.eclipse.pde.internal.core.TargetPlatformHelper;
+import org.osgi.framework.hooks.resolver.ResolverHook;
 
 public class LaunchValidationOperation implements IWorkspaceRunnable {
 
 	private BundleValidationOperation fOperation;
 	public final ILaunchConfiguration fLaunchConfiguration;
 	public final String fLaunchMode;
 	protected final Set<IPluginModelBase> fModels;
+	protected ResolverHook fResolverHook;
 
 	public LaunchValidationOperation(ILaunchConfiguration configuration, Set<IPluginModelBase> models) {
 		this(configuration, models, null);
@@ -56,9 +58,16 @@ public LaunchValidationOperation(ILaunchConfiguration configuration, Set<IPlugin
 		fLaunchMode = launchMode;
 	}
 
+	public void setResolverHook(ResolverHook resolverHook) {
+		fResolverHook = resolverHook;
+	}
+
 	@Override
 	public void run(IProgressMonitor monitor) throws CoreException {
 		fOperation = new BundleValidationOperation(fModels, getPlatformProperties());
+		if (fResolverHook != null) {
+			fOperation.setResolverHook(fResolverHook);
+		}
 		fOperation.run(monitor);
 	}
 

ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitEclipsePluginValidationOperation.java

@@ -0,0 +1,80 @@
+package org.eclipse.pde.launching;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.internal.launching.launcher.EclipsePluginValidationOperation;
+import org.osgi.framework.Version;
+import org.osgi.framework.hooks.resolver.ResolverHook;
+import org.osgi.framework.wiring.BundleCapability;
+import org.osgi.framework.wiring.BundleRequirement;
+import org.osgi.framework.wiring.BundleRevision;
+
+class JUnitEclipsePluginValidationOperation extends EclipsePluginValidationOperation implements ResolverHook {
+
+	private static final Object[] EMPTY = new Object[0];
+
+	private final Map<Object, Object[]> fJunitErrors = new HashMap<>(2);
+	private final int junitVersion;
+
+	@SuppressWarnings("restriction")
+	public JUnitEclipsePluginValidationOperation(ILaunchConfiguration configuration, Set<IPluginModelBase> models) {
+		super(configuration, models);
+		setResolverHook(this);
+		org.eclipse.jdt.internal.junit.launcher.ITestKind testKind = org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfigurationConstants.getTestRunnerKind(configuration);
+		if (org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT5_TEST_KIND_ID.equals(testKind.getId())) {
+			junitVersion = 5;
+		} else {
+			junitVersion = -1;
+		}
+	}
+
+	@Override
+	public void filterMatches(BundleRequirement requirement, Collection<BundleCapability> candidates) {
+		String requirementName = requirement.getRevision().getSymbolicName();
+		if (!requirementName.startsWith("junit")) { //$NON-NLS-1$
+			Iterator<BundleCapability> iterator = candidates.iterator();
+			while (iterator.hasNext()) {
+				BundleCapability candidate = iterator.next();
+				BundleRevision candidateRevision = candidate.getRevision();
+				String name = candidateRevision.getSymbolicName();
+				Version version = candidateRevision.getVersion();
+				if (junitVersion == 5 && version.getMajor() == 6 && (name.startsWith("junit"))) { //$NON-NLS-1$
+					// TODO: externalize
+					String error = requirementName + " depends on " + name + "_" + version; //$NON-NLS-1$ //$NON-NLS-2$
+					fJunitErrors.put(error, EMPTY);
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean hasErrors() {
+		return super.hasErrors() || fJunitErrors.size() >= 1;
+	}
+
+	@Override
+	public Map<Object, Object[]> getInput() {
+		Map<Object, Object[]> map = super.getInput();
+		map.putAll(fJunitErrors);
+		return map;
+	}
+
+	@Override
+	public void filterResolvable(Collection<BundleRevision> candidates) {
+	}
+
+	@Override
+	public void filterSingletonCollisions(BundleCapability singleton, Collection<BundleCapability> collisionCandidates) {
+	}
+
+	@Override
+	public void end() {
+	}
+
+}

ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java

@@ -74,7 +74,6 @@
 import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
 import org.eclipse.pde.internal.launching.PDEMessages;
 import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;
-import org.eclipse.pde.internal.launching.launcher.EclipsePluginValidationOperation;
 import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
 import org.eclipse.pde.internal.launching.launcher.LaunchConfigurationHelper;
 import org.eclipse.pde.internal.launching.launcher.LaunchPluginValidator;
@@ -610,7 +609,7 @@ protected void validateProjectDependencies(ILaunchConfiguration configuration, I
 	 * 			a progress monitor
 	 */
 	protected void validatePluginDependencies(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		EclipsePluginValidationOperation op = new EclipsePluginValidationOperation(configuration, fModels.keySet(), launchMode);
+		JUnitEclipsePluginValidationOperation op = new JUnitEclipsePluginValidationOperation(configuration, fModels.keySet());
 		LaunchPluginValidator.runValidationOperation(op, monitor);
 	}
 }