From b6995b7dad047bfedecad425e06953ca650667ac Mon Sep 17 00:00:00 2001 From: rnveach Date: Sun, 11 Oct 2015 00:16:37 -0400 Subject: [PATCH] Issue #2161: unify test input locations --- .../checks/coding/IllegalThrowsCheckTest.java | 21 ++++++++++++------- .../coding/InputIllegalThrowsCheck.java | 2 +- ...galThrowsCheckIgnoreOverriddenMethods.java | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/coding/InputIllegalThrowsCheck.java (87%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java (85%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java index 7b5c83e90..61010bdeb 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java @@ -22,6 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import static com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck.MSG_KEY; import java.io.File; +import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.junit.Assert; @@ -31,6 +32,12 @@ import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; public class IllegalThrowsCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "coding" + File.separator + filename); + } + @Test public void testDefault() throws Exception { DefaultConfiguration checkConfig = createCheckConfig(IllegalThrowsCheck.class); @@ -41,7 +48,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { "14:73: " + getCheckMessage(MSG_KEY, "java.lang.Error"), }; - verify(checkConfig, getPath("coding" + File.separator + "InputIllegalThrowsCheck.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected); } @Test @@ -59,7 +66,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { "14:73: " + getCheckMessage(MSG_KEY, "java.lang.Error"), }; - verify(checkConfig, getPath("coding" + File.separator + "InputIllegalThrowsCheck.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected); } /** @@ -75,7 +82,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { "18:35: " + getCheckMessage(MSG_KEY, "Throwable"), }; - verify(checkConfig, getPath("coding" + File.separator + "InputIllegalThrowsCheck.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected); } /** @@ -93,7 +100,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { "18:35: " + getCheckMessage(MSG_KEY, "Throwable"), }; - verify(checkConfig, getPath("coding" + File.separator + "InputIllegalThrowsCheck.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected); } /** @@ -107,8 +114,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("coding" + File.separator - + "InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected); } /** @@ -125,8 +131,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport { "12:51: " + getCheckMessage(MSG_KEY, "RuntimeException"), }; - verify(checkConfig, getPath("coding" + File.separator - + "InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected); + verify(checkConfig, getPath("InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected); } @Test diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheck.java similarity index 87% rename from src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheck.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheck.java index 0699e5e7d..564933157 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheck.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.coding; +package com.puppycrawl.tools.checkstyle.checks.coding; /** Input file */ public class InputIllegalThrowsCheck { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java similarity index 85% rename from src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java index 431795b28..b74114675 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.coding; +package com.puppycrawl.tools.checkstyle.checks.coding; public class InputIllegalThrowsCheckIgnoreOverriddenMethods extends InputIllegalThrowsCheck