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;
+	private 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/JUnitLaunchConfigurationDelegate.java

@@ -24,8 +24,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +84,11 @@
 import org.eclipse.pde.internal.launching.launcher.RequirementHelper;
 import org.eclipse.pde.internal.launching.launcher.VMHelper;
 import org.osgi.framework.Constants;
+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;
 
 /**
  * A launch delegate for launching JUnit Plug-in tests.
@@ -609,8 +616,41 @@ protected void validateProjectDependencies(ILaunchConfiguration configuration, I
 	 * @param monitor
 	 * 			a progress monitor
 	 */
+	@SuppressWarnings("restriction")
 	protected void validatePluginDependencies(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
 		EclipsePluginValidationOperation op = new EclipsePluginValidationOperation(configuration, fModels.keySet(), launchMode);
+		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())) {
+			op.setResolverHook(new RemoveJunit6Hook());
+		}
 		LaunchPluginValidator.runValidationOperation(op, monitor);
 	}
+
+	private static class RemoveJunit6Hook implements ResolverHook {
+
+		@Override
+		public void filterMatches(BundleRequirement requirement, Collection<BundleCapability> candidates) {
+			Iterator<BundleCapability> iterator = candidates.iterator();
+			while (iterator.hasNext()) {
+				BundleCapability candidate = iterator.next();
+				String name = candidate.getResource().getSymbolicName();
+				Version version = candidate.getResource().getVersion();
+				if (version.getMajor() == 6 && (name.startsWith("junit") || name.startsWith("org.junit"))) { //$NON-NLS-1$ //$NON-NLS-2$
+					iterator.remove();
+				}
+			}
+		}
+
+		@Override
+		public void filterResolvable(Collection<BundleRevision> candidates) {
+		}
+
+		@Override
+		public void filterSingletonCollisions(BundleCapability singleton, Collection<BundleCapability> collisionCandidates) {
+		}
+
+		@Override
+		public void end() {
+		}
+	}
 }