Issue #2161: unify test input locations for filters package

5 files changed, 39 insertions, 18 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
index 5eb86c57c..1b81a7be4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWarningsFilterTest.java
@@ -19,6 +19,8 @@
 
 package com.puppycrawl.tools.checkstyle.filters;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Locale;
@@ -53,6 +55,11 @@ public class SuppressWarningsFilterTest
         "56:9: Catching 'Exception' is not allowed.",
     };
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("filters" + File.separator + filename);
+    }
+
     @Test
     public void testNone() throws Exception {
         final DefaultConfiguration filterConfig = null;
@@ -81,7 +88,7 @@ public class SuppressWarningsFilterTest
     private void verifySuppressed(Configuration aFilterConfig,
             String... aSuppressed) throws Exception {
         verify(createChecker(aFilterConfig),
-            getPath("filters/InputSuppressWarningsFilter.java"),
+            getPath("InputSuppressWarningsFilter.java"),
             removeSuppressed(ALL_MESSAGES, aSuppressed));
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
index 710c2217a..22532ff37 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilterTest.java
@@ -21,6 +21,8 @@ package com.puppycrawl.tools.checkstyle.filters;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Locale;
@@ -78,6 +80,11 @@ public class SuppressWithNearbyCommentFilterTest
         "81:17: Name 'A1' must match pattern '^[a-z][a-zA-Z0-9]*$'.",
     };
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("filters" + File.separator + filename);
+    }
+
     @Test
     public void testNone() throws Exception {
         final DefaultConfiguration filterConfig = null;
@@ -198,7 +205,7 @@ public class SuppressWithNearbyCommentFilterTest
             String... suppressed)
         throws Exception {
         verify(createChecker(filterConfig),
-               getPath("filters/InputSuppressWithNearbyCommentFilter.java"),
+               getPath("InputSuppressWithNearbyCommentFilter.java"),
                removeSuppressed(ALL_MESSAGES, suppressed));
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
index 388256b05..ab1d10033 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java
@@ -21,6 +21,8 @@ package com.puppycrawl.tools.checkstyle.filters;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Locale;
@@ -69,6 +71,11 @@ public class SuppressionCommentFilterTest
         "86:31: Catching 'Exception' is not allowed.",
     };
 
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("filters" + File.separator + filename);
+    }
+
     @Test
     public void testNone() throws Exception {
         final DefaultConfiguration filterConfig = null;
@@ -198,7 +205,7 @@ public class SuppressionCommentFilterTest
             String... aSuppressed)
         throws Exception {
         verify(createChecker(aFilterConfig),
-               getPath("filters/InputSuppressionCommentFilter.java"),
+               getPath("InputSuppressionCommentFilter.java"),
                removeSuppressed(ALL_MESSAGES, aSuppressed));
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
index 55b39169c..33e36f82c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
@@ -40,7 +40,7 @@ public class SuppressionFilterTest {
     @Test
     public void testAccept() throws CheckstyleException {
         SuppressionFilter filter = new SuppressionFilter();
-        filter.setFile("src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
+        filter.setFile("src/test/resources/com/puppycrawl/tools/checkstyle/filters/suppressions_none.xml");
 
         final AuditEvent ev = new AuditEvent(this, "ATest.java", null);
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
index bc3427d6b..6d14e79b0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
@@ -47,16 +47,19 @@ import com.puppycrawl.tools.checkstyle.api.FilterSet;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ SuppressionsLoader.class, SuppressionsLoaderTest.class })
 public class SuppressionsLoaderTest extends BaseCheckTestSupport {
-
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
+    @Override
+    protected String getPath(String filename) {
+        return "src/test/resources/com/puppycrawl/tools/checkstyle/filters/" + filename;
+    }
+
     @Test
     public void testNoSuppressions()
         throws CheckstyleException {
         final FilterSet fc =
-            SuppressionsLoader.loadSuppressions(
-                    "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
+            SuppressionsLoader.loadSuppressions(getPath("suppressions_none.xml"));
         final FilterSet fc2 = new FilterSet();
         assertEquals(fc, fc2);
     }
@@ -98,8 +101,7 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
     public void testMultipleSuppression()
         throws CheckstyleException {
         final FilterSet fc =
-            SuppressionsLoader.loadSuppressions(
-                    "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_multiple.xml");
+            SuppressionsLoader.loadSuppressions(getPath("suppressions_multiple.xml"));
         final FilterSet fc2 = new FilterSet();
         SuppressElement se0 = new SuppressElement("file0");
         se0.setChecks("check0");
@@ -122,7 +124,7 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
 
     @Test
     public void testNoFile() {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_no_file.xml";
+        final String fn = getPath("suppressions_no_file.xml");
         try {
             SuppressionsLoader.loadSuppressions(fn);
         }
@@ -135,7 +137,7 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
 
     @Test
     public void testNoCheck() {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_no_check.xml";
+        final String fn = getPath("suppressions_no_check.xml");
         try {
             SuppressionsLoader.loadSuppressions(fn);
         }
@@ -148,7 +150,7 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
 
     @Test
     public void testBadInt() {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_bad_int.xml";
+        final String fn = getPath("suppressions_bad_int.xml");
         try {
             SuppressionsLoader.loadSuppressions(fn);
         }
@@ -233,7 +235,7 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
 
     @Test
     public void testNoCheckNoId() {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_no_check_and_id.xml";
+        final String fn = getPath("suppressions_no_check_and_id.xml");
         try {
             SuppressionsLoader.loadSuppressions(fn);
         }
@@ -246,13 +248,13 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
 
     @Test
     public void testNoCheckYesId() throws Exception {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_id.xml";
+        final String fn = getPath("suppressions_id.xml");
         SuppressionsLoader.loadSuppressions(fn);
     }
 
     @Test
     public void testInvalidFileFormat() {
-        final String fn = "src/test/resources/com/puppycrawl/tools/checkstyle/suppressions_invalid_file.xml";
+        final String fn = getPath("suppressions_invalid_file.xml");
         try {
             SuppressionsLoader.loadSuppressions(fn);
         }
@@ -267,10 +269,8 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
     public void testLoadFromClasspath()
         throws CheckstyleException {
         final FilterSet fc =
-            SuppressionsLoader.loadSuppressions(
-                    "/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
+            SuppressionsLoader.loadSuppressions(getPath("suppressions_none.xml"));
         final FilterSet fc2 = new FilterSet();
         assertEquals(fc, fc2);
     }
-
 }