This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch release110 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit c03c53a90e46638da9d3756d9d7e249e22d588fc Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Fri Apr 12 20:00:58 2019 -0700 [NETBEANS-2348] Less intrustive support for Test Package. --- .../gradle/java/GradleJavaTokenProvider.java | 6 +- .../modules/gradle/java/JavaActionProvider.java | 65 ++++++++++------------ .../modules/gradle/java/action-mapping.xml | 3 - .../modules/gradle/ActionProviderImpl.java | 19 +------ 4 files changed, 34 insertions(+), 59 deletions(-) diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java index 980c122..87018fb 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java @@ -59,7 +59,6 @@ public class GradleJavaTokenProvider implements ReplaceTokenProvider { private static final Set<String> SUPPORTED = Collections.unmodifiableSet(new HashSet(Arrays.asList( "selectedClass", //NOI18N "selectedMethod", //NOI18N - "selectedPackage", //NOI18N "affectedBuildTasks" //NOI18N ))); @@ -97,9 +96,10 @@ public class GradleJavaTokenProvider implements ReplaceTokenProvider { relPath).replace('/', '.'); map.put("selectedClass", className); //NOI18N f = f.getParentFile(); + } else { + String pkg = sourceSet.relativePath(f).replace('/', '.'); + map.put("selectedClass", pkg + "*"); //NOI18N } - String pkg = sourceSet.relativePath(f).replace('/', '.'); - map.put("selectedPackage", pkg); //NOI18N } } } diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java index 3add6f2..4aab8cb 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaActionProvider.java @@ -47,7 +47,6 @@ import org.openide.util.lookup.ServiceProvider; @ServiceProvider(service = GradleActionsProvider.class) public class JavaActionProvider extends DefaultGradleActionsProvider { - public static final String COMMAND_TEST_SINGLE_PACKAGE = "test.single.package"; //NOI18N private static final String GATLING_PLUGIN = "com.github.lkishalmi.gatling"; //NOI18N private static final String SIMULATION_POSTFIX = "Simulation.scala"; //NOI18N @@ -67,7 +66,6 @@ public class JavaActionProvider extends DefaultGradleActionsProvider { COMMAND_RUN_SINGLE, COMMAND_DEBUG_SINGLE, COMMAND_COMPILE_SINGLE, - COMMAND_TEST_SINGLE_PACKAGE }; public JavaActionProvider() { @@ -86,47 +84,42 @@ public class JavaActionProvider extends DefaultGradleActionsProvider { } else { ret = false; GradleJavaProject gjp = GradleJavaProject.get(project); - switch (action) { - case COMMAND_COMPILE_SINGLE: - FileBuiltQuery.Status status = FileBuiltQuery.getStatus(fo); - ret = status == null || !status.isBuilt(); - break; - case COMMAND_DEBUG_SINGLE: - case COMMAND_RUN_SINGLE: { - if (RunUtils.isAugmentedBuildEnabled(project) && (gjp != null)) { - File f = FileUtil.toFile(fo); - GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f); - if ((sourceSet != null) && fo.isData()) { - String relPath = sourceSet.relativePath(f); - if (relPath != null) { - relPath = relPath.substring(0, relPath.lastIndexOf('.')).replace('/', '.'); - ret = SourceUtils.isMainClass(relPath, ClasspathInfo.create(fo), true); + if ( gjp != null ) { + switch (action) { + case COMMAND_COMPILE_SINGLE: + FileBuiltQuery.Status status = FileBuiltQuery.getStatus(fo); + ret = status == null || !status.isBuilt(); + break; + case COMMAND_DEBUG_SINGLE: + case COMMAND_RUN_SINGLE: + if (RunUtils.isAugmentedBuildEnabled(project)) { + File f = FileUtil.toFile(fo); + GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f); + if ((sourceSet != null) && fo.isData()) { + String relPath = sourceSet.relativePath(f); + if (relPath != null) { + relPath = relPath.substring(0, relPath.lastIndexOf('.')).replace('/', '.'); + ret = SourceUtils.isMainClass(relPath, ClasspathInfo.create(fo), true); + } } } - } - - break; - } - case COMMAND_TEST_SINGLE: - case COMMAND_DEBUG_TEST_SINGLE: - case COMMAND_RUN_SINGLE_METHOD: - case COMMAND_DEBUG_SINGLE_METHOD: { - if ("text/x-java".equals(fo.getMIMEType())) { //NOI18N - if ( gjp != null ) { + break; + case COMMAND_TEST_SINGLE: + case COMMAND_DEBUG_TEST_SINGLE: + case COMMAND_RUN_SINGLE_METHOD: + case COMMAND_DEBUG_SINGLE_METHOD: + if ("text/x-java".equals(fo.getMIMEType())) { //NOI18N File f = FileUtil.toFile(fo); GradleJavaSourceSet sourceSet = gjp.containingSourceSet(f); ret = sourceSet != null && sourceSet.isTestSourceSet() && sourceSet.getSourceType(f) != RESOURCES; } - } - break; + if ( fo.isFolder() ) { + File dir = FileUtil.toFile(fo); + GradleJavaSourceSet sourceSet = gjp.containingSourceSet(dir); + ret = sourceSet != null && sourceSet.getSourceType(dir) != RESOURCES; + } + break; } - case COMMAND_TEST_SINGLE_PACKAGE: - if ( (gjp != null) && fo.isFolder() ) { - File dir = FileUtil.toFile(fo); - GradleJavaSourceSet sourceSet = gjp.containingSourceSet(dir); - ret = sourceSet != null && sourceSet.getSourceType(dir) != RESOURCES; - } - break; } } } diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml index 26b9f26..32d303a 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/action-mapping.xml @@ -25,9 +25,6 @@ <action name="test.single"> <args>--rerun-tasks test --tests ${selectedClass}</args> </action> - <action name="test.single.package"> - <args>--rerun-tasks test --tests ${selectedPackage}*</args> - </action> <action name="run.single.method"> <args>--rerun-tasks test --tests ${selectedMethod}</args> </action> diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java b/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java index 7527dc9..7626954 100644 --- a/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java +++ b/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java @@ -124,28 +124,13 @@ public class ActionProviderImpl implements ActionProvider { @Override public void invokeAction(String command, Lookup context) throws IllegalArgumentException { - String cmd = translateCommand(command, context); - ActionMapping mapping = ActionToTaskUtils.getActiveMapping(cmd, project); + ActionMapping mapping = ActionToTaskUtils.getActiveMapping(command, project); invokeProjectAction(project, mapping, context, false); } @Override public boolean isActionEnabled(String command, Lookup context) throws IllegalArgumentException { - String cmd = translateCommand(command, context); - return ActionToTaskUtils.isActionEnabled(cmd, project, context); - } - - // TODO: Create an SPI for these kind of translations. Maven projects do something similar - // Fix for: NETBEANS-2348 - private String translateCommand(String command, Lookup context) { - String ret = command; - if ("test.single".equals(command)) { //NOI18N - FileObject fo = RunUtils.extractFileObjectfromLookup(context); - if (fo.isFolder()) { - ret = "test.single.package"; //NOI18N - } - } - return ret; + return ActionToTaskUtils.isActionEnabled(command, project, context); } @NbBundle.Messages({ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists