Skip to content

Remove error dialog for JUnit 5 and 6 conflicts #2092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Remove error dialog for JUnit 5 and 6 conflicts #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ....pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
98 changes: 0 additions & 98 deletions ....pde.launching/src/org/eclipse/pde/internal/launching/JUnitLaunchValidationOperation.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/PDEMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/pderesources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions ...eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 0 additions & 4 deletions ...t/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
Loading