Issue checkstyle#4437: Arranged the remaining files from 'imports' di…

…rectory and modified the test and input files based on the rearrangement
subkrish · Jun 26, 2017 · a1988ec · a1988ec
1 parent a83475a
commit a1988ec
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 50 deletions.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java
@@ -680,7 +680,8 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst
 
         final DynamicalResourceHolderCheck check = new DynamicalResourceHolderCheck();
         final String firstExternalResourceLocation = getPath("checks" + File.separator
-            + "imports" + File.separator + "import-control_one.xml");
+            + "imports" + File.separator + "importcontrol"
+            + File.separator + "InputImportControlOne.xml");
         final String firstExternalResourceKey = PropertyCacheFile.EXTERNAL_RESOURCE_KEY_PREFIX
                 + firstExternalResourceLocation;
         check.setFirstExternalResourceLocation(firstExternalResourceLocation);
@@ -708,7 +709,8 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst
 
         // Change a list of external resources which are used by the check
         final String secondExternalResourceLocation = "checks" + File.separator
-            + "imports" + File.separator + "import-control_one-re.xml";
+            + "imports" + File.separator + "importcontrol"
+            + File.separator + "InputImportControlOneRegExp.xml";
         final String secondExternalResourceKey = PropertyCacheFile.EXTERNAL_RESOURCE_KEY_PREFIX
                 + secondExternalResourceLocation;
         check.setSecondExternalResourceLocation(secondExternalResourceLocation);

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java
@@ -60,10 +60,10 @@ public void testDefaultOperation()
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
             "29: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass.one"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
 
         verify(checkConfig, getPath("InputAvoidStaticImportDefault.java"), expected);
@@ -81,10 +81,10 @@ public void testStarExcludes()
             "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
             "29: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass.one"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
         verify(checkConfig, getPath("InputAvoidStaticImportDefault.java"), expected);
     }
@@ -103,10 +103,10 @@ public void testMemberExcludes()
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
             "29: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass.one"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
         verify(checkConfig, getPath("InputAvoidStaticImportDefault.java"), expected);
     }
@@ -131,10 +131,10 @@ public void testBogusMemberExcludes()
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
             "29: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass.one"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
         verify(checkConfig, getPath("InputAvoidStaticImportDefault.java"), expected);
     }
@@ -145,12 +145,12 @@ public void testInnerClassMemberExcludesStar()
         final DefaultConfiguration checkConfig =
             createCheckConfig(AvoidStaticImportCheck.class);
 
-        // should mask com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.
-        // InnerClass.one
+        // should mask com.puppycrawl.tools.checkstyle.imports.avoidstaticimport.
+        // InputAvoidStaticImportNestedClass.InnerClass.one
         checkConfig.addAttribute(
             "excludes",
             "com.puppycrawl.tools.checkstyle.checks.imports."
-                + "InputAvoidStaticImportNestedClass.InnerClass.*");
+                + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.*");
         final String[] expected = {
             "23: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
             "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
@@ -159,7 +159,7 @@ public void testInnerClassMemberExcludesStar()
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
             "29: " + getCheckMessage(MSG_KEY,
                 "com.puppycrawl.tools.checkstyle.checks.imports."
-                    + "InputAvoidStaticImportNestedClass.InnerClass"),
+                    + "avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass"),
         };
         verify(checkConfig, getPath("InputAvoidStaticImportDefault.java"), expected);
     }

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
@@ -51,7 +51,7 @@ public void testWithoutProcessJavadoc() throws Exception {
         checkConfig.addAttribute("processJavadoc", "false");
         final String[] expected = {
             "8:45: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug"),
+                "com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsBug"),
             "11:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
             "13:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
             "14:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
@@ -89,7 +89,7 @@ public void testProcessJavadoc() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(UnusedImportsCheck.class);
         final String[] expected = {
             "8:45: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug"),
+                "com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsBug"),
             "11:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
             "13:8: " + getCheckMessage(MSG_KEY, "java.util.List"),
             "14:8: " + getCheckMessage(MSG_KEY, "java.util.List"),

diff --git a/...rawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java b/...rawl/tools/checkstyle/checks/imports/avoidstaticimport/InputAvoidStaticImportDefault.java
@@ -26,8 +26,8 @@
 import static javax.swing.WindowConstants.*;
 import static java.io.File.createTempFile;
 import static java.io.File.pathSeparator;
-import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass;
-import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one;
+import static com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass;
+import static com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport.InputAvoidStaticImportNestedClass.InnerClass.one;
 
 import java.awt.Component;
 import java.awt.Graphics2D;

diff --git a/...ts/InputAvoidStaticImportNestedClass.java → ...rt/InputAvoidStaticImportNestedClass.java b/...ts/InputAvoidStaticImportNestedClass.java → ...rt/InputAvoidStaticImportNestedClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstaticimport;
 
 public class InputAvoidStaticImportNestedClass{
     public static Integer zero=0;

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml
diff --git a/...kstyle/checks/imports/InputImportBug.java → ...orts/importorder/InputImportOrderBug.java b/...kstyle/checks/imports/InputImportBug.java → ...orts/importorder/InputImportOrderBug.java
@@ -1,12 +1,12 @@
-package com.puppycrawl.tools.checkstyle.checks.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
 import java.net.URL;
 
-public class InputImportBug {
+public class InputImportOrderBug {
    //same as a class name
    private static String URL = "This is a String object";
 
-   public InputImportBug() throws Exception {
+   public InputImportOrderBug() throws Exception {
        URL url = new URL("file://this.is.a.url.object");
    }
 }
diff --git a/...awl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java b/...awl/tools/checkstyle/checks/imports/importorder/InputImportOrder_WildcardUnspecified.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.util.Iterator;
 
-import com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug;
+import com.puppycrawl.tools.checkstyle.checks.imports.importorder.InputImportOrderBug;
 
 public class InputImportOrder_WildcardUnspecified {
 }
diff --git a/...rces/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java b/...rces/com/puppycrawl/tools/checkstyle/checks/imports/unusedimports/InputUnusedImports.java
@@ -5,7 +5,7 @@
 package com.puppycrawl.tools.checkstyle.checks.imports.unusedimports;
 
 import com.puppycrawl.tools.checkstyle.checks.imports.*;
-                                     import com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug;
+import com.puppycrawl.tools.checkstyle.checks.imports.unusedimports.InputUnusedImportsBug;
 import java.io.*;
 import java.lang.*;
 import java.lang.String;