#659: excluded JUnit public static methods from rule

yegor256 · Feb 19, 2016 · b6059f3 · b6059f3
1 parent 0caa9bb
commit b6059f3
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
@@ -208,7 +208,8 @@
             <property name="xpath">
                 <value>
                     <![CDATA[
-                            //MethodDeclaration[@Static='true' and @Public='true'
+                        //ClassOrInterfaceBodyDeclaration[
+                            MethodDeclaration[@Static='true' and @Public='true'
                               and not (
                                MethodDeclarator[
                                 count(FormalParameters/FormalParameter)=1
@@ -217,7 +218,12 @@
                                 and FormalParameters/FormalParameter[@Varargs='true']
                                ] and not(ResultType/Type)
                               )
-                            ]
+                            ] and (
+                                Annotation/MarkerAnnotation/Name[@Image!='BeforeClass' and @Image!='AfterClass'
+                                  and @Image!='Parameterized.Parameters']
+                                or not (Annotation)
+                            )
+                        ]
                     ]]>
                 </value>
             </property>

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/PMDValidatorTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/PMDValidatorTest.java
@@ -546,4 +546,22 @@ public void allowsPublicStaticMainMethod() throws Exception {
             )
         ).validate();
     }
+
+    /**
+     * PMDValidator can allow JUnit public static methods marked with:
+     * BeforeClass annotation.
+     * AfterClass annotation.
+     * Parameterized.Parameters annotation.
+     * @throws Exception If something wrong happens inside.
+     */
+    @Test
+    public void allowsJunitFrameworkPublicStaticMethods() throws Exception {
+        new PMDAssert(
+            "JunitStaticPublicMethods.java",
+            Matchers.is(true),
+            Matchers.not(
+                Matchers.containsString(PMDValidatorTest.STATIC_METHODS)
+            )
+        ).validate();
+    }
 }
diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/JunitStaticPublicMethods.java b/qulice-pmd/src/test/resources/com/qulice/pmd/JunitStaticPublicMethods.java
@@ -0,0 +1,31 @@
+package foo.test;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class SomeTest {
+
+    @BeforeClass
+    public static void beforeClass(){
+        // setup before class
+    }
+
+    @Test
+    public void emptyTest(){
+        //test something
+    }
+
+    @AfterClass
+    public static void afterClass() throws Exception {
+        //tear down after class
+    }
+
+    @Parameterized.Parameters
+    public static Collection parameters() {
+        return Collections.EMPTY_LIST;
+    }
+}