apply test class naming conventions to classes with tests only (IDEA-180536)

This commit is contained in:
Anna.Kozlova
2017-10-13 10:47:47 +02:00
parent c25531e772
commit 1f89e5a55e
2 changed files with 10 additions and 3 deletions
@@ -20,6 +20,7 @@ import com.intellij.codeInspection.naming.NamingConvention;
import com.intellij.codeInspection.naming.NamingConventionBean;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiModifier;
import com.intellij.testIntegration.TestFramework;
import com.siyeh.InspectionGadgetsBundle;
public class AbstractTestClassNamingConvention extends NamingConvention<PsiClass> {
@@ -39,8 +40,12 @@ public class AbstractTestClassNamingConvention extends NamingConvention<PsiClass
}
@Override
public boolean isApplicable(PsiClass member) {
return member.hasModifierProperty(PsiModifier.ABSTRACT) && TestFrameworks.detectFramework(member) != null;
public boolean isApplicable(PsiClass aClass) {
if (aClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
TestFramework framework = TestFrameworks.detectFramework(aClass);
return framework != null && framework.isTestClass(aClass);
}
return false;
}
@Override
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.TestFrameworks;
import com.intellij.codeInspection.naming.NamingConvention;
import com.intellij.codeInspection.naming.NamingConventionBean;
import com.intellij.psi.PsiClass;
import com.intellij.testIntegration.TestFramework;
import com.siyeh.InspectionGadgetsBundle;
public class TestClassNamingConvention extends NamingConvention<PsiClass> {
@@ -34,7 +35,8 @@ public class TestClassNamingConvention extends NamingConvention<PsiClass> {
@Override
public boolean isApplicable(PsiClass member) {
return TestFrameworks.detectFramework(member) != null;
TestFramework framework = TestFrameworks.detectFramework(member);
return framework != null && framework.isTestClass(member);
}
@Override