Issue #2161: unify test input locations for modifier package

7 files changed, 145 insertions, 6 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifier.java
new file mode 100644
index 000000000..ae84d8c77
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifier.java
@@ -0,0 +1,139 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.checks.modifier;
+
+/**
+ * Test case for Modifier checks:
+ * - order of modifiers
+ * - use of 'public' in interface definition
+ * @author lkuehne
+ */
+strictfp final class InputModifier // illegal order of modifiers for class
+{
+
+    /** Illegal order of modifiers for variables */
+    static private boolean sModifierOrderVar = false;
+
+    /**
+     * Illegal order of modifiers for methods. Make sure that the
+     * first and last modifier from the JLS sequence is used.
+     */
+    strictfp private void doStuff()
+    {
+    }
+
+    /** Single annotation without other modifiers */
+    @MyAnnotation2 void someMethod()
+    {
+    }
+
+    /** Illegal order of annotation - must come first */
+    private @MyAnnotation2 void someMethod2()
+    {
+    }
+
+    /** Annotation in middle of other modifiers otherwise in correct order */
+    private @MyAnnotation2 strictfp void someMethod3()
+    {
+    }
+
+    /** Correct order */
+    @MyAnnotation2 private strictfp void someMethod4()
+    {
+    }
+
+    /** Annotation in middle of other modifiers otherwise in correct order */
+    @MyAnnotation2 private static @MyAnnotation4 strictfp void someMethod5()
+    {
+    }
+
+    /** holder for redundant 'public' modifier check. */
+    public static interface InputRedundantPublicModifier // violation
+    {
+        /** redundant 'public' modifier */
+        public void a(); // violation
+
+        /** all OK */
+        void b();
+
+        /** redundant abstract modifier */
+        abstract void c(); // violation
+
+        /** redundant 'public' modifier */
+        public float PI_PUBLIC = (float) 3.14; // violation
+
+        /** redundant 'abstract' modifier (field can not be abstract) */
+//        abstract float PI_ABSTRACT = (float) 3.14;
+
+        /** redundant 'final' modifier */
+        final float PI_FINAL = (float) 3.14; // violation
+
+        /** all OK */
+        float PI_OK = (float) 3.14;
+    }
+
+    /** redundant 'final' modifier */
+    private final void method() // violation
+    {
+    }
+}
+
+/** Holder for redundant 'final' check. */
+final class RedundantFinalClass
+{
+    /** redundant 'final' modifier */
+    public final void finalMethod() // violation
+    {
+    }
+
+    /** OK */
+    public void method()
+    {
+    }
+}
+
+/** Holder for redundant modifiers of inner implementation */
+abstract interface InnerImplementation // violation
+{
+    InnerImplementation inner =
+        new InnerImplementation()
+        {
+            /** compiler requires 'public' modifier */
+            public void method()
+            {
+            }
+        };
+    
+    void method();
+}
+
+/** Holder for redundant modifiers of annotation fields/variables */
+@interface Annotation
+{
+    public String s1 = ""; // violation
+    final String s2 = ""; // violation
+    static String s3 = ""; // violation
+    String s4 = "";
+    public String blah(); // violation
+    abstract String blah2(); // violation
+}
+
+@interface MyAnnotation2 {
+}
+
+@interface MyAnnotation4 {
+}
+
+class SafeVarargsUsage {
+    @Deprecated
+    @SafeVarargs
+    private final void foo(int... k) {}
+    
+    @Deprecated
+    @SafeVarargs
+    @SuppressWarnings("")
+    private final void foo1(Object... obj) {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputModifierClassesInsideOfInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifierClassesInsideOfInterfaces.java
index e7042cdde..a7c1833b7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputModifierClassesInsideOfInterfaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifierClassesInsideOfInterfaces.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public interface InputModifierClassesInsideOfInterfaces {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNestedClassInPublicInterfaceRedundantModifiers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputNestedClassInPublicInterfaceRedundantModifiers.java
index ef1954b25..e6bb28d92 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNestedClassInPublicInterfaceRedundantModifiers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputNestedClassInPublicInterfaceRedundantModifiers.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public interface InputNestedClassInPublicInterfaceRedundantModifiers {
         interface PublicInnerInterface {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantConstructorModifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantConstructorModifier.java
index 66e76728a..1c1b5be33 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantConstructorModifier.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantConstructorModifier.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public enum InputRedundantConstructorModifier {
     VAL1, VAL2;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantPublicModifierInNotPublicClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantPublicModifierInNotPublicClass.java
index fb83ae117..46a55d904 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantPublicModifierInNotPublicClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantPublicModifierInNotPublicClass.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public class InputRedundantPublicModifierInNotPublicClass {
     public InputRedundantPublicModifierInNotPublicClass() { }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantStaticModifierInInnerTypeOfInterface.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantStaticModifierInInnerTypeOfInterface.java
index 8e7a8c6cb..06a333268 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantStaticModifierInInnerTypeOfInterface.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantStaticModifierInInnerTypeOfInterface.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public interface InputRedundantStaticModifierInInnerTypeOfInterface {
     static class MyInnerClass { } // violation
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantStaticModifierInNestedEnum.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantStaticModifierInNestedEnum.java
index 7ef65f78d..a1ed22370 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRedundantStaticModifierInNestedEnum.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputRedundantStaticModifierInNestedEnum.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.modifier;
 
 public class InputRedundantStaticModifierInNestedEnum {
     static enum NestedEnumWithRedundantStatic {} // violation