Merge branch '__rultor'

yegor256 · Jan 19, 2016 · b88119d · b88119d
2 parents 64f0e7a + 782c74b
commit b88119d
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 2 deletions.
diff --git a/qulice-pmd/pom.xml b/qulice-pmd/pom.xml
@@ -44,7 +44,7 @@
     <packaging>jar</packaging>
     <name>qulice-pmd</name>
     <properties>
-        <pmd.version>5.3.4</pmd.version>
+        <pmd.version>5.4.1</pmd.version>
     </properties>
     <dependencies>
         <dependency>
@@ -95,7 +95,7 @@
                 <configuration>
                     <parallel>classes</parallel>
                 </configuration>
-            </plugin>            
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/PMDValidatorTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/PMDValidatorTest.java
@@ -77,6 +77,11 @@ public final class PMDValidatorTest {
      */
     private static final String MULT_CON_INIT = "%s\\[\\d+-\\d+\\]: Avoid field initialization in several constructors.";
 
+    /**
+     * Template for string inside brackets.
+     */
+    private static final String BRACKETS = "(%s)";
+
     /**
      * PMDValidator can find violations in Java file(s).
      * @throws Exception If something wrong happens inside.
@@ -358,4 +363,64 @@ public void forbidsCallToStaticFieldsInNonStaticWay()
             )
         ).validate();
     }
+
+    /**
+     * PMDValidator forbids non public clone methods (PMD rule
+     * rulesets/java/clone.xml/CloneMethodMustBePublic).
+     * @throws Exception If something wrong happens inside.
+     */
+    @Test
+    public void forbidsNonPublicCloneMethod() throws Exception {
+        new PMDAssert(
+            "CloneMethodMustBePublic.java",
+            Matchers.is(false),
+            Matchers.containsString(
+                String.format(
+                    PMDValidatorTest.BRACKETS,
+                    "CloneMethodMustBePublic"
+                )
+            )
+        ).validate();
+    }
+
+    /**
+     * PMDValidator forbids clone methods with return type not matching class
+     * name (PMD rule
+     * rulesets/java/clone.xml/CloneMethodReturnTypeMustMatchClassName).
+     * @throws Exception If something wrong happens inside.
+     */
+    @Test
+    public void forbidsCloneMethodReturnTypeNotMatchingClassName()
+        throws Exception {
+        new PMDAssert(
+            "CloneMethodReturnTypeMustMatchClassName.java",
+            Matchers.is(false),
+            Matchers.containsString(
+                String.format(
+                    PMDValidatorTest.BRACKETS,
+                    "CloneMethodReturnTypeMustMatchClassName"
+                )
+            )
+        ).validate();
+    }
+
+    /**
+     * PMDValidator forbids ternary operators that can be simplified (PMD rule
+     * rulesets/java/basic.xml/SimplifiedTernary).
+     * @throws Exception If something wrong happens inside.
+     */
+    @Test
+    public void forbidsNonSimplifiedTernaryOperators()
+        throws Exception {
+        new PMDAssert(
+            "SimplifiedTernary.java",
+            Matchers.is(false),
+            Matchers.containsString(
+                String.format(
+                    PMDValidatorTest.BRACKETS,
+                    "SimplifiedTernary"
+                )
+            )
+        ).validate();
+    }
 }
diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/CloneMethodMustBePublic.java b/qulice-pmd/src/test/resources/com/qulice/pmd/CloneMethodMustBePublic.java
@@ -0,0 +1,8 @@
+package foo;
+
+public class CloneMethodMustBePublic implements Cloneable {
+    @Override
+    protected CloneMethodMustBePublic clone() throws CloneNotSupportedException {
+        return ((CloneMethodMustBePublic) super.clone());
+    }
+}
diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/CloneMethodReturnTypeMustMatchClassName.java b/qulice-pmd/src/test/resources/com/qulice/pmd/CloneMethodReturnTypeMustMatchClassName.java
@@ -0,0 +1,8 @@
+package foo;
+
+public class CloneMethodReturnTypeMustMatchClassName implements Cloneable {
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}
diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/SimplifiedTernary.java b/qulice-pmd/src/test/resources/com/qulice/pmd/SimplifiedTernary.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class SimplifiedTernary {
+    public boolean test() {
+        return condition ? true : something();
+    }
+}