From 748c0102a07f41e9ee03fd02e9e6a57eb86d0ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20K=C3=BChne?= Date: Sat, 22 Dec 2007 19:25:53 +0000 Subject: [PATCH] moved testinputs for import checks to imports package --- .../tools/checkstyle/{ => imports}/InputImport.java | 6 +++--- .../tools/checkstyle/{ => imports}/package-info.java | 0 .../checkstyle/checks/imports/AvoidStarImportTest.java | 10 ++++++---- .../checks/imports/IllegalImportCheckTest.java | 6 ++++-- .../checks/imports/RedundantImportCheckTest.java | 8 +++++--- .../checks/imports/UnusedImportsCheckTest.java | 8 +++++--- 6 files changed, 23 insertions(+), 15 deletions(-) rename src/testinputs/com/puppycrawl/tools/checkstyle/{ => imports}/InputImport.java (93%) rename src/testinputs/com/puppycrawl/tools/checkstyle/{ => imports}/package-info.java (100%) diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputImport.java b/src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImport.java similarity index 93% rename from src/testinputs/com/puppycrawl/tools/checkstyle/InputImport.java rename to src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImport.java index 44c8c6e1a..d52658d09 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputImport.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImport.java @@ -2,10 +2,10 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle; +package com.puppycrawl.tools.checkstyle.imports; -import com.puppycrawl.tools.checkstyle.*; - import com.puppycrawl.tools.checkstyle.GlobalProperties; +import com.puppycrawl.tools.checkstyle.imports.*; + import com.puppycrawl.tools.checkstyle.imports.GlobalProperties; import java.io.*; import java.lang.*; import java.lang.String; diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/package-info.java b/src/testinputs/com/puppycrawl/tools/checkstyle/imports/package-info.java similarity index 100% rename from src/testinputs/com/puppycrawl/tools/checkstyle/package-info.java rename to src/testinputs/com/puppycrawl/tools/checkstyle/imports/package-info.java diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java index c80c809ba..78d3860aa 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java @@ -1,5 +1,7 @@ package com.puppycrawl.tools.checkstyle.checks.imports; +import java.io.File; + import com.puppycrawl.tools.checkstyle.BaseCheckTestCase; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; @@ -12,12 +14,12 @@ public class AvoidStarImportTest final DefaultConfiguration checkConfig = createCheckConfig(AvoidStarImportCheck.class); final String[] expected = { - "7: Using the '.*' form of import should be avoided - com.puppycrawl.tools.checkstyle.*.", + "7: Using the '.*' form of import should be avoided - com.puppycrawl.tools.checkstyle.imports.*.", "9: Using the '.*' form of import should be avoided - java.io.*.", "10: Using the '.*' form of import should be avoided - java.lang.*.", }; - verify(checkConfig, getPath("InputImport.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected); } public void testExcludes() @@ -28,8 +30,8 @@ public class AvoidStarImportTest checkConfig.addAttribute("excludes", "java.io,java.lang"); // allow the java.io/java.lang star imports final String[] expected2 = new String[] { - "7: Using the '.*' form of import should be avoided - com.puppycrawl.tools.checkstyle.*." + "7: Using the '.*' form of import should be avoided - com.puppycrawl.tools.checkstyle.imports.*." }; - verify(checkConfig, getPath("InputImport.java"), expected2); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected2); } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java index b559abb3e..570792c79 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java @@ -1,5 +1,7 @@ package com.puppycrawl.tools.checkstyle.checks.imports; +import java.io.File; + import com.puppycrawl.tools.checkstyle.BaseCheckTestCase; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; @@ -17,7 +19,7 @@ extends BaseCheckTestCase "23:1: Import from illegal package - java.io.File.listRoots.", "27:1: Import from illegal package - java.io.File.createTempFile.", }; - verify(checkConfig, getPath("InputImport.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected); } public void testWithDefault() @@ -29,6 +31,6 @@ extends BaseCheckTestCase "15:1: Import from illegal package - sun.net.ftpclient.FtpClient.", "28:1: Import from illegal package - sun.net.ftpclient.FtpClient.*.", }; - verify(checkConfig, getPath("InputImport.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected); } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java index 259ce1d9e..4d1b6a9c1 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java @@ -1,5 +1,7 @@ package com.puppycrawl.tools.checkstyle.checks.imports; +import java.io.File; + import com.puppycrawl.tools.checkstyle.BaseCheckTestCase; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; @@ -12,13 +14,13 @@ public class RedundantImportCheckTest final DefaultConfiguration checkConfig = createCheckConfig(RedundantImportCheck.class); final String[] expected = { - "7:1: Redundant import from the same package - com.puppycrawl.tools.checkstyle.*.", - "8:38: Redundant import from the same package - com.puppycrawl.tools.checkstyle.GlobalProperties.", + "7:1: Redundant import from the same package - com.puppycrawl.tools.checkstyle.imports.*.", + "8:38: Redundant import from the same package - com.puppycrawl.tools.checkstyle.imports.GlobalProperties.", "10:1: Redundant import from the java.lang package - java.lang.*.", "11:1: Redundant import from the java.lang package - java.lang.String.", "14:1: Duplicate import to line 13 - java.util.List.", "26:1: Duplicate import to line 25 - javax.swing.WindowConstants.*." }; - verify(checkConfig, getPath("InputImport.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected); } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java index cc2f20495..da2c318fe 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java @@ -1,5 +1,7 @@ package com.puppycrawl.tools.checkstyle.checks.imports; +import java.io.File; + import com.puppycrawl.tools.checkstyle.BaseCheckTestCase; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; @@ -12,7 +14,7 @@ public class UnusedImportsCheckTest final DefaultConfiguration checkConfig = createCheckConfig(UnusedImportsCheck.class); final String[] expected = { - "8:45: Unused import - com.puppycrawl.tools.checkstyle.GlobalProperties.", + "8:45: Unused import - com.puppycrawl.tools.checkstyle.imports.GlobalProperties.", "11:8: Unused import - java.lang.String.", "13:8: Unused import - java.util.List.", "14:8: Unused import - java.util.List.", @@ -23,7 +25,7 @@ public class UnusedImportsCheckTest "29:8: Unused import - java.awt.Component.", "30:8: Unused import - java.awt.Label.", }; - verify(checkConfig, getPath("InputImport.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "InputImport.java"), expected); } public void testAnnotations() @@ -33,6 +35,6 @@ public class UnusedImportsCheckTest createCheckConfig(UnusedImportsCheck.class); final String[] expected = { }; - verify(checkConfig, getPath("package-info.java"), expected); + verify(checkConfig, getPath("imports" + File.separator + "package-info.java"), expected); } }