Skip to content

Fix gradle test scope #333

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
testforstephen merged 2 commits into from
May 11, 2020
Merged

Fix gradle test scope #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91ce55
Fix gradle test scope
testforstephen May 11, 2020
9bc6d57
make checkstyle happy
testforstephen May 11, 2020
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
13 changes: 9 additions & 4 deletions ...ugin/src/main/java/com/microsoft/java/debug/plugin/internal/ResolveClasspathsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private static String[][] computeClassPath(String mainClass, String projectName)
IJavaElement testElement = findMainClassInTestFolders(project, mainClass);
List<IResource> mappedResources = (testElement != null && testElement.getResource() != null)
? Arrays.asList(testElement.getResource()) : Collections.EMPTY_LIST;
return computeClassPath(project, testElement == null, mappedResources);
return computeClassPath(project, mainClass, testElement == null, mappedResources);
}

/**
Expand All @@ -195,13 +195,13 @@ private static String[][] computeClassPath(String mainClass, String projectName)
* @throws CoreException
* CoreException
*/
private static String[][] computeClassPath(IJavaProject javaProject, boolean excludeTestCode, List<IResource> mappedResources)
private static String[][] computeClassPath(IJavaProject javaProject, String mainType, boolean excludeTestCode, List<IResource> mappedResources)
throws CoreException {
if (javaProject == null) {
throw new IllegalArgumentException("javaProject is null");
}

ILaunchConfiguration launchConfig = new JavaApplicationLaunchConfiguration(javaProject.getProject(), excludeTestCode, mappedResources);
ILaunchConfiguration launchConfig = new JavaApplicationLaunchConfiguration(javaProject.getProject(), mainType, excludeTestCode, mappedResources);
IRuntimeClasspathEntry[] unresolved = JavaRuntime.computeUnresolvedRuntimeClasspath(launchConfig);
IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspath(unresolved, launchConfig);
Set<String> classpaths = new LinkedHashSet<>();
Expand Down Expand Up @@ -282,15 +282,18 @@ private static class JavaApplicationLaunchConfiguration extends LaunchConfigurat
+ "</listAttribute>\n"
+ "</launchConfiguration>";
private IProject project;
private String mainType;
private boolean excludeTestCode;
private List<IResource> mappedResources;
private String classpathProvider;
private String sourcepathProvider;
private LaunchConfigurationInfo launchInfo;

protected JavaApplicationLaunchConfiguration(IProject project, boolean excludeTestCode, List<IResource> mappedResources) throws CoreException {
protected JavaApplicationLaunchConfiguration(IProject project, String mainType, boolean excludeTestCode, List<IResource> mappedResources)
throws CoreException {
super(String.valueOf(new Date().getTime()), null, false);
this.project = project;
this.mainType = mainType;
this.excludeTestCode = excludeTestCode;
this.mappedResources = mappedResources;
if (ProjectUtils.isMavenProject(project)) {
Expand Down Expand Up @@ -319,6 +322,8 @@ public String getAttribute(String attributeName, String defaultValue) throws Cor
return classpathProvider;
} else if (IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER.equalsIgnoreCase(attributeName)) {
return sourcepathProvider;
} else if (IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME.equalsIgnoreCase(attributeName)) {
return mainType;
}

return super.getAttribute(attributeName, defaultValue);
Expand Down