Issue #2161: unify test input locations

1 files changed, 16 insertions, 4 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
index 772398f0d..e99a1ab5e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
@@ -22,6 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 import static com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck.MSG_KEY;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Assert;
@@ -31,6 +32,18 @@ import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class PackageDeclarationCheckTest 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 testDefault() throws Exception {
         DefaultConfiguration checkConfig = createCheckConfig(PackageDeclarationCheck.class);
@@ -39,8 +52,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "4: " + getCheckMessage(MSG_KEY),
         };
 
-        verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/tools/"
-                + "checkstyle/coding/InputNoPackage.java").getCanonicalPath(), expected);
+        verify(checkConfig, getNonCompilablePath("InputNoPackage.java"), expected);
     }
 
     @Test
@@ -51,7 +63,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "1: " + getCheckMessage(MSG_KEY),
         };
 
-        verify(checkConfig, getPath("coding/InputWithCommentOnly.java"), expected);
+        verify(checkConfig, getPath("InputWithCommentOnly.java"), expected);
     }
 
     @Test
@@ -60,7 +72,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
 
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("coding/InputPackageDeclaration.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclaration.java"), expected);
     }
 
     @Test