From 1f89e5a55e44e166658854037da4ac110f3e17c4 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 12 Oct 2017 20:01:17 +0200
Subject: [PATCH] apply test class naming conventions to classes with tests
 only (IDEA-180536)

---
 .../ig/junit/AbstractTestClassNamingConvention.java      | 9 +++++++--
 .../com/siyeh/ig/junit/TestClassNamingConvention.java    | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AbstractTestClassNamingConvention.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AbstractTestClassNamingConvention.java
index ca6cc3a04124..51ba75aee665 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AbstractTestClassNamingConvention.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AbstractTestClassNamingConvention.java
@@ -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
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
index 832bfc268e28..270600302313 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestClassNamingConvention.java
@@ -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