From 284670d938192000d87e0c8edbc18bf29b44bb96 Mon Sep 17 00:00:00 2001
From: rnveach <rveach02@gmail.com>
Date: Sat, 10 Oct 2015 23:41:34 -0400
Subject: [PATCH] Issue #2161: unify test input locations

---
 .../checks/coding/EqualsAvoidNullCheckTest.java       | 11 +++++++++--
 .../{ => checks}/coding/InputEqualsAvoidNull.java     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/coding/InputEqualsAvoidNull.java (99%)

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
index 82aa3f207..ce2747afa 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheckTest.java
@@ -23,6 +23,7 @@ import static com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck
 import static com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck.MSG_EQUALS_IGNORE_CASE_AVOID_NULL;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,6 +32,12 @@ import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
 public class EqualsAvoidNullCheckTest extends BaseCheckTestSupport {
+    @Override
+    protected String getPath(String filename) throws IOException {
+        return super.getPath("checks" + File.separator
+                + "coding" + File.separator + filename);
+    }
+
     @Test
     public void testEqualsWithDefault() throws Exception {
         final DefaultConfiguration checkConfig =
@@ -89,7 +96,7 @@ public class EqualsAvoidNullCheckTest extends BaseCheckTestSupport {
             "368:30: " + getCheckMessage(MSG_EQUALS_AVOID_NULL),
             "394:35: " + getCheckMessage(MSG_EQUALS_AVOID_NULL),
         };
-        verify(checkConfig, getPath("coding" + File.separator + "InputEqualsAvoidNull.java"), expected);
+        verify(checkConfig, getPath("InputEqualsAvoidNull.java"), expected);
     }
 
     @Test
@@ -139,7 +146,7 @@ public class EqualsAvoidNullCheckTest extends BaseCheckTestSupport {
             "368:30: " + getCheckMessage(MSG_EQUALS_AVOID_NULL),
             "394:35: " + getCheckMessage(MSG_EQUALS_AVOID_NULL),
         };
-        verify(checkConfig, getPath("coding" + File.separator + "InputEqualsAvoidNull.java"), expected);
+        verify(checkConfig, getPath("InputEqualsAvoidNull.java"), expected);
     }
 
     @Test
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputEqualsAvoidNull.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsAvoidNull.java
similarity index 99%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputEqualsAvoidNull.java
rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsAvoidNull.java
index aa962ea30..998801df1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputEqualsAvoidNull.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsAvoidNull.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding;
 import java.util.Map;
 public class InputEqualsAvoidNull {