Issue #2161: unify test input locations for naming package

11 files changed, 312 insertions, 9 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputConstantNames.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputConstantNames.java
index 0b0778d80..bfb07917a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputConstantNames.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputConstantNames.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 import java.io.ObjectStreamField;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputEmptyStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputEmptyStatement.java
new file mode 100644
index 000000000..b1df844aa
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputEmptyStatement.java
@@ -0,0 +1,78 @@
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputEmptyStatement
+{
+   public InputEmptyStatement()
+   {
+      ;
+   }
+
+   public void EmptyMethod()
+   {
+      ;
+   }
+
+   public void EmptyStatements(boolean cond)
+   {
+      for (;cond;);
+
+      for (;cond;)
+      {
+         ;
+      }
+
+      if (true);
+
+      if (true)
+      {
+         ;
+      }
+
+      if (cond)
+      {
+         int i;
+      }
+
+      else
+      {
+         ;
+      }
+
+      switch (1)
+      {
+         case 1 :
+            ;
+         default :
+            ;
+      }
+
+      while (cond);
+
+      while (cond)
+      {
+         ;
+      }
+
+      do;
+      while (cond);
+
+      do
+      {
+         ;
+      }
+      while (cond);
+
+      try
+      {
+         ;
+      }
+      catch (Exception ex)
+      {
+         ;
+      }
+      finally
+      {
+         ;
+      }
+   }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java
index 7215db9d8..86f1d3e6a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputInner.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 /**
  * Tests having inner types
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMemberName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java
index a25a93777..4e1bf7e7e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMemberName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 public class InputMemberName
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMemberNameExtended.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java
index 25e51f75f..e1a0f49b1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMemberNameExtended.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputMethNameEqualClsName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethNameEqualClsName.java
index 5a59dbc13..573d66e7a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputMethNameEqualClsName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethNameEqualClsName.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 /**
  * Test input for MethodNameCheck specifically
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMethodNameExtra.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameExtra.java
index 4b3f0bc3d..8aa1c970b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMethodNameExtra.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameExtra.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 public class InputMethodNameExtra
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMethodNameOverridenMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameOverridenMethods.java
index 9dd2e020e..396dcdb4a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputMethodNameOverridenMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameOverridenMethods.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 public class InputMethodNameOverridenMethods extends SomeClass 
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOneCharInitVarName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOneCharInitVarName.java
index 1207cf5ab..e669e59f3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOneCharInitVarName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOneCharInitVarName.java
@@ -3,7 +3,7 @@
 // Created: Feb-2001
 // Ignore error
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputSimple.java
new file mode 100644
index 000000000..6542859dd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputSimple.java
@@ -0,0 +1,225 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: Feb-2001
+// Ignore error
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.naming;
+import java.io.*;
+/**
+ * Contains simple mistakes:
+ * - Long lines
+ * - Tabs
+ * - Format of variables and parameters
+ * - Order of modifiers
+ * @author Oliver Burn
+ **/
+final class InputSimple
+{
+    // Long line ----------------------------------------------------------------
+    // Contains a tab ->	<-
+    // Contains trailing whitespace ->
+
+    // Name format tests
+    //
+    /** 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;
+
+    //
+    // Parameter name format tests
+    //
+
+    /**
+     * @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;
+    }
+
+    /** method that is 20 lines long **/
+    private void longMethod()
+    {
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+    }
+
+    /** constructor that is 10 lines long **/
+    private InputSimple()
+    {
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+        // a line
+    }
+
+    /** 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 method pattern */
+    void ALL_UPPERCASE_METHOD()
+    {
+    }
+
+    /** test illegal constant **/
+    private static final int BAD__NAME = 3;
+
+    // A very, very long line that is OK because it matches the regexp "^.*is OK.*regexp.*$"
+    // long line that has a tab ->	<- and would be OK if tab counted as 1 char
+    // tabs that count as one char because of their position ->	<-   ->	<-, OK
+ 
+    /** some lines to test the error column after tabs */
+    void errorColumnAfterTabs()
+    {
+        // with tab-width 8 all statements below start at the same column,
+        // with different combinations of ' ' and '\t' before the statement
+                int tab0 =1;
+        	int tab1 =1;
+         	int tab2 =1;
+		int tab3 =1;
+  	  	int tab4 =1;
+  	        int tab5 =1;
+    }
+
+    // FIXME:
+    /* FIXME: a
+     * FIXME:
+     * TODO
+     */
+    /* NOTHING */
+    /* YES */ /* FIXME: x */ /* YES!! */
+
+    /** test long comments **/
+    void veryLong()
+    {
+        /*
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          blah blah blah blah
+          enough talk */
+    }
+
+    /**
+     * @see to lazy to document all args. Testing excessive # args
+     **/
+    void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5,
+                    int aArg6, int aArg7, int aArg8, int aArg9)
+    {
+    }
+}
+
+/** 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/naming/InputStaticVariableName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java
index 155f0271c..522caf889 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputStaticVariableName.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.naming;
+package com.puppycrawl.tools.checkstyle.checks.naming;
 
 public class InputStaticVariableName {