Issue #2161: unify test input locations for metrics package

7 files changed, 58 insertions, 21 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
index 2659ec8d0..806a1c11b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
@@ -517,18 +517,18 @@ public class MainTest {
 
         // we just reference there all violations
         final String[][] outputValues = {
-            {"JavaNCSSCheckTestInput", "1", "84"},
+            {"ComplexityOverflow", "1", "172"},
         };
 
         exit.checkAssertionAfterwards(new Assertion() {
             @Override public void checkAssertion() throws IOException {
                 String currentPath = new File(".").getCanonicalPath();
                 String expectedPath = currentPath
-                        + "/src/test/resources/com/puppycrawl/tools/checkstyle/metrics/"
+                        + "/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/"
                         .replace("/", File.separator);
                 StringBuilder sb = new StringBuilder();
                 sb.append("Starting audit...").append(System.getProperty("line.separator"));
-                String format = "%s.java:%s: warning: File length is %s lines (max allowed is 80).";
+                String format = "%s.java:%s: warning: File length is %s lines (max allowed is 170).";
                 for (String[] outputValue : outputValues) {
                     String line = String.format(Locale.ROOT, format,
                             expectedPath + outputValue[0], outputValue[1],
@@ -542,7 +542,7 @@ public class MainTest {
         });
 
         Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-filelength.xml",
-            "src/test/resources/com/puppycrawl/tools/checkstyle/metrics/");
+            "src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/");
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
index 86dfd9903..7c270ea47 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheckTest.java
@@ -22,17 +22,25 @@ package com.puppycrawl.tools.checkstyle.checks.metrics;
 import static com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck.MSG_KEY;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
 
 import antlr.CommonHiddenStreamToken;
+
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class BooleanExpressionComplexityCheckTest extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "metrics" + File.separator + filename);
+    }
+
     @Test
     public void test() throws Exception {
         DefaultConfiguration checkConfig =
@@ -45,7 +53,7 @@ public class BooleanExpressionComplexityCheckTest extends BaseCheckTestSupport {
             "40:34: " + getCheckMessage(MSG_KEY, 4, 3),
         };
 
-        verify(checkConfig, getPath("metrics" + File.separator + "BooleanExpressionComplexityCheckTestInput.java"), expected);
+        verify(checkConfig, getPath("BooleanExpressionComplexityCheckTestInput.java"), expected);
     }
 
     @Test
@@ -57,7 +65,7 @@ public class BooleanExpressionComplexityCheckTest extends BaseCheckTestSupport {
 
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("metrics" + File.separator + "BooleanExpressionComplexityCheckTestInput.java"), expected);
+        verify(checkConfig, getPath("BooleanExpressionComplexityCheckTestInput.java"), expected);
     }
 
     @Test
@@ -67,7 +75,7 @@ public class BooleanExpressionComplexityCheckTest extends BaseCheckTestSupport {
 
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("metrics" + File.separator + "InputBooleanExpressionComplexityNPE.java"), expected);
+        verify(checkConfig, getPath("InputBooleanExpressionComplexityNPE.java"), expected);
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
index 35625d6d1..d6228f2a6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
@@ -22,17 +22,25 @@ package com.puppycrawl.tools.checkstyle.checks.metrics;
 import static com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.MSG_KEY;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
 
 import antlr.CommonHiddenStreamToken;
+
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class ClassDataAbstractionCouplingCheckTest extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "metrics" + File.separator + filename);
+    }
+
     @Test
     public void test() throws Exception {
         DefaultConfiguration checkConfig =
@@ -47,9 +55,7 @@ public class ClassDataAbstractionCouplingCheckTest extends BaseCheckTestSupport
             "27:1: " + getCheckMessage(MSG_KEY, 2, 0, "[HashMap, HashSet]"),
         };
 
-        verify(checkConfig,
-               getPath("metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
-               expected);
+        verify(checkConfig, getPath("ClassCouplingCheckTestInput.java"), expected);
     }
 
     @Test
@@ -59,9 +65,7 @@ public class ClassDataAbstractionCouplingCheckTest extends BaseCheckTestSupport
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
         createChecker(checkConfig);
-        verify(checkConfig,
-            getPath("metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
-            expected);
+        verify(checkConfig, getPath("ClassCouplingCheckTestInput.java"), expected);
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
index f8a1d6120..a2979db62 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
@@ -44,7 +44,8 @@ public class ClassFanOutComplexityCheckTest extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-               getPath("metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
+               getPath("checks" + File.separator
+                       + "metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
                expected);
     }
 
@@ -67,7 +68,8 @@ public class ClassFanOutComplexityCheckTest extends BaseCheckTestSupport {
 
         createChecker(checkConfig);
         verify(checkConfig,
-            getPath("metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
+            getPath("checks" + File.separator
+                    + "metrics" + File.separator + "ClassCouplingCheckTestInput.java"),
             expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
index c58e9817b..5108f657f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
@@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics;
 
 import static com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -30,6 +33,12 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class CyclomaticComplexityCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "metrics" + File.separator + filename);
+    }
+
     @Test
     public void testSwitchBlockAsSingleDecisionPointSetToTrue() throws Exception {
         final DefaultConfiguration checkConfig =
@@ -41,7 +50,7 @@ public class CyclomaticComplexityCheckTest
             "4:5: " + getCheckMessage(MSG_KEY, 2, 0),
         };
 
-        verify(checkConfig, getPath("metrics/ComplexityCheckSwitchBlocksTestInput.java"), expected);
+        verify(checkConfig, getPath("ComplexityCheckSwitchBlocksTestInput.java"), expected);
     }
 
     @Test
@@ -55,7 +64,7 @@ public class CyclomaticComplexityCheckTest
             "4:5: " + getCheckMessage(MSG_KEY, 5, 0),
         };
 
-        verify(checkConfig, getPath("metrics/ComplexityCheckSwitchBlocksTestInput.java"), expected);
+        verify(checkConfig, getPath("ComplexityCheckSwitchBlocksTestInput.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
index bc9f303d4..ea9a8e54f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheckTest.java
@@ -24,6 +24,7 @@ import static com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck.MSG_F
 import static com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck.MSG_METHOD;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
@@ -39,6 +40,11 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
  * @author Lars Ködderitzsch
  */
 public class JavaNCSSCheckTest extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "metrics" + File.separator + filename);
+    }
 
     @Test
     public void test() throws Exception {
@@ -64,8 +70,7 @@ public class JavaNCSSCheckTest extends BaseCheckTestSupport {
             "83:5: " + getCheckMessage(MSG_METHOD, 1, 0),
         };
 
-        verify(checkConfig, getPath("metrics" + File.separator
-                + "JavaNCSSCheckTestInput.java"), expected);
+        verify(checkConfig, getPath("JavaNCSSCheckTestInput.java"), expected);
     }
 
     @Test
@@ -74,8 +79,7 @@ public class JavaNCSSCheckTest extends BaseCheckTestSupport {
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
         createChecker(checkConfig);
-        verify(checkConfig, getPath("metrics" + File.separator
-            + "JavaNCSSCheckTestInput.java"), expected);
+        verify(checkConfig, getPath("JavaNCSSCheckTestInput.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
index e9177523a..9f1cad293 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
@@ -21,17 +21,27 @@ package com.puppycrawl.tools.checkstyle.checks.metrics;
 
 import static com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
 import antlr.CommonHiddenStreamToken;
+
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class NPathComplexityCheckTest extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "metrics" + File.separator + filename);
+    }
+
     @Test
     public void testCalculation() throws Exception {
         DefaultConfiguration checkConfig =