Skip to content

Add version constraints to junit-platform-launcher added in plug-in launch #2068

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add version constraints to junit-platform-launcher added in plug-in launch #2068

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
8 changes: 5 additions & 3 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 @@ -62,6 +62,7 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.junit.buildpath.BuildPathSupport;
import org.eclipse.jdt.internal.junit.launcher.ITestKind;
import org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfigurationConstants;
import org.eclipse.jdt.internal.junit.launcher.JUnitRuntimeClasspathEntry;
Expand Down Expand Up @@ -156,6 +157,7 @@ public String showCommandLine(ILaunchConfiguration configuration, String mode, I
}
}

@SuppressWarnings("restriction")
private VMRunnerConfiguration getVMRunnerConfiguration(ILaunchConfiguration configuration, ILaunch launch,
String mode, IProgressMonitor monitor) throws CoreException {
VMRunnerConfiguration runConfig = null;
Expand Down Expand Up @@ -238,10 +240,10 @@ private VMRunnerConfiguration getVMRunnerConfiguration(ILaunchConfiguration conf
if (!configuration.getAttribute(
JUnitLaunchConfigurationConstants.ATTR_DONT_ADD_MISSING_JUNIT5_DEPENDENCY, false)) {
if (!Arrays.stream(classpath).anyMatch(
s -> s.contains("junit-platform-launcher") || s.contains("org.junit.platform.launcher"))) { //$NON-NLS-1$ //$NON-NLS-2$
s -> s.contains(BuildPathSupport.JUNIT_PLATFORM_LAUNCHER) || s.contains("org.junit.platform.launcher"))) { //$NON-NLS-1$
try {
JUnitRuntimeClasspathEntry x = new JUnitRuntimeClasspathEntry("junit-platform-launcher", //$NON-NLS-1$
null);
JUnitRuntimeClasspathEntry x = new JUnitRuntimeClasspathEntry(BuildPathSupport.JUNIT_PLATFORM_LAUNCHER,
null, BuildPathSupport.JUNIT_PLATFORM_VERSION);
String entryString = new ClasspathLocalizer(Platform.inDevelopmentMode()).entryString(x);
int length = classpath.length;
System.arraycopy(classpath, 0, classpath = new String[length + 1], 0, length);
Expand Down
Loading