From 272646560294197cdfe441b8ea8b9c8164e51c66 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 18 Aug 2017 20:41:47 +0200
Subject: [PATCH] junit method with valid signature: skip utilities

don't warn about non-public methods with parameters even when they start with test
---
 .../src/com/siyeh/ig/psiutils/TestUtils.java                   | 3 ++-
 .../JUnit3TestMethodIsPublicVoidNoArg.java                     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java
index 5bf20e278286..3f5fd678adb2 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java
@@ -93,7 +93,8 @@ public class TestUtils {
     }
     final String methodName = method.getName();
     @NonNls final String test = "test";
-    if (!methodName.startsWith(test)) {
+    if (!methodName.startsWith(test) || 
+        !method.hasModifierProperty(PsiModifier.PUBLIC) && method.getParameterList().getParametersCount() > 0) {
       return false;
     }
     final PsiClass containingClass = method.getContainingClass();
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_method_is_public_void_no_arg/JUnit3TestMethodIsPublicVoidNoArg.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_method_is_public_void_no_arg/JUnit3TestMethodIsPublicVoidNoArg.java
index 68a5df1305f6..d935863b929c 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_method_is_public_void_no_arg/JUnit3TestMethodIsPublicVoidNoArg.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/test_method_is_public_void_no_arg/JUnit3TestMethodIsPublicVoidNoArg.java
@@ -13,4 +13,7 @@ public class JUnit3TestMethodIsPublicVoidNoArg extends junit.framework.TestCase
   public void <warning descr="Test method 'testFour()' should probably not have parameters">testFour</warning>(int i) {}
 
   public void testFive() {}
+  
+  //ignore when method doesn't look like test anymore
+  void testSix(int i) {}
 }
\ No newline at end of file