Issue #10174: Updated inputs for AnnotationLocationCheckTest

checkstyle · Jun 26, 2021 · 6f2ce09 · 6f2ce09
1 parent 8bd7b36
commit 6f2ce09
Show file tree

Hide file tree

Showing 17 changed files with 270 additions and 203 deletions.
diff --git a/...t/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java b/...t/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
diff --git a/...e/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java b/...e/checks/annotation/annotationlocation/InputAnnotationLocationRecordsAndCompactCtors.java
@@ -1,15 +1,18 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF, \
+         ANNOTATION_DEF, ANNOTATION_FIELD_DEF
+
+
+*/
+
 //non-compiled with javac: Compilable with Java14
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
-/* Config:
- *
- * allowSamelineMultipleAnnotations = false
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * tokens = {CLASS_DEF , INTERFACE_DEF , PACKAGE_DEF , ENUM_CONSTANT_DEF , ENUM_DEF ,
- *  METHOD_DEF , CTOR_DEF , VARIABLE_DEF , ANNOTATION_DEF , ANNOTATION_FIELD_DEF ,
- *  RECORD_DEF, COMPACT_CTOR_DEF}
- */
 public class InputAnnotationLocationRecordsAndCompactCtors {
     @NonNull1 public record MyRecord1() { // ok, no param
     }

diff --git a/...l/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationClass.java b/...l/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationClass.java
@@ -1,18 +1,19 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, CTOR_DEF, VARIABLE_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Target;
 
-
-/* Config :
- *
- * tokens = ["CLASS_DEF", "CTOR_DEF", "VARIABLE_DEF"]
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = false
- */
-
 @ClassAnnotation(value = "foo")
   @ClassAnnotation // violation
 @ClassAnnotation("bar") class InputAnnotationLocationClass { // violation

diff --git a/...tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java b/...tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationCorrect.java
@@ -1,3 +1,14 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 /* Config: default */

diff --git a/...hecks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java b/...hecks/annotation/annotationlocation/InputAnnotationLocationCustomAnnotationsDeclared.java
@@ -1,9 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = false
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
 
-/* Config:
- *
- * allowSamelineSingleParameterlessAnnotation = true
- */
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 @MyAnnotation11 @MyAnnotation12 @MyAnnotation13 // violation
 public class InputAnnotationLocationCustomAnnotationsDeclared {

diff --git a/...tyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java b/...tyle/checks/annotation/annotationlocation/InputAnnotationLocationDeprecatedAndCustom.java
@@ -1,17 +1,19 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, \
+         VARIABLE_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-/* Config:
- *
- * tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF,
- *           CTOR_DEF, VARIABLE_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF
- * allowSamelineMultipleAnnotations = false
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation =  false
- */
-
 public class InputAnnotationLocationDeprecatedAndCustom {
     @Deprecated // ok
     public class Annotation

diff --git a/...l/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java b/...l/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEmpty.java
@@ -1,6 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
 
-/* Config: default */
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 public class InputAnnotationLocationEmpty { // ok
 

diff --git a/...wl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEnum.java b/...wl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationEnum.java
@@ -1,18 +1,19 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = ENUM_DEF, ENUM_CONSTANT_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Target;
 
-
-/* Config :
- *
- * tokens = ["ENUM_DEF", "ENUM_CONSTANT_DEF"]
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = false
- */
-
 @EnumAnnotation(value = "foo")
   @EnumAnnotation // violation
 @EnumAnnotation("bar") enum InputAnnotationLocationEnum { // violation

diff --git a/...ols/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java b/...ols/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java
@@ -1,7 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
 
-/* Config: default */
+*/
 
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 @MyAnn_21 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn // violation
 (value = "")

diff --git a/...ls/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java b/...ls/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java
@@ -1,10 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = true
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
 
-/* Config:
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = true
- * allowSamelineMultipleAnnotations = true
- */
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 @MyAnn_22 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn_2 // ok
 (value = "")

diff --git a/...ls/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java b/...ls/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java
@@ -1,9 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, \
+         METHOD_DEF, CTOR_DEF, VARIABLE_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF
+
 
-/* Config:
- * tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF,
- * ANNOTATION_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF, PACKAGE_DEF
- */
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 @MyAnn_23 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn3 // violation
 (value = "")

diff --git a/...ols/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationInterface.java b/...ols/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationInterface.java
@@ -1,18 +1,19 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = INTERFACE_DEF, METHOD_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Target;
 
-
-/* Config :
- *
- * tokens = ["INTERFACE_DEF", "METHOD_DEF", "PARAMETER_DEF"]
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = false
- */
-
 @InterfaceAnnotation(value = "foo")
   @InterfaceAnnotation // violation
 @InterfaceAnnotation("bar") interface InputAnnotationLocationInterface { // violation

diff --git a/...ools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java b/...ools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationMultiple.java
@@ -1,14 +1,17 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = true
+allowSamelineSingleParameterlessAnnotation = false
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
 
-import java.lang.annotation.Repeatable;
 
+*/
 
-/* Config:
- *
- * allowSamelineSingleParameterlessAnnotation = false
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = true
- */
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+
+import java.lang.annotation.Repeatable;
 
 class InputAnnotationLocationMultiple {
 

diff --git a/...checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationParameterized.java b/...checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationParameterized.java
@@ -1,14 +1,18 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = false
+allowSamelineParameterizedAnnotation = true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.Repeatable;
 
-/* Config :
- *
- * allowSamelineSingleParameterlessAnnotation = false
- * allowSamelineParameterizedAnnotation = true
- * allowSamelineMultipleAnnotations = false
- */
-
 class InputAnnotationLocationParameterized {
 
     @Annotation void singleParameterless() {} // violation

diff --git a/...tyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java b/...tyle/checks/annotation/annotationlocation/InputAnnotationLocationSingleParameterless.java
@@ -1,17 +1,20 @@
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = (default)CLASS_DEF, INTERFACE_DEF, PACKAGE_DEF, ENUM_CONSTANT_DEF, \
+         ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Target;
 
-
-/* Config :
- *
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = false
- */
-
 class InputAnnotationLocationSingleParameterless {
 
     @Annotation void singleParameterless() {}

diff --git a/...style/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java b/...style/checks/annotation/annotationlocation/InputAnnotationLocationWithoutAnnotations.java
@@ -1,11 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, \
+         ANNOTATION_DEF, ANNOTATION_FIELD_DEF
+
 
+*/
 
-/* Config:
- *
- * tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF,
- *         ANNOTATION_DEF, ANNOTATION_FIELD_DEF
- */
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation;
 
 public class InputAnnotationLocationWithoutAnnotations {
     public static void main(String[] args) { // ok

diff --git a/...puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/package-info.java b/...puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/inputs/package-info.java
@@ -1,12 +1,13 @@
-/**
- * This test-input is intended to be checked using following configuration:
- *
- * tokens = ["PACKAGE_DEF"]
- * allowSamelineSingleParameterlessAnnotation = true
- * allowSamelineParameterizedAnnotation = false
- * allowSamelineMultipleAnnotations = false
- *
- */
+/*
+AnnotationLocation
+allowSamelineMultipleAnnotations = (default)false
+allowSamelineSingleParameterlessAnnotation = (default)true
+allowSamelineParameterizedAnnotation = (default)false
+tokens = PACKAGE_DEF
+
+
+*/
+
 @PackageAnnotation(value = "foo")
   @PackageAnnotation //warn
 @PackageAnnotation("bar") package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.inputs; //warn