From 83e685bdac0b1e7e838eded12bfeee93d3ca527a Mon Sep 17 00:00:00 2001 From: rnveach Date: Sat, 17 Oct 2015 15:13:33 -0400 Subject: [PATCH] Issue #2161: unify test input locations for import package --- .../tools/checkstyle/AllChecksTest.java | 2 +- .../tools/checkstyle/api/FileTextTest.java | 2 +- .../checks/imports/AvoidStarImportTest.java | 6 +- .../checks/imports/AvoidStaticImportTest.java | 20 ++--- .../imports/ImportControlCheckTest.java | 80 +++++++++---------- .../imports/ImportControlLoaderTest.java | 19 ++--- .../InputCustomImportOrderSamePackage2.java | 18 ----- .../imports/InputAvoidStarImportCheck.java | 2 +- .../imports/InputAvoidStaticImportCheck.java | 6 +- .../InputAvoidStaticImportNestedClass.java | 2 +- .../imports/InputIllegalImportCheck.java | 2 +- .../imports/InputImportControl.java | 2 +- .../import-control_MODIFIED_FOR_UT.dtd | 0 .../imports/import-control_WithNewElement.xml | 2 +- .../imports/import-control_broken.xml | 0 .../imports/import-control_complete.xml | 0 .../imports/import-control_one-re.xml | 2 +- .../imports/import-control_one.xml | 2 +- .../imports/import-control_two-re.xml | 2 +- .../imports/import-control_two.xml | 2 +- .../imports/import-control_wrong.xml | 0 .../imports/InputCustomImportOrder3.java | 20 ----- .../imports/InputCustomImportOrderTemp.java | 18 ----- 23 files changed, 71 insertions(+), 138 deletions(-) delete mode 100644 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderSamePackage2.java rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/InputAvoidStaticImportNestedClass.java (75%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/InputImportControl.java (72%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_MODIFIED_FOR_UT.dtd (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_WithNewElement.xml (82%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_broken.xml (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_complete.xml (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_one-re.xml (87%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_one.xml (86%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_two-re.xml (89%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_two.xml (88%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/imports/import-control_wrong.xml (100%) delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AllChecksTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AllChecksTest.java index 84aa467ea..98ccad8eb 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AllChecksTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AllChecksTest.java @@ -70,7 +70,7 @@ public class AllChecksTest extends BaseCheckTestSupport { if (check.equals(ImportControlCheck.class)) { // ImportControlCheck must have the import control configuration file to avoid violation. checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml"); + "src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_complete.xml"); } checker = createChecker(checkConfig); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java index 19c58f020..c81cc3bd6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileTextTest.java @@ -48,7 +48,7 @@ public class FileTextTest { public void testSupportedCharset() throws IOException { String charsetName = "ISO-8859-1"; FileText o = new FileText(new File("src/test/resources/com/puppycrawl/tools/" - + "checkstyle/imports/import-control_complete.xml"), charsetName); + + "checkstyle/checks/imports/import-control_complete.xml"), charsetName); assertEquals(o.getCharset().name(), charsetName); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java index f18c31a3a..d43626ea7 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java @@ -45,7 +45,7 @@ public class AvoidStarImportTest final DefaultConfiguration checkConfig = createCheckConfig(AvoidStarImportCheck.class); final String[] expected = { - "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.*"), + "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.*"), "9: " + getCheckMessage(MSG_KEY, "java.io.*"), "10: " + getCheckMessage(MSG_KEY, "java.lang.*"), "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), @@ -66,7 +66,7 @@ public class AvoidStarImportTest "java.io,java.lang,javax.swing.WindowConstants.*, javax.swing.WindowConstants"); // allow the java.io/java.lang,javax.swing.WindowConstants star imports final String[] expected2 = { - "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.*"), + "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.*"), "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"), }; verify(checkConfig, getPath("InputAvoidStarImportCheck.java"), @@ -91,7 +91,7 @@ public class AvoidStarImportTest checkConfig.addAttribute("allowStaticMemberImports", "true"); // allow all static star imports final String[] expected2 = { - "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.*"), + "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.*"), "9: " + getCheckMessage(MSG_KEY, "java.io.*"), "10: " + getCheckMessage(MSG_KEY, "java.lang.*"), }; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java index c5aa2b304..f7c43cff4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java @@ -57,8 +57,8 @@ public class AvoidStaticImportTest "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass"), - "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), + "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"), + "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), }; verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected); @@ -74,8 +74,8 @@ public class AvoidStaticImportTest final String[] expected = { "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), - "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass"), - "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), + "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"), + "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), }; verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected); } @@ -92,8 +92,8 @@ public class AvoidStaticImportTest "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass"), - "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), + "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"), + "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), }; verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected); } @@ -115,8 +115,8 @@ public class AvoidStaticImportTest "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass"), - "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), + "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"), + "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"), }; verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected); } @@ -130,14 +130,14 @@ public class AvoidStaticImportTest // should mask com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one checkConfig.addAttribute( "excludes", - "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.*"); + "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.*"); final String[] expected = { "23: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"), "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"), "27: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"), "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"), - "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass"), + "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"), }; verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java index c2e21393d..744fe9b89 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; +import java.io.IOException; import java.lang.reflect.InvocationTargetException; import org.apache.commons.lang3.ArrayUtils; @@ -38,6 +39,17 @@ import com.puppycrawl.tools.checkstyle.api.CheckstyleException; import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class ImportControlCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "imports" + File.separator + filename); + } + + @Override + protected String getUriString(String filename) { + return super.getUriString("checks" + File.separator + + "imports" + File.separator + filename); + } @Test public void testGetRequiredTokens() { @@ -53,54 +65,47 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { @Test public void testOne() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml"); + checkConfig.addAttribute("file", getPath("import-control_one.xml")); final String[] expected = {"5:1: " + getCheckMessage(MSG_DISALLOWED, "java.io.File")}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testTwo() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml"); + checkConfig.addAttribute("file", getPath("import-control_two.xml")); final String[] expected = { "3:1: " + getCheckMessage(MSG_DISALLOWED, "java.awt.Image"), "4:1: " + getCheckMessage(MSG_DISALLOWED, "javax.swing.border.*"), "6:1: " + getCheckMessage(MSG_DISALLOWED, "java.awt.Button.ABORT"), }; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testWrong() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_wrong.xml"); - final String[] expected = {"1:40: " + getCheckMessage(MSG_UNKNOWN_PKG)}; + checkConfig.addAttribute("file", getPath("import-control_wrong.xml")); + final String[] expected = {"1:47: " + getCheckMessage(MSG_UNKNOWN_PKG)}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testMissing() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - final String[] expected = {"1:40: " + getCheckMessage(MSG_MISSING_FILE)}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + final String[] expected = {"1:47: " + getCheckMessage(MSG_MISSING_FILE)}; + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testEmpty() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); checkConfig.addAttribute("file", " "); - final String[] expected = {"1:40: " + getCheckMessage(MSG_MISSING_FILE)}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + final String[] expected = {"1:47: " + getCheckMessage(MSG_MISSING_FILE)}; + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test @@ -109,8 +114,7 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { checkConfig.addAttribute("file", "unknown-file"); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; try { - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); fail("Test should fail if exception was not thrown"); } catch (CheckstyleException ex) { @@ -122,12 +126,10 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { @Test public void testBroken() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_broken.xml"); + checkConfig.addAttribute("file", getPath("import-control_broken.xml")); final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; try { - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); fail("Test should fail if exception was not thrown"); } catch (CheckstyleException ex) { @@ -139,27 +141,23 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { @Test public void testOneRegExp() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml"); + checkConfig.addAttribute("file", getPath("import-control_one-re.xml")); final String[] expected = {"5:1: " + getCheckMessage(MSG_DISALLOWED, "java.io.File")}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testTwoRegExp() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("file", - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml"); + checkConfig.addAttribute("file", getPath("import-control_two-re.xml")); final String[] expected = { "3:1: " + getCheckMessage(MSG_DISALLOWED, "java.awt.Image"), "4:1: " + getCheckMessage(MSG_DISALLOWED, "javax.swing.border.*"), "6:1: " + getCheckMessage(MSG_DISALLOWED, "java.awt.Button.ABORT"), }; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test @@ -179,22 +177,19 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { @Test public void testUrl() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); - checkConfig.addAttribute("url", getUriString("imports" + File.separator - + "import-control_one.xml")); + checkConfig.addAttribute("url", getUriString("import-control_one.xml")); final String[] expected = {"5:1: " + getCheckMessage(MSG_DISALLOWED, "java.io.File")}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test public void testUrlBlank() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class); checkConfig.addAttribute("url", ""); - final String[] expected = {"1:40: " + getCheckMessage(MSG_MISSING_FILE)}; + final String[] expected = {"1:47: " + getCheckMessage(MSG_MISSING_FILE)}; - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); } @Test @@ -204,8 +199,7 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; try { - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); fail("Test should fail if exception was not thrown"); } catch (final CheckstyleException ex) { @@ -221,8 +215,7 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; try { - verify(checkConfig, getPath("imports" + File.separator - + "InputImportControl.java"), expected); + verify(checkConfig, getPath("InputImportControl.java"), expected); fail("Test should fail if exception was not thrown"); } catch (final CheckstyleException ex) { @@ -243,5 +236,4 @@ public class ImportControlCheckTest extends BaseCheckTestSupport { private static String getInvocationTargetExceptionMessage(CheckstyleException ex) { return ((InvocationTargetException) ex.getCause().getCause()).getTargetException().getMessage(); } - } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java index 39a7a13d9..422a7a3c2 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoaderTest.java @@ -34,27 +34,28 @@ import org.xml.sax.helpers.AttributesImpl; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; public class ImportControlLoaderTest { + private static String getPath(String filename) { + return "src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/" + filename; + } + @Test public void testLoad() throws CheckstyleException { final PkgControl root = - ImportControlLoader.load(new File( - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml").toURI()); + ImportControlLoader.load(new File(getPath("import-control_complete.xml")).toURI()); assertNotNull(root); } @Test(expected = CheckstyleException.class) public void testWrongFormatURI() throws Exception { final PkgControl root = - ImportControlLoader.load( - new URI("aaa://src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml")); + ImportControlLoader.load(new URI("aaa://" + getPath("import-control_complete.xml"))); assertNotNull(root); } @Test public void testExtraElementInConfig() throws Exception { final PkgControl root = - ImportControlLoader.load(new File( - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml").toURI()); + ImportControlLoader.load(new File(getPath("import-control_WithNewElement.xml")).toURI()); assertNotNull(root); } @@ -78,7 +79,6 @@ public class ImportControlLoaderTest { | ClassNotFoundException | NoSuchMethodException | SecurityException e) { throw new IllegalStateException(e); } - } @Test(expected = InvocationTargetException.class) @@ -92,14 +92,11 @@ public class ImportControlLoaderTest { "com.puppycrawl.tools.checkstyle.checks.imports.ImportControlLoader"); Method privateMethod = clazz.getDeclaredMethod("load", InputSource.class, URI.class); privateMethod.setAccessible(true); - privateMethod.invoke(null, source, new File( - "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml").toURI()); + privateMethod.invoke(null, source, new File(getPath("import-control_complete.xml")).toURI()); } catch (IllegalAccessException | IllegalArgumentException | ClassNotFoundException | NoSuchMethodException | SecurityException e) { throw new IllegalStateException(e); } - } - } diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderSamePackage2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderSamePackage2.java deleted file mode 100644 index 4d4a2eddc..000000000 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderSamePackage2.java +++ /dev/null @@ -1,18 +0,0 @@ -//Moved to noncompilable because UT requires imports from the same package -package java.util.concurrent; -import java.util.regex.Pattern; -import java.util.List; //warn, LEX, should be before "java.util.regex.Pattern" -import java.util.regex.Matcher; //warn, LEX, should be before "java.util.regex.Pattern" -import java.util.StringTokenizer; //warn, LEX, should be before "java.util.regex.Pattern" -import java.util.*; //warn, LEX, should be before "java.util.regex.Pattern" -import java.util.concurrent.AbstractExecutorService; //warn, ORDER, should be on SAME_PACKAGE, now NOT_ASSIGNED -import java.util.concurrent.*; //warn, ORDER, should be on SAME_PACKAGE, now NOT_ASSIGNED - -public class InputCustomImportOrderSamePackage2 { -} -/* -test: testOnlySamePackage() -configuration: - checkConfig.addAttribute("customImportOrderRules", "SAME_PACKAGE(3)"); - checkConfig.addAttribute("sortImportsInGroupAlphabetically", "true"); -*/ diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java index 089db74ea..dae791118 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java @@ -4,7 +4,7 @@ //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle.checks.imports; -import com.puppycrawl.tools.checkstyle.imports.*; +import com.puppycrawl.tools.checkstyle.checks.imports.*; import java.io.*; import java.lang.*; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java index c2a5feed3..3c9248d33 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java @@ -4,7 +4,7 @@ //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle.checks.imports; -import com.puppycrawl.tools.checkstyle.imports.*; +import com.puppycrawl.tools.checkstyle.checks.imports.*; import java.io.*; import java.lang.*; @@ -26,8 +26,8 @@ import static javax.swing.WindowConstants.*; import static javax.swing.WindowConstants.*; import static java.io.File.createTempFile; import static java.io.File.pathSeparator; -import static com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass; -import static com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one; +import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass; +import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one; import java.awt.Component; import java.awt.Graphics2D; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputAvoidStaticImportNestedClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportNestedClass.java similarity index 75% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputAvoidStaticImportNestedClass.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportNestedClass.java index 8e9cbabf0..a9f112b8d 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputAvoidStaticImportNestedClass.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportNestedClass.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.imports; +package com.puppycrawl.tools.checkstyle.checks.imports; public class InputAvoidStaticImportNestedClass{ public static Integer zero=0; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java index 92a185f6f..748fb9ae3 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java @@ -4,7 +4,7 @@ //////////////////////////////////////////////////////////////////////////////// package com.puppycrawl.tools.checkstyle.checks.imports; -import com.puppycrawl.tools.checkstyle.imports.*; +import com.puppycrawl.tools.checkstyle.checks.imports.*; import java.io.*; import java.lang.*; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportControl.java similarity index 72% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportControl.java index addb2438d..248323395 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportControl.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.imports; +package com.puppycrawl.tools.checkstyle.checks.imports; import java.awt.Image; import javax.swing.border.*; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_MODIFIED_FOR_UT.dtd b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_MODIFIED_FOR_UT.dtd rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_WithNewElement.xml similarity index 82% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_WithNewElement.xml index 8451e1c49..d024a08f8 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_WithNewElement.xml @@ -1,7 +1,7 @@ + "src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd"> diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_broken.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_broken.xml similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_broken.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_broken.xml diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_complete.xml similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_complete.xml diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml similarity index 87% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml index 422652aba..0330a95ab 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml @@ -3,7 +3,7 @@ "-//Puppy Crawl//DTD Import Control 1.1//EN" "http://www.puppycrawl.com/dtds/import_control_1_1.dtd"> - + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml similarity index 86% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml index c3f322364..56284c1eb 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml @@ -3,7 +3,7 @@ "-//Puppy Crawl//DTD Import Control 1.0//EN" "http://www.puppycrawl.com/dtds/import_control_1_0.dtd"> - + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two-re.xml similarity index 89% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two-re.xml index 1ffe4b004..9105f05f5 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two-re.xml @@ -3,7 +3,7 @@ "-//Puppy Crawl//DTD Import Control 1.1//EN" "http://www.puppycrawl.com/dtds/import_control_1_1.dtd"> - + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two.xml similarity index 88% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two.xml index a8293c7ec..1e589b5bb 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two.xml @@ -3,7 +3,7 @@ "-//Puppy Crawl//DTD Import Control 1.0//EN" "http://www.puppycrawl.com/dtds/import_control_1_0.dtd"> - + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_wrong.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_wrong.xml similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_wrong.xml rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_wrong.xml diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java deleted file mode 100644 index 1363138a9..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.puppycrawl.tools.checkstyle.imports; - -import static java.io.File.createTempFile; -import static java.awt.Button.ABORT; -import static javax.swing.WindowConstants.*; - -import com.puppycrawl.tools.*; -import java.util.StringTokenizer; -import java.util.*; -import java.util.concurrent.AbstractExecutorService; -import java.util.concurrent.*; - -import com.puppycrawl.tools.*; -import com.*; - -import com.google.common.*; -import org.junit.*; - -public class InputCustomImportOrder3 { -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java deleted file mode 100644 index 508a8706b..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.puppycrawl.tools.checkstyle.imports; - -import com.google.common.annotations.VisibleForTesting; - -import java.io.Closeable; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.ref.PhantomReference; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class InputCustomImportOrderTemp { -}