MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle test runner task finder criteria cleanup

Browse Source
This commit is contained in:
Vladislav.Soroka
2018-12-04 13:56:03 +03:00
parent 86e7c3f8d8
commit ce4c730eef
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java
+2 -3
View File
@@ -134,14 +134,13 @@ public abstract class GradleTestRunConfigurationProducer extends RunConfiguratio
if (sourceSetId == null) {
taskNode = ExternalSystemApiUtil.find(
moduleNode, ProjectKeys.TASK,
node -> (node.getData().isTest() || GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(node.getData().getType())) &&
node -> node.getData().isTest() &&
StringUtil.equals("test", node.getData().getName()) || StringUtil.equals(taskPrefix + "test", node.getData().getName()));
}
else {
taskNode = ExternalSystemApiUtil.find(
moduleNode, ProjectKeys.TASK,
node -> (node.getData().isTest() || GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(node.getData().getType())) &&
StringUtil.startsWith(node.getData().getName(), sourceSetId));
node -> node.getData().isTest() && StringUtil.startsWith(node.getData().getName(), sourceSetId));
}
if (taskNode == null) return ContainerUtil.emptyList();
plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java
+2 -4
View File
@@ -53,7 +53,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.action.GradleRerunFailedTestsAction;
import org.jetbrains.plugins.gradle.execution.filters.ReRunTaskFilter;
import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil;
import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames;
import org.jetbrains.plugins.gradle.util.GradleBundle;
import org.jetbrains.plugins.gradle.util.GradleConstants;
@@ -185,9 +184,8 @@ public class GradleTestsExecutionConsoleManager
final DataNode<TaskData> taskDataNode = GradleProjectResolverUtil.findTask(
externalProjectInfo.getExternalProjectStructure(), projectPath, taskToExecute);
return taskDataNode != null &&
(("check".equals(taskDataNode.getData().getName()) && "verification".equals(taskDataNode.getData().getGroup())
|| taskDataNode.getData().isTest()
|| GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(taskDataNode.getData().getType())));
(taskDataNode.getData().isTest() ||
"check".equals(taskDataNode.getData().getName()) && "verification".equals(taskDataNode.getData().getGroup()));
}) != null;
}
return false;