Removed check for mixed JUnit 5 and 6 versions, adjusted error message in RemotePluginTestRunner

Fixes: #2045

Author: trancexpress

ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java

@@ -134,7 +134,7 @@ private static String getState(int state) {
 	private static ClassLoader createJUnit5PluginClassLoader(String testPluginName) {
 		Bundle testBundle = Platform.getBundle(testPluginName);
 		if (testBundle == null) {
-			throw new IllegalArgumentException("Bundle \"" + testPluginName + "\" not found. Possible causes include missing dependencies, too restrictive version ranges, or a non-matching required execution environment."); //$NON-NLS-1$ //$NON-NLS-2$
+			throw new IllegalArgumentException("Bundle \"" + testPluginName + "\" not found. Possible causes include missing dependencies, too restrictive version ranges, mixed JUnit versions, or a non-matching required execution environment."); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		Bundle junit5RuntimeBundle = Platform.getBundle("org.eclipse.jdt.junit5.runtime"); //$NON-NLS-1$
 		List<Bundle> platformEngineBundles = findTestEngineBundles();

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

@@ -36,7 +36,6 @@ public class PDEMessages extends NLS {
 	public static String WorkbenchLauncherConfigurationDelegate_noStartup;
 	public static String JUnitLaunchConfiguration_error_notaplugin;
 	public static String JUnitLaunchConfiguration_error_missingPlugin;
-	public static String JUnitLaunchConfiguration_error_JUnitLaunchAndRuntimeMissmatch;
 
 	public static String OSGiLaunchConfiguration_cannotFindLaunchConfiguration;
 	public static String OSGiLaunchConfiguration_selected;

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

@@ -25,13 +25,6 @@ WorkbenchLauncherConfigurationDelegate_jrePathNotFound = The installation path t
 WorkbenchLauncherConfigurationDelegate_noStartup = Launching failed. Bootstrap code cannot be found.
 JUnitLaunchConfiguration_error_notaplugin = Could not launch the JUnit plug-in tests because project ''{0}'' is not a plug-in project.
 JUnitLaunchConfiguration_error_missingPlugin = Required plug-in ''{0}'' could not be found.
-JUnitLaunchConfiguration_error_JUnitLaunchAndRuntimeMissmatch = Launch targets JUnit {0} but contains JUnit {1} bundles.\n\
-Therefore this launch is expected to fail.\n\
-\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}.
 
 OSGiLaunchConfiguration_cannotFindLaunchConfiguration=Cannot find the {0} OSGi framework.
 OSGiLaunchConfiguration_selected=selected

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

@@ -71,7 +71,6 @@
 import org.eclipse.pde.internal.core.util.VersionUtil;
 import org.eclipse.pde.internal.launching.IPDEConstants;
 import org.eclipse.pde.internal.launching.JUnitLaunchRequirements;
-import org.eclipse.pde.internal.launching.JUnitLaunchValidationOperation;
 import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
 import org.eclipse.pde.internal.launching.PDEMessages;
 import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;
@@ -519,9 +518,6 @@ protected void preLaunchCheck(ILaunchConfiguration configuration, ILaunch launch
 		fAllBundles = fModels.keySet().stream().collect(Collectors.groupingBy(m -> m.getPluginBase().getId(), LinkedHashMap::new, Collectors.toCollection(ArrayList::new)));
 		launchMode = launch.getLaunchMode();
 
-		JUnitLaunchValidationOperation junitValidation = new JUnitLaunchValidationOperation(configuration, fModels.keySet());
-		LaunchPluginValidator.runValidationOperation(junitValidation, monitor);
-
 		// implicitly add the plug-ins required for JUnit testing if necessary
 		JUnitLaunchRequirements.addRequiredJunitRuntimePlugins(configuration, fAllBundles, fModels);
 

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

@@ -86,7 +86,6 @@
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.pde.internal.launching.IPDEConstants;
 import org.eclipse.pde.internal.launching.JUnitLaunchRequirements;
-import org.eclipse.pde.internal.launching.JUnitLaunchValidationOperation;
 import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;
 import org.eclipse.pde.internal.launching.launcher.EclipsePluginValidationOperation;
 import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
@@ -360,9 +359,6 @@ protected void preLaunchCheck(ILaunchConfiguration configuration, ILaunch launch
 		fAllBundles = fModels.keySet().stream().collect(Collectors.groupingBy(m -> m.getPluginBase().getId(),
 				LinkedHashMap::new, Collectors.toCollection(ArrayList::new)));
 
-		JUnitLaunchValidationOperation junitValidation = new JUnitLaunchValidationOperation(configuration, fModels.keySet());
-		LaunchPluginValidator.runValidationOperation(junitValidation, monitor);
-
 		// implicitly add the plug-ins required for JUnit testing if necessary
 		JUnitLaunchRequirements.addRequiredJunitRuntimePlugins(configuration, fAllBundles, fModels);