Issue #4437: Modified AvoidStarImportCheckTest.java and moved its inp…

…ut files to the avoidstarimport subdirectory
checkstyle · Jun 9, 2017 · d0719e1 · d0719e1
1 parent 1056372
commit d0719e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheckTest.java
@@ -36,7 +36,7 @@ public class AvoidStarImportCheckTest
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "imports" + File.separator + filename);
+                + "imports" + File.separator + "avoidstarimport" + File.separator + filename);
     }
 
     @Test
@@ -53,7 +53,7 @@ public void testDefaultOperation()
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
 
-        verify(checkConfig, getPath("InputAvoidStarImport.java"),
+        verify(checkConfig, getPath("InputAvoidStarImportDefault.java"),
                 expected);
     }
 
@@ -69,7 +69,7 @@ public void testExcludes()
             "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.*"),
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
-        verify(checkConfig, getPath("InputAvoidStarImport.java"),
+        verify(checkConfig, getPath("InputAvoidStarImportDefault.java"),
                 expected2);
     }
 
@@ -82,7 +82,7 @@ public void testAllowClassImports() throws Exception {
             "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
             "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"), };
-        verify(checkConfig, getPath("InputAvoidStarImport.java"), expected2);
+        verify(checkConfig, getPath("InputAvoidStarImportDefault.java"), expected2);
     }
 
     @Test
@@ -95,7 +95,7 @@ public void testAllowStaticMemberImports() throws Exception {
             "9: " + getCheckMessage(MSG_KEY, "java.io.*"),
             "10: " + getCheckMessage(MSG_KEY, "java.lang.*"),
         };
-        verify(checkConfig, getPath("InputAvoidStarImport.java"), expected2);
+        verify(checkConfig, getPath("InputAvoidStarImportDefault.java"), expected2);
     }
 
     @Test

diff --git a/.../checks/imports/InputAvoidStarImport.java → ...arimport/InputAvoidStarImportDefault.java b/.../checks/imports/InputAvoidStarImport.java → ...arimport/InputAvoidStarImportDefault.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports.avoidstarimport;
 
 import com.puppycrawl.tools.checkstyle.checks.imports.*;
 
@@ -53,7 +53,7 @@
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputAvoidStarImport
+class InputAvoidStarImportDefault
 {
     /** ignore **/
     private Class mUse1 = Connection.class;