Issue #2161: unify test input locations for whitespace package

8 files changed, 90 insertions, 37 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
index 1f16f0799..e74c06b94 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/FileTabCharacterCheckTest.java
@@ -23,6 +23,7 @@ import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacter
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck.FILE_CONTAINS_TAB;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.junit.Test;
 
@@ -33,6 +34,12 @@ import com.puppycrawl.tools.checkstyle.api.Configuration;
 public class FileTabCharacterCheckTest
     extends BaseCheckTestSupport {
     @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
+    @Override
     protected DefaultConfiguration createCheckerConfig(
         Configuration config) {
         final DefaultConfiguration dc = new DefaultConfiguration("root");
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
index abd80ddd9..e50c979f5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
@@ -125,9 +125,7 @@ public class GenericWhitespaceCheckTest
     @Test
     public void testMethodReferences() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/tools/"
-                + "checkstyle/grammars/java8/"
-                + "InputMethodReferencesTest3.java").getCanonicalPath(), expected);
+        verify(checkConfig, getNonCompilablePath("InputMethodReferencesTest3.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
index 01b822e13..9920d3dc0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
@@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,6 +35,12 @@ public class NoWhitespaceAfterCheckTest
     extends BaseCheckTestSupport {
     private DefaultConfiguration checkConfig;
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Before
     public void setUp() {
         checkConfig = createCheckConfig(NoWhitespaceAfterCheck.class);
@@ -100,13 +109,13 @@ public class NoWhitespaceAfterCheckTest
             "40:16: " + getCheckMessage(MSG_KEY, "int"),
             "43:63: " + getCheckMessage(MSG_KEY, "getLongMultArray"),
         };
-        verify(checkConfig, getPath("whitespace/InputNoWhitespaceAfterArrayDeclarations.java"), expected);
+        verify(checkConfig, getPath("InputNoWhitespaceAfterArrayDeclarations.java"), expected);
     }
 
     @Test
     public void testNpe() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("whitespace/InputNoWhiteSpaceAfterCheckFormerNpe.java"),
+        verify(checkConfig, getPath("InputNoWhiteSpaceAfterCheckFormerNpe.java"),
                  expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
index 4b207e21d..e17f971f9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java
@@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck.MSG_KEY;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -36,6 +39,12 @@ public class NoWhitespaceBeforeCheckTest
         checkConfig = createCheckConfig(NoWhitespaceBeforeCheck.class);
     }
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Test
     public void testDefault() throws Exception {
         final String[] expected = {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
index ffe8e5cc6..b549b3d2a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java
@@ -24,6 +24,9 @@ import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPad
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_PRECEDED;
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_PRECEDED;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
 
@@ -32,6 +35,12 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class ParenPadCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Test
     public void testDefault()
         throws Exception {
@@ -109,7 +118,7 @@ public class ParenPadCheckTest
             "48:27: " + getCheckMessage(WS_PRECEDED, ")"),
             "51:26: " + getCheckMessage(WS_PRECEDED, ")"),
         };
-        verify(checkConfig, getPath("checks/whitespace/InputForWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputForWhitespace.java"), expected);
     }
 
     @Test
@@ -129,7 +138,7 @@ public class ParenPadCheckTest
             "27:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("),
             "32:14: " + getCheckMessage(WS_NOT_FOLLOWED, "("),
         };
-        verify(checkConfig, getPath("checks/whitespace/InputForWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputForWhitespace.java"), expected);
     }
 
     @Test
@@ -138,7 +147,7 @@ public class ParenPadCheckTest
             createCheckConfig(ParenPadCheck.class);
         checkConfig.addAttribute("option", PadOption.SPACE.toString());
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("whitespace/ParenPadWithSpace.java"),
+        verify(checkConfig, getPath("ParenPadWithSpace.java"),
                expected);
     }
 
@@ -213,7 +222,7 @@ public class ParenPadCheckTest
             "130:19: " + getCheckMessage(WS_FOLLOWED, "("),
             "130:19: " + getCheckMessage(WS_PRECEDED, ")"),
         };
-        verify(checkConfig, getPath("whitespace/InputParenPad.java"), expected);
+        verify(checkConfig, getPath("InputParenPad.java"), expected);
     }
 
     @Test
@@ -228,6 +237,6 @@ public class ParenPadCheckTest
             "115:53: " + getCheckMessage(WS_PRECEDED, ")"),
             "115:55: " + getCheckMessage(WS_PRECEDED, ")"),
         };
-        verify(checkConfig, getPath("whitespace/InputParenPad.java"), expected);
+        verify(checkConfig, getPath("InputParenPad.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
index 75c0ffb5a..e7bc1e436 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheckTest.java
@@ -24,6 +24,9 @@ import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPad
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_NOT_PRECEDED;
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.AbstractParenPadCheck.WS_PRECEDED;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,6 +37,12 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class TypecastParenPadCheckTest
     extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Test
     public void testDefault()
         throws Exception {
@@ -71,7 +80,7 @@ public class TypecastParenPadCheckTest
             createCheckConfig(TypecastParenPadCheck.class);
         checkConfig.addAttribute("option", PadOption.SPACE.toString());
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("checks/whitespace/InputWhitespaceAround.java"),
+        verify(checkConfig, getPath("InputWhitespaceAround.java"),
                expected);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
index 8df729508..004157df7 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheckTest.java
@@ -23,6 +23,9 @@ import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterC
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck.WS_TYPECAST;
 import static org.junit.Assert.assertArrayEquals;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +42,12 @@ public class WhitespaceAfterCheckTest
         checkConfig = createCheckConfig(WhitespaceAfterCheck.class);
     }
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Test
     public void testGetRequiredTokens() {
         WhitespaceAfterCheck checkObj = new WhitespaceAfterCheck();
@@ -65,9 +74,9 @@ public class WhitespaceAfterCheckTest
     @Test
     public void testSemi() throws Exception {
         final String[] expected = {
-            "58:23: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
-            "58:29: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
-            "107:19: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
+            "54:23: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
+            "54:29: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
+            "103:19: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
         };
         verify(checkConfig, getPath("InputBraces.java"), expected);
     }
@@ -78,7 +87,7 @@ public class WhitespaceAfterCheckTest
             "14:31: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
             "17:31: " + getCheckMessage(WS_NOT_FOLLOWED, ";"),
         };
-        verify(checkConfig, getPath("checks/whitespace/InputForWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputForWhitespace.java"), expected);
     }
 
     @Test
@@ -94,7 +103,7 @@ public class WhitespaceAfterCheckTest
     @Test
     public void test1322879() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("checks/whitespace/InputWhitespaceAround.java"),
+        verify(checkConfig, getPath("InputWhitespaceAround.java"),
                expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
index 701b1c88d..dd35d6a46 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
@@ -23,6 +23,9 @@ import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAround
 import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.WS_NOT_PRECEDED;
 import static org.junit.Assert.assertArrayEquals;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,6 +43,12 @@ public class WhitespaceAroundTest
         checkConfig = createCheckConfig(WhitespaceAroundCheck.class);
     }
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "whitespace" + File.separator + filename);
+    }
+
     @Test
     public void testGetRequiredTokens() {
         WhitespaceAroundCheck checkObj = new WhitespaceAroundCheck();
@@ -108,14 +117,14 @@ public class WhitespaceAroundTest
     public void testIt3()
         throws Exception {
         final String[] expected = {
-            "41:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"),
-            "58:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"),
+            "37:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"),
+            "54:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"),
             // + ":58:23: ';' is not followed by whitespace.",
             //  + ":58:29: ';' is not followed by whitespace.",
-            "115:27: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
-            "115:27: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
-            "118:40: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
-            "118:40: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
+            "111:27: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
+            "111:27: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
+            "114:40: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
+            "114:40: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
         };
         verify(checkConfig, getPath("InputBraces.java"), expected);
     }
@@ -126,8 +135,8 @@ public class WhitespaceAroundTest
         checkConfig.addAttribute("allowEmptyMethods", "true");
         checkConfig.addAttribute("allowEmptyConstructors", "true");
         final String[] expected = {
-            "41:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"),
-            "58:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"),
+            "37:14: " + getCheckMessage(WS_NOT_FOLLOWED, "while"),
+            "54:12: " + getCheckMessage(WS_NOT_FOLLOWED, "for"),
         };
         verify(checkConfig, getPath("InputBraces.java"), expected);
     }
@@ -145,7 +154,7 @@ public class WhitespaceAroundTest
     @Test
     public void test1322879And1649038() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("checks/whitespace/InputWhitespaceAround.java"),
+        verify(checkConfig, getPath("InputWhitespaceAround.java"),
                expected);
     }
 
@@ -155,7 +164,7 @@ public class WhitespaceAroundTest
         final String[] expected = {
             "19:20: " + getCheckMessage(WS_NOT_PRECEDED, ":"),
         };
-        verify(checkConfig, getPath("checks/whitespace/InputWhitespaceAround.java"),
+        verify(checkConfig, getPath("InputWhitespaceAround.java"),
                expected);
     }
 
@@ -170,7 +179,7 @@ public class WhitespaceAroundTest
             "31:21: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
             "31:21: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
         };
-        verify(checkConfig, getPath("whitespace/InputEmptyTypesAndCycles.java"),
+        verify(checkConfig, getPath("InputEmptyTypesAndCycles.java"),
                expected);
     }
 
@@ -189,7 +198,7 @@ public class WhitespaceAroundTest
             "60:18: " + getCheckMessage(WS_NOT_FOLLOWED, "{"),
             "60:18: " + getCheckMessage(WS_NOT_PRECEDED, "}"),
         };
-        verify(checkConfig, getPath("whitespace/InputEmptyTypesAndCycles.java"),
+        verify(checkConfig, getPath("InputEmptyTypesAndCycles.java"),
                expected);
     }
 
@@ -198,9 +207,7 @@ public class WhitespaceAroundTest
         final String[] expected = {
             "6:15: " + getCheckMessage(WS_NOT_FOLLOWED, "switch"),
         };
-        verify(checkConfig,
-               getPath("whitespace/InputSwitchWhitespaceAround.java"),
-               expected);
+        verify(checkConfig, getPath("InputSwitchWhitespaceAround.java"), expected);
     }
 
     @Test
@@ -208,18 +215,14 @@ public class WhitespaceAroundTest
         final String[] expected = {
             "9:16: " + getCheckMessage(WS_NOT_FOLLOWED, "while"),
         };
-        verify(checkConfig,
-               getPath("whitespace/InputDoWhileWhitespaceAround.java"),
-               expected);
+        verify(checkConfig, getPath("InputDoWhileWhitespaceAround.java"), expected);
     }
 
     @Test
     public void allowEmptyMethods() throws Exception {
         checkConfig.addAttribute("allowEmptyMethods", "true");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig,
-               getPath("checks/whitespace/InputWhitespaceAround.java"),
-               expected);
+        verify(checkConfig, getPath("InputWhitespaceAround.java"), expected);
     }
 
     @Test