diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java index c3393fbd5..b79ab58bb 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheckTest.java @@ -22,6 +22,9 @@ package com.puppycrawl.tools.checkstyle.checks.sizes; import static com.puppycrawl.tools.checkstyle.checks.sizes.AnonInnerLengthCheck.MSG_KEY; import static org.junit.Assert.assertArrayEquals; +import java.io.File; +import java.io.IOException; + import org.junit.Test; import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; @@ -34,6 +37,11 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * @author Lars Kühne */ public class AnonInnerLengthCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "sizes" + File.separator + filename); + } @Test public void testGetRequiredTokens() { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java index 046848e32..2692c3219 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheckTest.java @@ -21,10 +21,14 @@ package com.puppycrawl.tools.checkstyle.checks.sizes; import static com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck.MSG_KEY; +import java.io.File; +import java.io.IOException; + import org.apache.commons.lang3.ArrayUtils; import org.junit.Test; import antlr.CommonHiddenStreamToken; + import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.api.DetailAST; @@ -32,6 +36,12 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class ExecutableStatementCountCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "sizes" + File.separator + filename); + } + @Test public void testMaxZero() throws Exception { final DefaultConfiguration checkConfig = diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java index e2bf6fbd6..5d52d5080 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java @@ -26,6 +26,9 @@ import static com.puppycrawl.tools.checkstyle.checks.sizes.MethodCountCheck.MSG_ import static com.puppycrawl.tools.checkstyle.checks.sizes.MethodCountCheck.MSG_PUBLIC_METHODS; import static org.junit.Assert.assertArrayEquals; +import java.io.File; +import java.io.IOException; + import org.apache.commons.lang3.ArrayUtils; import org.junit.Test; @@ -34,6 +37,11 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class MethodCountCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "sizes" + File.separator + filename); + } @Test public void testGetRequiredTokens() { @@ -65,7 +73,7 @@ public class MethodCountCheckTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("sizes/MethodCountCheckInput.java"), expected); + verify(checkConfig, getPath("MethodCountCheckInput.java"), expected); } @Test @@ -90,7 +98,7 @@ public class MethodCountCheckTest extends BaseCheckTestSupport { "45: " + getCheckMessage(MSG_MANY_METHODS, 5, 3), }; - verify(checkConfig, getPath("sizes/MethodCountCheckInput.java"), expected); + verify(checkConfig, getPath("MethodCountCheckInput.java"), expected); } @Test @@ -105,7 +113,7 @@ public class MethodCountCheckTest extends BaseCheckTestSupport { "9: " + getCheckMessage(MSG_MANY_METHODS, 3, 2), }; - verify(checkConfig, getPath("sizes/MethodCountCheckInput2.java"), expected); + verify(checkConfig, getPath("MethodCountCheckInput2.java"), expected); } @Test @@ -118,6 +126,6 @@ public class MethodCountCheckTest extends BaseCheckTestSupport { "3: " + getCheckMessage(MSG_MANY_METHODS, 5, 2), }; - verify(checkConfig, getPath("sizes/MethodCountCheckInput3.java"), expected); + verify(checkConfig, getPath("MethodCountCheckInput3.java"), expected); } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/ExecutableStatementCountInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountInput.java similarity index 97% rename from src/test/resources/com/puppycrawl/tools/checkstyle/ExecutableStatementCountInput.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountInput.java index 9277929f2..2191bca23 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/ExecutableStatementCountInput.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountInput.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle; +package com.puppycrawl.tools.checkstyle.checks.sizes; public class ExecutableStatementCountInput { public void foo() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAnonInnerLength.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputAnonInnerLength.java similarity index 98% rename from src/test/resources/com/puppycrawl/tools/checkstyle/InputAnonInnerLength.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputAnonInnerLength.java index b4aab6501..766a368d2 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAnonInnerLength.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputAnonInnerLength.java @@ -2,7 +2,7 @@ // Test case file for checkstyle. // Created: 2002 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle; +package com.puppycrawl.tools.checkstyle.checks.sizes; import java.awt.event.MouseEvent; import java.awt.event.MouseAdapter; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java similarity index 98% rename from src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java index b62384ab4..200f71068 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.sizes; +package com.puppycrawl.tools.checkstyle.checks.sizes; public class MethodCountCheckInput { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput2.java similarity index 85% rename from src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput2.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput2.java index 5c1edbbbd..45e18bac6 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput2.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput2.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.sizes; +package com.puppycrawl.tools.checkstyle.checks.sizes; public enum MethodCountCheckInput2 { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput3.java similarity index 91% rename from src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput3.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput3.java index 2d744af72..4b1d6aa08 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/sizes/MethodCountCheckInput3.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput3.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.sizes; +package com.puppycrawl.tools.checkstyle.checks.sizes; public class MethodCountCheckInput3 {