From e81a02f59b652d2a97576539f55360ba9c2ffe5e Mon Sep 17 00:00:00 2001 From: rnveach Date: Sat, 10 Oct 2015 23:16:02 -0400 Subject: [PATCH] Issue #2161: unify test input locations --- .../checks/blocks/EmptyCatchBlockCheckTest.java | 9 ++++++++- .../{ => checks/blocks}/InputEmptyCatchBlockCheck.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks/blocks}/InputEmptyCatchBlockCheck.java (99%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java index 8065e687b..9bf03019e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java @@ -21,6 +21,9 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; import static org.junit.Assert.assertArrayEquals; +import java.io.File; +import java.io.IOException; + import org.junit.Test; import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; @@ -33,6 +36,11 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * */ public class EmptyCatchBlockCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "blocks" + File.separator + filename); + } @Test public void testGetRequiredTokens() { @@ -78,5 +86,4 @@ public class EmptyCatchBlockCheckTest extends BaseCheckTestSupport { int[] expected = {TokenTypes.LITERAL_CATCH }; assertArrayEquals(expected, actual); } - } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyCatchBlockCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlockCheck.java similarity index 99% rename from src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyCatchBlockCheck.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlockCheck.java index 7593b9d84..d398c8f7c 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyCatchBlockCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlockCheck.java @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle; +package com.puppycrawl.tools.checkstyle.checks.blocks; import java.io.IOException; public class InputEmptyCatchBlockCheck {