Issue #2161: unify test input locations for design package

19 files changed, 263 insertions, 41 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/AnnotatedVisibility.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/AnnotatedVisibility.java
index 4064dd6d8..081e8cb29 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/AnnotatedVisibility.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/AnnotatedVisibility.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import com.google.common.annotations.VisibleForTesting;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/AnnotatedVisibilitySameTypeName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/AnnotatedVisibilitySameTypeName.java
index 900731836..3f9cad26a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/AnnotatedVisibilitySameTypeName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/AnnotatedVisibilitySameTypeName.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import org.junit.rules.TemporaryFolder;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InetSocketAddress.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InetSocketAddress.java
index 177f9cd9a..da5b39799 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InetSocketAddress.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InetSocketAddress.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 public class InetSocketAddress
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutable.java
index 38f782321..190ddf8f9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutable.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import java.math.BigDecimal;
 import java.util.Collection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableSameTypeName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableSameTypeName.java
index 2f5d206a6..cec23d4fe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableSameTypeName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableSameTypeName.java
@@ -1,7 +1,7 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import com.puppycrawl.tools.checkstyle.checks.coding.GregorianCalendar;
-import com.puppycrawl.tools.checkstyle.InetSocketAddress;
+import com.puppycrawl.tools.checkstyle.checks.design.InetSocketAddress;
 public final class InputImmutableSameTypeName
 {
     public final java.util.GregorianCalendar calendar = null;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableStarImport.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport.java
index 40a442438..732cf149a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableStarImport.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport.java
@@ -1,7 +1,7 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
-import com.puppycrawl.tools.checkstyle.InputImmutable;
-import com.puppycrawl.tools.checkstyle.InetSocketAddress.*;
+import com.puppycrawl.tools.checkstyle.checks.design.InputImmutable;
+import com.puppycrawl.tools.checkstyle.checks.design.InetSocketAddress.*;
 
 public final class InputImmutableStarImport
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableStarImport2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport2.java
index aecc639b0..983272b65 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputImmutableStarImport2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputImmutableStarImport2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import com.google.common.collect.*;
 //config.immutableClassName=com.google.google.common.ImmutableSet
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInner.java
new file mode 100644
index 000000000..3459fe630
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInner.java
@@ -0,0 +1,79 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.design;
+
+/**
+ * Tests having inner types
+ * @author Oliver Burn
+ **/
+class InputInner
+{
+    // 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/InputNullModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNullModifiers.java
index 0dadd1c55..5722dd78b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNullModifiers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNullModifiers.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelClass.java
index 4b9f99265..e7887578e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 public class InputOneTopLevelClass
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelClassNoPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelClassNoPublic.java
index 860b39bcb..8ee7c17af 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelClassNoPublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelClassNoPublic.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 class InputOneTopLevelClassNoPublic
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelEnum.java
index 311da1f37..46faae646 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelEnum.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelEnum.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 public enum InputOneTopLevelEnum {
     VALUE1, VALUE2;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelEnum2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelEnum2.java
index 2ed75848c..e369ff557 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelEnum2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelEnum2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 enum InputOneTopLevelEnum2inner1 {
     VALUE1, VALUE2;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelInterface.java
index c3c27bc08..651e0feca 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelInterface.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 public interface InputOneTopLevelInterface {
     int foo();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelInterface2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelInterface2.java
index 6634e8b62..86de2f59c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/InputOneTopLevelInterface2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputOneTopLevelInterface2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.design;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 interface InputOneTopLevelInterface2inner1 {
     int foo();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputPublicImmutable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicImmutable.java
index e69057afe..0a2e6e64d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputPublicImmutable.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicImmutable.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.design;
 
 import java.math.BigDecimal;
 import java.util.Collection;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicOnly.java
new file mode 100644
index 000000000..18ec1cf95
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputPublicOnly.java
@@ -0,0 +1,47 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.design;
+
+public class InputPublicOnly
+{
+    private interface InnerInterface
+    {
+        String CONST = "InnerInterface";
+        
+        class InnerInnerClass
+        {
+            private int mData;
+
+            private InnerInnerClass()
+            {
+                final Runnable r = new Runnable() {
+                        public void run() {};
+                    };
+            }
+        }
+    }
+
+    private class InnerClass
+    {
+        private int mDiff;
+    }
+
+    private int mSize;
+    int mLen;
+    protected int mDeer;
+    public int aFreddo;
+
+    /** {@inheritDoc} */
+    public String toString()
+    {
+        return super.toString();
+    }
+
+    @Deprecated @Override
+    public int hashCode()
+    {
+        return super.hashCode();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputSimple.java
new file mode 100644
index 000000000..8d61ab491
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputSimple.java
@@ -0,0 +1,119 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: Feb-2001
+// Ignore error
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.design;
+import java.io.*;
+/**
+ * Contains simple mistakes:
+ * - Long lines
+ * - Tabs
+ * - Format of variables and parameters
+ * - Order of modifiers
+ * @author Oliver Burn
+ **/
+final class InputSimple
+{
+    /** Invalid format **/
+    public static final int badConstant = 2;
+    /** Valid format **/
+    public static final int MAX_ROWS = 2;
+
+    /** Invalid format **/
+    private static int badStatic = 2;
+    /** Valid format **/
+    private static int sNumCreated = 0;
+
+    /** Invalid format **/
+    private int badMember = 2;
+    /** Valid format **/
+    private int mNumCreated1 = 0;
+    /** Valid format **/
+    protected int mNumCreated2 = 0;
+
+    /** commas are wrong **/
+    private int[] mInts = new int[] {1,2, 3,
+                                     4};
+
+    //
+    // Accessor tests
+    //
+    /** should be private **/
+    public static int sTest1;
+    /** should be private **/
+    protected static int sTest3;
+    /** should be private **/
+    static int sTest2;
+
+    /** should be private **/
+    int mTest1;
+    /** should be private **/
+    public int mTest2;
+
+    /**
+     * @return hack
+     * @param badFormat1 bad format
+     * @param badFormat2 bad format
+     * @param badFormat3 bad format
+     * @throws java.lang.Exception abc
+     **/
+    int test1(int badFormat1,int badFormat2,
+              final int badFormat3)
+        throws java.lang.Exception
+    {
+        return 0;
+    }
+
+    /** test local variables */
+    private void localVariables()
+    {
+        // normal decl
+        int abc = 0;
+        int ABC = 0;
+
+        // final decls
+        final int cde = 0;
+        final int CDE = 0;
+
+        // decl in for loop init statement
+        for (int k = 0; k < 1; k++)
+        {
+            String innerBlockVariable = "";
+        }
+        for (int I = 0; I < 1; I++)
+        {
+            String InnerBlockVariable = "";
+        }
+    }
+
+    /** test illegal constant **/
+    private static final int BAD__NAME = 3;
+}
+
+/** Test class for variable naming in for each clauses. */
+class InputSimple2
+{
+    /** Some more Javadoc. */
+    public void doSomething()
+    {
+        //"O" should be named "o"
+        for (Object O : new java.util.ArrayList())
+        {
+
+        }
+    }
+}
+
+/** Test enum for member naming check */
+enum MyEnum1
+{
+    /** ABC constant */
+    ABC,
+
+    /** XYZ constant */
+    XYZ;
+
+    /** Should be mSomeMemeber */
+    private int someMember;
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/design/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/design/package-info.java
deleted file mode 100644
index 2db5d729a..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/design/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// checkstyle: Checks Java source code for adherence to a set of rules.
-// Copyright (C) 2001-2015 the original author or authors.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Package containing input files for design checks.
- */
-package com.puppycrawl.tools.checkstyle.design;