Issue #4314: Split and Organize Checkstyle inputs by Test for checks in design package: VisibilityModifier

17 files changed, 134 insertions, 46 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableSameTypeName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableSameTypeName.java
deleted file mode 100644
index 0b06a7635..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableSameTypeName.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-import com.puppycrawl.tools.checkstyle.checks.design.InputGregorianCalendar;
-import com.puppycrawl.tools.checkstyle.checks.design.InetSocketAddress;
-public final class InputImmutableSameTypeName
-{
-    public final java.util.GregorianCalendar calendar = null;
-    public final InputGregorianCalendar calendar2 = null;
-    public final com.puppycrawl.tools.checkstyle.checks.design.InputGregorianCalendar calendar3 = null;
-    public final InetSocketAddress address = null;
-    public final java.net.InetSocketAddress adr = null;
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport.java
deleted file mode 100644
index 732cf149a..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-import com.puppycrawl.tools.checkstyle.checks.design.InputImmutable;
-import com.puppycrawl.tools.checkstyle.checks.design.InetSocketAddress.*;
-
-public final class InputImmutableStarImport
-{
-    public final Arrays f = null; // If Arrays is specified as immutable class, no matter of canonical name
-                                  // no warning will be here, star imports are out of consideration
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InetSocketAddress.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InetSocketAddress.java
index 2c27378d0..85def237d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InetSocketAddress.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InetSocketAddress.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 // ATTENTION: we need name of this class to be without "Input" prefix to as we
 // need the same name as defined at VisibilityModifierCheck.DEFAULT_IMMUTABLE_TYPES
 public class InetSocketAddress
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputAnnotatedVisibility.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierAnnotated.java
index 870a51427..e38973909 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputAnnotatedVisibility.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierAnnotated.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -11,7 +11,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-public class InputAnnotatedVisibility {
+public class InputVisibilityModifierAnnotated {
     @Rule
     public TemporaryFolder publicJUnitRule = new TemporaryFolder();
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputAnnotatedVisibilitySameTypeName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierAnnotatedSameTypeName.java
index e4186974d..ea3c0ddd7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputAnnotatedVisibilitySameTypeName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierAnnotatedSameTypeName.java
@@ -1,11 +1,11 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import org.junit.rules.TemporaryFolder;
 
 import com.puppycrawl.tools.checkstyle.checks.design.InputLocalAnnotations.Rule;
 import com.puppycrawl.tools.checkstyle.checks.design.InputLocalAnnotations.ClassRule;
 
-public class InputAnnotatedVisibilitySameTypeName
+public class InputVisibilityModifierAnnotatedSameTypeName
 {
     @Rule
     public TemporaryFolder publicJUnitRule = new TemporaryFolder();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputVisibilityModifierGenerics.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGenerics.java
index 6c4dd091a..3c4cf6b88 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputVisibilityModifierGenerics.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGenerics.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java
new file mode 100644
index 000000000..c27dd7666
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierGregorianCalendar.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
+
+public class InputVisibilityModifierGregorianCalendar
+{
+    class SubCalendar {
+        
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutable.java
index 6f0989464..0e6fe3223 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutable.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -6,7 +6,7 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableSet;
 
-public final class InputImmutable
+public final class InputVisibilityModifierImmutable
 {
     public final int someIntValue;
     public final ImmutableSet<String> includes;
@@ -15,8 +15,8 @@ public final class InputImmutable
     public final BigDecimal money;
     public final List list;
 
-    public InputImmutable(Collection<String> includes, Collection<String> excludes,
-             BigDecimal value, String notes, int someValue, List l) {
+    public InputVisibilityModifierImmutable(Collection<String> includes, Collection<String> excludes,
+                                            BigDecimal value, String notes, int someValue, List l) {
         this.includes = ImmutableSet.copyOf(includes);
         this.excludes = ImmutableSet.copyOf(excludes);
         this.money = value;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableSameTypeName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableSameTypeName.java
new file mode 100644
index 000000000..23d77b033
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableSameTypeName.java
@@ -0,0 +1,13 @@
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
+
+import com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier.InputVisibilityModifierGregorianCalendar;
+import com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier.InetSocketAddress;
+public final class InputVisibilityModifierImmutableSameTypeName
+{
+    public final java.util.GregorianCalendar calendar = null;
+    public final InputVisibilityModifierGregorianCalendar calendar2 = null;
+    public final com.puppycrawl.tools.checkstyle.checks.design.
+            visibilitymodifier.InputVisibilityModifierGregorianCalendar calendar3 = null;
+    public final InetSocketAddress address = null;
+    public final java.net.InetSocketAddress adr = null;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java
new file mode 100644
index 000000000..4597b7476
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport.java
@@ -0,0 +1,10 @@
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
+
+import com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier.InputVisibilityModifierImmutable;
+import com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier.InetSocketAddress.*;
+
+public final class InputVisibilityModifierImmutableStarImport
+{
+    public final Arrays f = null; // If Arrays is specified as immutable class, no matter of canonical name
+                                  // no warning will be here, star imports are out of consideration
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java
index 983272b65..ac085d61e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierImmutableStarImport2.java
@@ -1,8 +1,8 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import com.google.common.collect.*;
 //config.immutableClassName=com.google.google.common.ImmutableSet
-public final class InputImmutableStarImport2
+public final class InputVisibilityModifierImmutableStarImport2
 {
     public final ImmutableSet<String> set = null; // No warning here
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierInner.java
new file mode 100644
index 000000000..162a0b1a7
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierInner.java
@@ -0,0 +1,79 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
+
+/**
+ * Tests having inner types
+ * @author Oliver Burn
+ **/
+class InputVisibilityModifierInner
+{
+    // Ignore - two errors
+    class InnerInner2
+    {
+        // Ignore
+        public int fData;
+    }
+
+    // Ignore - 2 errors
+    interface InnerInterface2
+    {
+        // Ignore - should be all upper case
+        String data = "zxzc";
+
+        // Ignore
+        class InnerInterfaceInnerClass
+        {
+            // Ignore - need Javadoc and made private
+            public int rData;
+
+            /** needs to be made private unless allowProtected. */
+            protected int protectedVariable;
+
+            /** needs to be made private unless allowPackage. */
+            int packageVariable;
+        }
+    }
+
+    /** demonstrate bug in handling static final **/
+    protected static Object sWeird = new Object();
+    /** demonstrate bug in handling static final **/
+    static Object sWeird2 = new Object();
+    
+    /** demonstrate bug in local final variable */
+    public interface Inter
+    {
+    }
+    
+     public static void main()
+     {
+        Inter m = new Inter()
+        {
+            private static final int CDS = 1;
+            
+            private int ABC;
+        };
+     }
+
+    /** annotation field incorrectly named. */
+    @interface InnerAnnotation
+    {
+        /** Ignore - should be all upper case. */
+        String data = "zxzc";
+    }
+
+    /** enum with public member variable */
+    enum InnerEnum
+    {
+        /** First constant */
+        A,
+
+        /** Second constant */
+        B;
+
+        /** Should be private */
+        public int someValue;
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPublicOnly.java
index 18ec1cf95..fddbbd0aa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierPublicOnly.java
@@ -2,9 +2,9 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
-public class InputPublicOnly
+public class InputVisibilityModifierPublicOnly
 {
     private interface InnerInterface
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierSimple.java
index 8d61ab491..e00d22509 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputSimple.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifierSimple.java
@@ -3,7 +3,7 @@
 // Created: Feb-2001
 // Ignore error
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 import java.io.*;
 /**
  * Contains simple mistakes:
@@ -13,7 +13,7 @@ import java.io.*;
  * - Order of modifiers
  * @author Oliver Burn
  **/
-final class InputSimple
+final class InputVisibilityModifierSimple
 {
     /** Invalid format **/
     public static final int badConstant = 2;
@@ -92,7 +92,7 @@ final class InputSimple
 }
 
 /** Test class for variable naming in for each clauses. */
-class InputSimple2
+class InputVisibilityModifierSimple2
 {
     /** Some more Javadoc. */
     public void doSomething()
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputEnumIsSealed.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersEnumIsSealed.java
index 444dd2bc9..640fecfbe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputEnumIsSealed.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersEnumIsSealed.java
@@ -1,8 +1,8 @@
 
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 /** Shows that sealed enum is good as final. */
-public enum InputEnumIsSealed {
+public enum InputVisibilityModifiersEnumIsSealed {
     SOME_VALUE;
 
     static class Hole {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNullModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersNullModifiers.java
index 5722dd78b..e8ee8f09f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNullModifiers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersNullModifiers.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicImmutable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable.java
index 0a2e6e64d..31bfb7c29 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicImmutable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/visibilitymodifier/InputVisibilityModifiersPublicImmutable.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.visibilitymodifier;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -6,14 +6,14 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableSet;
 
-public class InputPublicImmutable {    
+public class InputVisibilityModifiersPublicImmutable {
     public final int someIntValue;
     public final ImmutableSet<String> includes;
     public final java.lang.String notes;
     public final BigDecimal value;
     public final List list;
-    public InputPublicImmutable(Collection<String> includes,
-            BigDecimal value, String notes, int someValue, List l) {
+    public InputVisibilityModifiersPublicImmutable(Collection<String> includes,
+                                                   BigDecimal value, String notes, int someValue, List l) {
         this.includes = ImmutableSet.copyOf(includes);
         this.value = value;
         this.notes = notes;