From 06ed1d48da4a57dc87cf3c1215bfe23bce4e78d8 Mon Sep 17 00:00:00 2001 From: rnveach Date: Sat, 6 Feb 2016 21:41:32 -0500 Subject: [PATCH] Issue #2880: moved compilable resources to resource folder --- .../checks/whitespace/GenericWhitespaceCheckTest.java | 3 +-- .../puppycrawl/tools/checkstyle/internal/AllChecksTest.java | 2 +- .../com/puppycrawl/tools/checkstyle/InputDefaultConfig.java | 0 .../checks/whitespace/InputGenericWhitespaceEndsTheLine.java | 0 .../com/puppycrawl/tools/checkstyle/package-info.java | 0 5 files changed, 2 insertions(+), 3 deletions(-) rename src/test/{resources-noncompilable => resources}/com/puppycrawl/tools/checkstyle/InputDefaultConfig.java (100%) rename src/test/{resources-noncompilable => resources}/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceEndsTheLine.java (100%) rename src/test/{resources-noncompilable => resources}/com/puppycrawl/tools/checkstyle/package-info.java (100%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java index 8c2d48cf3..470134d99 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java @@ -139,8 +139,7 @@ public class GenericWhitespaceCheckTest @Test public void testGenericEndsTheLine() throws Exception { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getNonCompilablePath("InputGenericWhitespaceEndsTheLine.java"), - expected); + verify(checkConfig, getPath("InputGenericWhitespaceEndsTheLine.java"), expected); } @Test diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java index ea875cda9..d26c96a25 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java @@ -40,7 +40,7 @@ import com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck; public class AllChecksTest extends BaseCheckTestSupport { @Test public void testAllChecksWithDefaultConfiguration() throws Exception { - final String inputFilePath = getNonCompilablePath("InputDefaultConfig.java"); + final String inputFilePath = getPath("InputDefaultConfig.java"); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; for (Class check : CheckUtil.getCheckstyleChecks()) { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/InputDefaultConfig.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputDefaultConfig.java similarity index 100% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/InputDefaultConfig.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/InputDefaultConfig.java diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceEndsTheLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceEndsTheLine.java similarity index 100% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceEndsTheLine.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceEndsTheLine.java diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/package-info.java similarity index 100% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/package-info.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/package-info.java