Support JUnit 6 plug-in test launches

Fixes: #2108

Author: trancexpress

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

@@ -102,13 +102,14 @@ public static void main(String[] args) {
 		RemotePluginTestRunner testRunner = new RemotePluginTestRunner();
 		testRunner.init(args);
 		ClassLoader currentTCCL = Thread.currentThread().getContextClassLoader();
-		if (isJUnit5(args)) {
+		boolean isJUnitJupiter = isJUnit5(args) || isJUnit6(args);
+		if (isJUnitJupiter) {
 			//change the classloader so that the test classes in testplugin are discoverable
 			//by junit5 framework  see bug 520811
 			Thread.currentThread().setContextClassLoader(createJUnit5PluginClassLoader(testRunner.getTestPluginName()));
 		}
 		testRunner.run();
-		if (isJUnit5(args)) {
+		if (isJUnitJupiter) {
 			Thread.currentThread().setContextClassLoader(currentTCCL);
 		}
 	}
@@ -206,6 +207,11 @@ private static boolean isJUnit5(String[] args) {
 		return indexOf(args, "-runasjunit5"::equalsIgnoreCase) > -1 || indexOf(args, "org.eclipse.jdt.internal.junit5.runner.JUnit5TestLoader"::equals) > -1;
 	}
 
+	@SuppressWarnings("nls")
+	private static boolean isJUnit6(String[] args) {
+		return indexOf(args, "-runasjunit6"::equalsIgnoreCase) > -1 || indexOf(args, "org.eclipse.jdt.internal.junit6.runner.JUnit6TestLoader"::equals) > -1;
+	}
+
 	public void readPluginArgs(String[] args) {
 		fTestPluginName = getArgumentValue(args, "-testpluginname"); //$NON-NLS-1$
 		String loaderPlugin = getArgumentValue(args, "-loaderpluginname"); //$NON-NLS-1$

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

@@ -53,6 +53,7 @@ public class JUnitLaunchRequirements {
 	private static final String PDE_JUNIT_RUNTIME = "org.eclipse.pde.junit.runtime"; //$NON-NLS-1$
 	private static final String JUNIT4_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit4.runtime"; //$NON-NLS-1$
 	private static final String JUNIT5_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit5.runtime"; //$NON-NLS-1$
+	private static final String JUNIT6_JDT_RUNTIME_PLUGIN = "org.eclipse.jdt.junit6.runtime"; //$NON-NLS-1$
 
 	public static void addRequiredJunitRuntimePlugins(ILaunchConfiguration configuration, Map<String, List<IPluginModelBase>> collectedModels, Map<IPluginModelBase, String> startLevelMap) throws CoreException {
 		Collection<IPluginModelBase> runtimeBundles = getEclipseJunitRuntimePlugins(configuration, collectedModels, startLevelMap);
@@ -150,6 +151,9 @@ public static Collection<String> getRequiredJunitRuntimeEclipsePlugins(ILaunchCo
 			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT5_TEST_KIND_ID -> {
 				return List.of(PDE_JUNIT_RUNTIME, JUNIT5_JDT_RUNTIME_PLUGIN);
 			}
+			case org.eclipse.jdt.internal.junit.launcher.TestKindRegistry.JUNIT6_TEST_KIND_ID -> {
+				return List.of(PDE_JUNIT_RUNTIME, JUNIT6_JDT_RUNTIME_PLUGIN);
+			}
 			default -> throw new IllegalArgumentException("Unsupported junit test kind: " + testKind.getId()); //$NON-NLS-1$
 		}
 	}

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

@@ -518,8 +518,12 @@ 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();
 
+		System.out.println("Before");
+		fModels.keySet().stream().map(IPluginModelBase::getBundleDescription).filter(d -> d.getSymbolicName().startsWith("junit")).forEach(System.out::println);
 		// implicitly add the plug-ins required for JUnit testing if necessary
 		JUnitLaunchRequirements.addRequiredJunitRuntimePlugins(configuration, fAllBundles, fModels);
+		System.out.println("After");
+		fModels.keySet().stream().map(IPluginModelBase::getBundleDescription).filter(d -> d.getSymbolicName().startsWith("junit")).forEach(System.out::println);
 
 		String attribute = launch.getAttribute(PDE_JUNIT_SHOW_COMMAND);
 		boolean isShowCommand = false;