From 82767dbe6883f12afe79beb478ca728351aaec88 Mon Sep 17 00:00:00 2001 From: rnveach Date: Sat, 10 Oct 2015 23:11:37 -0400 Subject: [PATCH] Issue #2161: unify test input locations --- .../checks/blocks/AvoidNestedBlocksCheckTest.java | 9 ++++++++- .../{ => checks/blocks}/InputNestedBlocks.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks/blocks}/InputNestedBlocks.java (96%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java index 0f10c9446..5e7ca24c4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheckTest.java @@ -22,6 +22,9 @@ package com.puppycrawl.tools.checkstyle.checks.blocks; import static com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck.MSG_KEY_BLOCK_NESTED; import static org.junit.Assert.assertArrayEquals; +import java.io.File; +import java.io.IOException; + import org.junit.Test; import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; @@ -30,6 +33,11 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class AvoidNestedBlocksCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "blocks" + File.separator + filename); + } @Test public void testGetRequiredTokens() { @@ -74,5 +82,4 @@ public class AvoidNestedBlocksCheckTest int[] expected = {TokenTypes.SLIST }; assertArrayEquals(expected, actual); } - } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNestedBlocks.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNestedBlocks.java similarity index 96% rename from src/test/resources/com/puppycrawl/tools/checkstyle/InputNestedBlocks.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNestedBlocks.java index f12cdb306..4be8c9da1 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNestedBlocks.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNestedBlocks.java @@ -2,7 +2,7 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle; +package com.puppycrawl.tools.checkstyle.checks.blocks; /** * Test case for finding nested blocks.