Issue #2161: unify test input locations for javadoc package

16 files changed, 155 insertions, 15 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/AllowedAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/AllowedAnnotations.java
index aace73589..39a868a0c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/AllowedAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/AllowedAnnotations.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 /**
  * Some javadoc.
@@ -11,7 +11,7 @@ public class AllowedAnnotations implements SomeInterface {
     @ThisIsOkToo
     public void allowed2() {}
 
-    @com.puppycrawl.tools.checkstyle.javadoc.ThisIsOk
+    @com.puppycrawl.tools.checkstyle.checks.javadoc.ThisIsOk
     public void allowed3() {}
 
     @Override
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/ExtendAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/ExtendAnnotation.java
index 4783d5f74..b0623ac30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/ExtendAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/ExtendAnnotation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputInheritDoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputInheritDoc.java
index 87c02cf8c..762f47f66 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputInheritDoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputInheritDoc.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputInheritDoc
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputInner.java
new file mode 100644
index 000000000..74f8f4526
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputInner.java
@@ -0,0 +1,79 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
+
+/**
+ * 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/InputJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadoc.java
index 0b9446a79..9a315f1e6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadoc.java
@@ -3,7 +3,7 @@
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 /**
  * Testing author and version tag patterns
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputJavadocMethodCheck_SmallMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodCheck_SmallMethods.java
index 27299bfc5..c319ba696 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputJavadocMethodCheck_SmallMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodCheck_SmallMethods.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 /**
  * The following is a bad tag.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputJavadocMethodIgnoreNameRegex.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodIgnoreNameRegex.java
index 37dbbe414..2e448b696 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputJavadocMethodIgnoreNameRegex.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodIgnoreNameRegex.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputJavadocMethodIgnoreNameRegex
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputMissingJavadocTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputMissingJavadocTags.java
index 879ea90e5..0392d02e1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputMissingJavadocTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputMissingJavadocTags.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputMissingJavadocTags {
     /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputPublicOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputPublicOnly.java
index 3acdcdac0..f8196cd8c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputPublicOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputPublicOnly.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputPublicOnly // ignore - need javadoc
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeAnonInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeAnonInner.java
index 87fa1445b..913cf6a92 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeAnonInner.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeAnonInner.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseAdapter;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeInnerClasses.java
index 3f359fd69..693c8cbc8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeInnerClasses.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 /**
    Checks javadoc scoping for inner classes.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeInnerInterfaces.java
index c3f89f8a4..5a30c43cb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputScopeInnerInterfaces.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputScopeInnerInterfaces
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSetterGetter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSetterGetter.java
index bfb869d11..5cbd1d4bc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSetterGetter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSetterGetter.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class InputSetterGetter
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputTypeParamsTags.java
index f36a8bda6..9715ee939 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTypeParamsTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputTypeParamsTags.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 /**
  * Some explanation.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputWhitespace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputWhitespace.java
new file mode 100644
index 000000000..d8a01f2cd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputWhitespace.java
@@ -0,0 +1,61 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com . puppycrawl
+    .tools.
+    checkstyle.checks.javadoc;
+
+/**
+ * Class for testing javadoc issues.
+ * error missing author tag
+ **/
+class InputWhitespace
+{
+    /** another check */
+    void donBradman(Runnable aRun)
+    {
+        donBradman(new Runnable() {
+            public void run() {
+            }
+        });
+
+        final Runnable r = new Runnable() {
+            public void run() {
+            }
+        };
+    }
+
+    /** bug 806243 (NoWhitespaceBeforeCheck error for anonymous inner class) */
+    void bug806243()
+    {
+        Object o = new InputWhitespace() {
+            private int j ;
+        };
+    }
+}
+
+/**
+ * Bug 806242 (NoWhitespaceBeforeCheck error with an interface).
+ * @author o_sukhodolsky
+ * @version 1.0
+ */
+interface IFoo
+{
+    void foo() ;
+}
+
+/**
+ * Avoid Whitespace errors in for loop.
+ * @author lkuehne
+ * @version 1.0
+ */
+class SpecialCasesInForLoop
+{
+    public void myMethod() {
+        new Thread() {
+            public void run() {
+            }
+        }.start();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/TestGenerics.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/TestGenerics.java
index 44ccb6e57..dd3600ac6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/TestGenerics.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/TestGenerics.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.javadoc;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 public class TestGenerics <E extends java.lang.Exception,
                            RE extends RuntimeException & java.io.Serializable>