Merge f035c6b into 16e829e

sevntu-checkstyle · Feb 4, 2015 · f91aa4f · f91aa4f
2 parents 16e829e + f035c6b
commit f91aa4f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...cks/src/main/java/com/github/sevntu/checkstyle/checks/coding/ConfusingConditionCheck.java b/...cks/src/main/java/com/github/sevntu/checkstyle/checks/coding/ConfusingConditionCheck.java
@@ -78,7 +78,7 @@ public class ConfusingConditionCheck extends Check {
 	 * Allow to ignore "else" block if its length is in
 	 * "multiplyFactorForElseBlocks" time less then "if" block.
 	 */
-	private static int multiplyFactorForElseBlocks = MULTIPLY_FACTOR_FOR_ELSE_BLOCK;
+	private int multiplyFactorForElseBlocks = MULTIPLY_FACTOR_FOR_ELSE_BLOCK;
 
 	/**
 	 * Disable warnings for all "if" that follows the "else". It is useful for
@@ -148,7 +148,7 @@ public void setIgnoreThrowInElse(final boolean ignoreThrowInElse) {
 	 * @see ConfusingConditionCheck#MultiplyFactorForElseBlocks
 	 */
 	public void setMultiplyFactorForElseBlocks(int multiplyFactorForElseBlocks) {
-		this.multiplyFactorForElseBlocks = multiplyFactorForElseBlocks;
+		multiplyFactorForElseBlocks = multiplyFactorForElseBlocks;
 	}
 
 	@Override
@@ -229,7 +229,7 @@ private static boolean isElseWithThrow(DetailAST literalIf) {
 	 * @param literalIf
 	 * @return If the condition is met (true) |Isn't men (false).
 	 */
-	private static boolean isRatioBetweenIfAndElseBlockSuitable(DetailAST literalIf) {
+	private boolean isRatioBetweenIfAndElseBlockSuitable(DetailAST literalIf) {
 		boolean result = true;
 
 		final DetailAST lastChildAfterIf = literalIf.getLastChild();

diff --git a/...src/test/java/com/github/sevntu/checkstyle/checks/coding/ConfusingConditionCheckTest.java b/...src/test/java/com/github/sevntu/checkstyle/checks/coding/ConfusingConditionCheckTest.java
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.github.sevntu.checkstyle.checks.coding;
 
-import static com.github.sevntu.checkstyle.checks.coding.ConfusingConditionCheck.*;
+import static com.github.sevntu.checkstyle.checks.coding.ConfusingConditionCheck.MSG_KEY;
 
 import org.junit.Test;
 
@@ -33,11 +33,17 @@ public class ConfusingConditionCheckTest extends BaseCheckTestSupport
 
 	private final String warningMessage = getCheckMessage(MSG_KEY);
 
+	private final DefaultConfiguration checkConfig = createCheckConfig(ConfusingConditionCheck.class);
+
     @Test
-    public void testDefault()
-            throws Exception
+	public void testDefault() throws Exception
     {
-        final DefaultConfiguration checkConfig = createCheckConfig(ConfusingConditionCheck.class);
+		checkConfig.addAttribute("ignoreInnerIf", "true");
+		checkConfig.addAttribute("ignoreNullCaseInIf", "true");
+		checkConfig.addAttribute("ignoreSequentialIf", "true");
+		checkConfig.addAttribute("ignoreThrowInElse", "true");
+		checkConfig.addAttribute("multiplyFactorForElseBlocks", "4");
+
         final String[] expected = {
                 "10: " + warningMessage,
                 "13: " + warningMessage,