Issue #4165: Split and Organize Checkstyle inputs by Test for checks in coding package: IllegalType

8 files changed, 37 insertions, 25 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
index eb98dc9eb..82a503ab5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheckTest.java
@@ -45,7 +45,9 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "coding" + File.separator + filename);
+                + "coding" + File.separator
+                + "illegaltype" + File.separator
+                + filename);
     }
 
     @Test
@@ -85,7 +87,8 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "6:13: " + getCheckMessage(MSG_KEY, "AbstractClass"),
             "9:13: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.AbstractClass"),
+                "com.puppycrawl.tools.checkstyle.checks.coding.illegaltype."
+                    + "InputIllegalType.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
         };
 
@@ -111,7 +114,8 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
 
         final String[] expected = {
             "9:13: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.AbstractClass"),
+                "com.puppycrawl.tools.checkstyle.checks.coding.illegaltype."
+                    + "InputIllegalType.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
         };
@@ -135,10 +139,10 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
     @Test
     public void testSameFileNameGeneral() throws Exception {
         checkConfig.addAttribute("illegalClassNames",
-            "List, InputGregorianCalendar, java.io.File, ArrayList");
+            "List, InputIllegalTypeGregorianCalendar, java.io.File, ArrayList");
         final String[] expected = {
-            "10:5: " + getCheckMessage(MSG_KEY, "InputGregorianCalendar"),
-            "16:23: " + getCheckMessage(MSG_KEY, "InputGregorianCalendar"),
+            "10:5: " + getCheckMessage(MSG_KEY, "InputIllegalTypeGregorianCalendar"),
+            "16:23: " + getCheckMessage(MSG_KEY, "InputIllegalTypeGregorianCalendar"),
             "24:9: " + getCheckMessage(MSG_KEY, "List"),
             "25:9: " + getCheckMessage(MSG_KEY, "java.io.File"),
             "27:5: " + getCheckMessage(MSG_KEY, "java.util.List"),
@@ -179,12 +183,12 @@ public class IllegalTypeCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "6:13: " + getCheckMessage(MSG_KEY, "AbstractClass"),
             "9:13: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.coding."
+                "com.puppycrawl.tools.checkstyle.checks.coding.illegaltype."
                     + "InputIllegalTypeMemberModifiers.AbstractClass"),
             "16:13: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "17:13: " + getCheckMessage(MSG_KEY, "TreeSet"),
             "23:15: " + getCheckMessage(MSG_KEY,
-                "com.puppycrawl.tools.checkstyle.checks.coding."
+                "com.puppycrawl.tools.checkstyle.checks.coding.illegaltype."
                     + "InputIllegalTypeMemberModifiers.AbstractClass"),
             "25:25: " + getCheckMessage(MSG_KEY, "java.util.TreeSet"),
             "33:15: " + getCheckMessage(MSG_KEY, "AbstractClass"),
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalType.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalType.java
index 828b04d17..dfce5fddc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalType.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalType.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 import java.util.TreeSet;
 import java.util.Hashtable;
 //configuration: default
@@ -6,8 +6,8 @@ public class InputIllegalType {
     private AbstractClass a = null; //WARNING
     private NotAnAbstractClass b = null; /*another comment*/
 
-    private com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.AbstractClass c = null; //WARNING
-    private com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.NotAnAbstractClass d = null;
+    private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.AbstractClass c = null; //WARNING
+    private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.NotAnAbstractClass d = null;
 
     private abstract class AbstractClass {/*one more comment*/}
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeAbstractClassNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNames.java
index 7ff7650af..3ff52ebe8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeAbstractClassNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeAbstractClassNames.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 public class InputIllegalTypeAbstractClassNames {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregorianCalendar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregorianCalendar.java
new file mode 100644
index 000000000..161643f2c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeGregorianCalendar.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
+
+public class InputIllegalTypeGregorianCalendar
+{
+    class SubCalendar {
+        
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeMemberModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeMemberModifiers.java
index cc88bac2f..35d0a8f6d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeMemberModifiers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeMemberModifiers.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 import java.util.TreeSet;
 import java.util.Hashtable;
 //configuration: default
@@ -6,8 +6,8 @@ public class InputIllegalTypeMemberModifiers {
     private AbstractClass a = null; //WARNING
     private NotAnAbstractClass b = null; /*another comment*/
 
-    private com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalTypeMemberModifiers.AbstractClass c = null; //WARNING
-    private com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalTypeMemberModifiers.NotAnAbstractClass d = null;
+    private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalTypeMemberModifiers.AbstractClass c = null; //WARNING
+    private com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalTypeMemberModifiers.NotAnAbstractClass d = null;
 
     private abstract class AbstractClass {/*one more comment*/}
 
@@ -20,7 +20,7 @@ public class InputIllegalTypeMemberModifiers {
     }
     
     //WARNING if memberModifiers is set and contains TokenTypes.LITERAL_PROTECTED
-    protected com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalTypeMemberModifiers.AbstractClass c1 = null;
+    protected com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalTypeMemberModifiers.AbstractClass c1 = null;
     //NO WARNING if memberModifiers is set and does not contain TokenTypes.LITERAL_PUBLIC
     public final static java.util.TreeSet<Object> table3() { return null; }
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeSameFileName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileName.java
index 533fc9e02..b39ece624 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeSameFileName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeSameFileName.java
@@ -1,19 +1,19 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 import java.util.ArrayList;
 import java.awt.List;
 import java.util.*;
-import com.puppycrawl.tools.checkstyle.checks.coding.InputGregorianCalendar; 
-import com.puppycrawl.tools.checkstyle.checks.coding.InputGregorianCalendar.SubCalendar;
+import com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalTypeGregorianCalendar;
+import com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalTypeGregorianCalendar.SubCalendar;
 //configuration: "illegalClassNames": List, GregorianCalendar, java.io.File, SubCalendar, ArrayList
 public class InputIllegalTypeSameFileName
 {
-    InputGregorianCalendar cal = AnObject.getInstance(); //WARNING
+    InputIllegalTypeGregorianCalendar cal = AnObject.getInstance(); //WARNING
     java.util.Date date = null;
     SubCalendar subCalendar = null; //WARNING
     
-    private static class AnObject extends InputGregorianCalendar {
+    private static class AnObject extends InputIllegalTypeGregorianCalendar {
 
-        public static InputGregorianCalendar getInstance() //WARNING
+        public static InputIllegalTypeGregorianCalendar getInstance() //WARNING
         {
             return null;
         }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeStarImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeStarImports.java
index 25c9658fb..0319232e8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeStarImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeStarImports.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import java.*;
 import java.util.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeStaticImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeStaticImports.java
index bfb58f1ed..535456441 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalTypeStaticImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/illegaltype/InputIllegalTypeStaticImports.java
@@ -1,8 +1,8 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.illegaltype;
 
 import static com.puppycrawl.tools.checkstyle.utils.CheckUtils.isElseIf;
 import static com.puppycrawl.tools.checkstyle.utils.CheckUtils.*;
-import static com.puppycrawl.tools.checkstyle.checks.coding.InputIllegalType.SomeStaticClass;
+import static com.puppycrawl.tools.checkstyle.checks.coding.illegaltype.InputIllegalType.SomeStaticClass;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 //configuration: "illegalClassNames": SomeStaticClass
 public class InputIllegalTypeStaticImports