Skip to content
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

NETBEANS-4720 Support custom gradle test sourcesets #4721

Merged
merged 1 commit into from
Oct 4, 2022
Merged

NETBEANS-4720 Support custom gradle test sourcesets #4721

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
26 changes: 21 additions & 5 deletions java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.netbeans.modules.gradle.api.execute.RunUtils;
import org.netbeans.modules.gradle.java.api.GradleJavaProject;
import org.netbeans.modules.gradle.java.api.GradleJavaSourceSet;
import static org.netbeans.modules.gradle.java.api.GradleJavaSourceSet.SourceType.*;
import org.netbeans.modules.gradle.spi.actions.ReplaceTokenProvider;
import java.io.File;
import java.util.Arrays;
Expand All @@ -42,11 +43,13 @@
*/
public class GradleJavaTokenProvider implements ReplaceTokenProvider {

private static final String SELECTED_CLASS = "selectedClass"; //NOI18N
private static final String SELECTED_CLASS_NAME = "selectedClassName"; //NOI18N
private static final String SELECTED_PACKAGE = "selectedPackage"; //NOI18N
private static final String SELECTED_METHOD = "selectedMethod"; //NOI18N
private static final String AFFECTED_BUILD_TASK = "affectedBuildTasks";//NOI18N
private static final String SELECTED_CLASS = "selectedClass"; //NOI18N
private static final String SELECTED_CLASS_NAME = "selectedClassName"; //NOI18N
private static final String SELECTED_PACKAGE = "selectedPackage"; //NOI18N
private static final String SELECTED_METHOD = "selectedMethod"; //NOI18N
private static final String AFFECTED_BUILD_TASK = "affectedBuildTasks";//NOI18N
private static final String TEST_TASK_NAME = "testTaskName"; //NOI18N
private static final String CLEAN_TEST_TASK_NAME = "cleanTestTaskName"; //NOI18N

private static final Set<String> SUPPORTED = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
SELECTED_CLASS,
Expand All @@ -73,6 +76,7 @@ public Map<String, String> createReplacements(String action, Lookup context) {
processSelectedPackageAndClass(ret, context);
processSelectedMethod(ret, context);
processSourceSets(ret, context);
processTestSourceSet(ret, context);
return ret;
}

Expand Down Expand Up @@ -147,4 +151,16 @@ private String evaluateClassName(GradleJavaProject gjp, FileObject fo) {
return ret;
}

private void processTestSourceSet(final Map<String, String> map, Lookup context) {
FileObject fo = RunUtils.extractFileObjectfromLookup(context);
GradleJavaProject gjp = GradleJavaProject.get(project);
if ((gjp != null) && (fo != null)) {
File f = FileUtil.toFile(fo);
GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f);
if (sourceSet != null && sourceSet.isTestSourceSet() && sourceSet.getSourceType(f) != RESOURCES) {
map.put(TEST_TASK_NAME, sourceSet.getName());
map.put(CLEAN_TEST_TASK_NAME, sourceSet.getTaskName("clean", null));
}
}
}
}
12 changes: 6 additions & 6 deletions java/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
<actions>
<apply-for plugins="java">
<action name="test.single">
<args>cleanTest test --tests "${selectedClass}"</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --tests "${selectedClass}"</args>
</action>
<action name="run.single.method">
<args>cleanTest test --tests "${selectedMethod}"</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --tests "${selectedMethod}"</args>
</action>
<action name="debug.single.method">
<args>cleanTest test --debug-jvm --tests "${selectedMethod}"</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --debug-jvm --tests "${selectedMethod}"</args>
</action>
<action name="debug.test.single">
<args>cleanTest test --debug-jvm --tests "${selectedClass}"</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --debug-jvm --tests "${selectedClass}"</args>
</action>

<action name="javadoc">
Expand Down Expand Up @@ -91,10 +91,10 @@
<args>-PrunClassName=${selectedClass} ${javaExec.workingDir} ${javaExec.environment} runSingle --continuous ${javaExec.jvmArgs} ${javaExec.args}</args>
</action>
<action name="test.single">
<args>cleanTest test --tests "${selectedClass}" --continuous</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --tests "${selectedClass}" --continuous</args>
</action>
<action name="run.single.method">
<args>cleanTest test --tests "${selectedMethod}" --continuous</args>
<args>"${cleanTestTaskName}" "${testTaskName}" --tests "${selectedMethod}" --continuous</args>
</action>
<action name="debug.single.method">
<args></args>
Expand Down