Issue #2161: unify test input locations for coding package

8 files changed, 72 insertions, 43 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
index 2bdf4979c..f3684e624 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java
@@ -89,7 +89,7 @@ public class TreeWalkerTest extends BaseCheckTestSupport {
                 + "IMPORT");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
         try {
-            verify(checkConfig, getPath("InputHiddenField.java"), expected);
+            verify(checkConfig, getPath("InputMain.java"), expected);
             fail();
         }
         catch (CheckstyleException e) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
index c97603428..1d418d435 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
@@ -39,7 +39,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
             createCheckConfig(DescendantTokenCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -51,9 +51,9 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("limitedTokens", "LITERAL_NATIVE");
         checkConfig.addAttribute("maximumNumber", "0");
         final String[] expected = {
-            "20:12: " + getCheckMessage(MSG_KEY_MAX, 1, 0, "LITERAL_NATIVE", "LITERAL_NATIVE"),
+            "17:12: " + getCheckMessage(MSG_KEY_MAX, 1, 0, "LITERAL_NATIVE", "LITERAL_NATIVE"),
         };
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -66,9 +66,9 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("maximumNumber", "0");
         checkConfig.addAttribute("maximumMessage", "Using ''native'' is not allowed.");
         final String[] expected = {
-            "20:12: Using 'native' is not allowed.",
+            "17:12: Using 'native' is not allowed.",
         };
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -80,9 +80,9 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("limitedTokens", "LITERAL_DEFAULT");
         checkConfig.addAttribute("minimumNumber", "2");
         final String[] expected = {
-            "11:9: " + getCheckMessage(MSG_KEY_MIN, 1, 2, "LITERAL_SWITCH", "LITERAL_DEFAULT"),
+            "8:9: " + getCheckMessage(MSG_KEY_MIN, 1, 2, "LITERAL_SWITCH", "LITERAL_DEFAULT"),
         };
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("maximumNumber", "0");
         checkConfig.addAttribute("minimumDepth", "3");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -108,7 +108,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("maximumNumber", "0");
         checkConfig.addAttribute("maximumDepth", "1");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -190,11 +190,11 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("maximumMessage", "Using ''{2}'' is not allowed.");
 
         final String[] expected = {
-            "11:9: Using 'LITERAL_SWITCH' is not allowed.",
-            "14:18: Using 'POST_DEC' is not allowed.",
-            "15:18: Using 'POST_INC' is not allowed.",
+            "8:9: Using 'LITERAL_SWITCH' is not allowed.",
+            "11:18: Using 'POST_DEC' is not allowed.",
+            "12:18: Using 'POST_INC' is not allowed.",
         };
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
@@ -208,9 +208,9 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("maximumMessage", "Using ''{2}'' is not allowed.");
 
         final String[] expected = {
-            "20:12: Using 'LITERAL_NATIVE' is not allowed.",
+            "17:12: Using 'LITERAL_NATIVE' is not allowed.",
         };
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
index 5ab0d0d8f..abcf18347 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
@@ -49,7 +49,7 @@ public class OuterTypeFilenameCheckTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
             createCheckConfig(OuterTypeFilenameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
+        verify(checkConfig, getPath("checks/InputIllegalTokens.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
index 5357539bb..c4b0d8175 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java
@@ -22,6 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 import static com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck.MSG_KEY;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,6 +32,17 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class HiddenFieldCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
+
+    @Override
+    protected String getNonCompilablePath(String filename) throws IOException {
+        return super.getNonCompilablePath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
 
     @Test
     public void testStaticVisibilityFromLambdas() throws Exception {
@@ -54,8 +66,7 @@ public class HiddenFieldCheckTest
             "216:55: " + getCheckMessage(MSG_KEY, "someObject"),
             "224:52: " + getCheckMessage(MSG_KEY, "someObject"),
         };
-        verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/tools/"
-            + "checkstyle/coding/InputHiddenFieldLambdas.java").getCanonicalPath(), expected);
+        verify(checkConfig, getNonCompilablePath("InputHiddenFieldLambdas.java"), expected);
     }
 
     @Test
@@ -391,5 +402,4 @@ public class HiddenFieldCheckTest
         };
         verify(checkConfig, getPath("InputHiddenField.java"), expected);
     }
-
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
index 6b08cb0e8..78f2f809d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenCheckTest.java
@@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 
 import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.junit.Test;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
@@ -28,6 +31,12 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class IllegalTokenCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
+
     @Test
     public void testCheckWithDefaultSettings()
         throws Exception {
@@ -64,5 +73,4 @@ public class IllegalTokenCheckTest
         };
         verify(checkConfig, getPath("InputIllegalTokens.java"), expected);
     }
-
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
index 726dfae24..9db5816c2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheckTest.java
@@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 
 import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -29,6 +32,12 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class IllegalTokenTextCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
+
     @Test
     public void testCaseSensitive()
         throws Exception {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
index 6a1afcd3f..9a3e62d90 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
@@ -22,6 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.MSG_KEY;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
@@ -41,6 +42,12 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         checkConfig = createCheckConfig(IllegalTypeCheck.class);
     }
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
+
     @Test
     public void testValidateAbstractClassNamesSetToTrue() throws Exception {
         checkConfig.addAttribute("validateAbstractClassNames", "true");
@@ -50,7 +57,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "33:12: " + getCheckMessage(MSG_KEY, "AbstractClass"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalTypeAbstractClassNames.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeAbstractClassNames.java"), expected);
     }
 
     @Test
@@ -58,7 +65,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("validateAbstractClassNames", "false");
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalTypeAbstractClassNames.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeAbstractClassNames.java"), expected);
     }
 
     @Test
@@ -68,7 +75,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalType.java"), expected);
+        verify(checkConfig, getPath("InputIllegalType.java"), expected);
     }
 
     @Test
@@ -77,11 +84,11 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("validateAbstractClassNames", "true");
         String[] expected = {
             "6:13: " + getCheckMessage(MSG_KEY, "AbstractClass"),
-            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.coding.InputIllegalType.AbstractClass"),
+            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalType.java"), expected);
+        verify(checkConfig, getPath("InputIllegalType.java"), expected);
     }
 
     @Test
@@ -93,7 +100,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalType.java"), expected);
+        verify(checkConfig, getPath("InputIllegalType.java"), expected);
     }
 
     @Test
@@ -102,12 +109,12 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("legalAbstractClassNames", "AbstractClass");
 
         String[] expected = {
-            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.coding.InputIllegalType.AbstractClass"),
+            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator + "InputIllegalType.java"), expected);
+        verify(checkConfig, getPath("InputIllegalType.java"), expected);
     }
 
     @Test
@@ -120,8 +127,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "27:5: " + getCheckMessage(MSG_KEY, "java.util.List"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator
-                + "InputIllegalTypeSameFileName.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeSameFileName.java"), expected);
     }
 
     @Test
@@ -135,8 +141,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "27:5: " + getCheckMessage(MSG_KEY, "java.util.List"),
             "28:13: " + getCheckMessage(MSG_KEY, "ArrayList"),
         };
-        verify(checkConfig, getPath("coding" + File.separator
-                + "InputIllegalTypeSameFileName.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeSameFileName.java"), expected);
     }
 
     @Test
@@ -147,8 +152,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "10:5: " + getCheckMessage(MSG_KEY, "List"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator
-                + "InputIllegalTypeStarImports.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeStarImports.java"), expected);
     }
 
     @Test
@@ -161,8 +165,7 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
             "15:31: " + getCheckMessage(MSG_KEY, "SomeStaticClass"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator
-                + "InputIllegalTypeStaticImports.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeStaticImports.java"), expected);
     }
 
     @Test
@@ -172,16 +175,15 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
                 + " LITERAL_STATIC");
         String[] expected = {
             "6:13: " + getCheckMessage(MSG_KEY, "AbstractClass"),
-            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.coding.InputIllegalTypeMemberModifiers.AbstractClass"),
+            "9:13: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalTypeMemberModifiers.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
-            "23:15: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.coding.InputIllegalTypeMemberModifiers.AbstractClass"),
+            "23:15: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalTypeMemberModifiers.AbstractClass"),
             "25:25: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "33:15: " + getCheckMessage(MSG_KEY, "AbstractClass"),
         };
 
-        verify(checkConfig, getPath("coding" + File.separator
-                + "InputIllegalTypeMemberModifiers.java"), expected);
+        verify(checkConfig, getPath("InputIllegalTypeMemberModifiers.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
index 0acd96fb9..1799a24a9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheckTest.java
@@ -143,7 +143,7 @@ public class VisibilityModifierCheckTest
         final DefaultConfiguration checkConfig =
                 createCheckConfig(VisibilityModifierCheck.class);
         checkConfig.addAttribute("immutableClassCanonicalNames",
-                 "com.puppycrawl.tools.checkstyle.coding.GregorianCalendar,"
+                 "com.puppycrawl.tools.checkstyle.checks.coding.GregorianCalendar,"
                  + "com.puppycrawl.tools.checkstyle.InetSocketAddress");
         final String[] expected = {
             "7:46: " + getCheckMessage(MSG_KEY, "calendar"),
@@ -159,7 +159,7 @@ public class VisibilityModifierCheckTest
         final String[] expected = {
             "7:46: " + getCheckMessage(MSG_KEY, "calendar"),
             "8:36: " + getCheckMessage(MSG_KEY, "calendar2"),
-            "9:75: " + getCheckMessage(MSG_KEY, "calendar3"),
+            "9:82: " + getCheckMessage(MSG_KEY, "calendar3"),
             "10:36: " + getCheckMessage(MSG_KEY, "address"),
         };
         verify(checkConfig, getPath("InputImmutableSameTypeName.java"), expected);