diff --git a/java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java b/java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java index 524234c3f624..017957022bfd 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java @@ -38,6 +38,10 @@ public abstract class TestFrameworks { public abstract boolean isTestMethod(PsiMethod method); + public boolean isTestMethod(PsiMethod method, boolean checkAbstract) { + return isTestMethod(method); + } + public boolean isTestOrConfig(PsiClass psiClass) { return isTestClass(psiClass) || hasConfigMethods(psiClass); } diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java b/java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java index 9a4512ca95fd..0cb3b2363938 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java @@ -94,4 +94,12 @@ public class TestFrameworksImpl extends TestFrameworks { } return false; } + + @Override + public boolean isTestMethod(PsiMethod method, boolean checkAbstract) { + for (TestFramework framework : TestFramework.EXTENSION_NAME.getExtensionList()) { + if (framework.isTestMethod(method, checkAbstract)) return true; + } + return false; + } } \ No newline at end of file diff --git a/plugins/gradle/java/src/execution/GradleRunnerUtil.java b/plugins/gradle/java/src/execution/GradleRunnerUtil.java index c443da6bebf7..a9068bb11be0 100644 --- a/plugins/gradle/java/src/execution/GradleRunnerUtil.java +++ b/plugins/gradle/java/src/execution/GradleRunnerUtil.java @@ -62,7 +62,7 @@ public class GradleRunnerUtil { public static Location getTestMethod(final Location location) { for (Iterator> iterator = location.getAncestors(PsiMethod.class, false); iterator.hasNext(); ) { final Location methodLocation = iterator.next(); - if (TestFrameworks.getInstance().isTestMethod(methodLocation.getPsiElement())) return methodLocation; + if (TestFrameworks.getInstance().isTestMethod(methodLocation.getPsiElement(), false)) return methodLocation; } return null; }