1 files changed, 25 insertions, 14 deletions

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/InstanceMethodNamingConventionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/InstanceMethodNamingConventionInspectionBase.java
index 3ec38f55053c..964ce0b0aace 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/InstanceMethodNamingConventionInspectionBase.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/InstanceMethodNamingConventionInspectionBase.java
@@ -15,25 +15,22 @@
  */
 package com.siyeh.ig.naming;
 
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.psi.PsiIdentifier;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
-import com.intellij.util.ui.CheckBox;
+import com.intellij.testIntegration.TestFramework;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.psiutils.LibraryUtil;
 import com.siyeh.ig.psiutils.MethodUtils;
+import com.siyeh.ig.psiutils.TestUtils;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class InstanceMethodNamingConventionInspectionBase extends ConventionInspection {
   private static final int DEFAULT_MIN_LENGTH = 4;
   private static final int DEFAULT_MAX_LENGTH = 32;
 
-  @SuppressWarnings("PublicField")
-  public boolean ignoreNativeMethods = true;
-
   @Override
   @NotNull
   public String getDisplayName() {
@@ -59,13 +56,6 @@ public class InstanceMethodNamingConventionInspectionBase extends ConventionInsp
   }
 
   @Override
-  public JComponent[] createExtraOptions() {
-    return new JComponent[] {
-      new CheckBox("ignore 'native' methods", this, "ignoreNativeMethods")
-    };
-  }
-
-  @Override
   protected String getDefaultRegex() {
     return "[a-z][A-Za-z\\d]*";
   }
@@ -80,6 +70,16 @@ public class InstanceMethodNamingConventionInspectionBase extends ConventionInsp
     return DEFAULT_MAX_LENGTH;
   }
 
+  private static boolean isTestNGTestMethod(PsiMethod method) {
+    final TestFramework[] testFrameworks = Extensions.getExtensions(TestFramework.EXTENSION_NAME);
+    for (TestFramework framework : testFrameworks) {
+      if ("TestNG".equals(framework.getName())) {
+        return framework.isTestMethod(method);
+      }
+    }
+    return false;
+  }
+
   @Override
   public BaseInspectionVisitor buildVisitor() {
     return new NamingConventionsVisitor();
@@ -93,13 +93,24 @@ public class InstanceMethodNamingConventionInspectionBase extends ConventionInsp
       if (method.isConstructor() || method.hasModifierProperty(PsiModifier.STATIC)) {
         return;
       }
-      if (ignoreNativeMethods && method.hasModifierProperty(PsiModifier.NATIVE)) {
+      if (method.hasModifierProperty(PsiModifier.NATIVE) && isInspectionEnabled("NativeMethodNamingConvention", method)) {
         return;
       }
       final PsiIdentifier nameIdentifier = method.getNameIdentifier();
       if (nameIdentifier == null) {
         return;
       }
+      if (TestUtils.isRunnable(method)) {
+        if (TestUtils.isJUnit4TestMethod(method) && isInspectionEnabled("JUnit4MethodNamingConvention", method)) {
+          return;
+        }
+        if (TestUtils.isJUnit3TestMethod(method) && isInspectionEnabled("JUnit3MethodNamingConvention", method)) {
+          return;
+        }
+      }
+      if (isTestNGTestMethod(method) && isInspectionEnabled("TestNGMethodNamingConvention", method)) {
+        return;
+      }
       final String name = method.getName();
       if (isValid(name)) {
         return;