From ad0f5d6c6f0a179ec9334edcc6baf24d57ada94b Mon Sep 17 00:00:00 2001 From: Soumyadeep Ganguly Date: Thu, 25 Mar 2021 08:58:14 +0530 Subject: [PATCH] Issue #9437: update AnnotationLocationCheckTest to use unique Input file in each test method --- .../AnnotationLocationCheckTest.java | 78 +++++------ .../InputAnnotationLocationIncorrect.java | 42 +++--- .../InputAnnotationLocationIncorrect2.java | 124 ++++++++++++++++++ .../InputAnnotationLocationIncorrect3.java | 123 +++++++++++++++++ 4 files changed, 307 insertions(+), 60 deletions(-) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java index fa9e37a6fb4..8b40aa4eb87 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java @@ -91,32 +91,32 @@ public void testIncorrectAllTokens() throws Exception { + "CTOR_DEF, VARIABLE_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, " + "ENUM_CONSTANT_DEF, PACKAGE_DEF"); final String[] expected = { - "6:16: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn"), - "11:20: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "14:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "17:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "29:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "29:27: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation2"), - "32:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "36:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), - "37:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), - "38:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), - "41:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "45:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "48:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), - "56:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "61:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "65:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "70:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "73:24: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "75:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "85:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), - "88:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), - "91:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation1"), - "98:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), + "8:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn3"), + "13:15: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "16:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "19:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_13", 8, 4), + "27:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_13", 8, 4), + "31:5: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "31:29: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnn_23"), + "34:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 7, 4), + "38:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 8, 4), + "39:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_33", 6, 4), + "40:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_43", 10, 4), + "43:19: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "47:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "50:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_13", 12, 8), + "58:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "63:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 12, 8), + "67:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 12, 8), + "72:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 7, 4), + "75:19: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "77:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "87:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 11, 8), + "90:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 10, 8), + "93:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation_13"), + "100:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_23", 0, 3), }; - verify(checkConfig, getPath("InputAnnotationLocationIncorrect.java"), expected); + verify(checkConfig, getPath("InputAnnotationLocationIncorrect3.java"), expected); } @Test @@ -154,21 +154,21 @@ public void testWithParameters() throws Exception { checkConfig.addAttribute("allowSamelineParameterizedAnnotation", "true"); checkConfig.addAttribute("allowSamelineMultipleAnnotations", "true"); final String[] expected = { - "17:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "25:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 8, 4), - "32:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "36:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 8, 4), - "37:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation3", 6, 4), - "38:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation4", 10, 4), - "48:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation1", 12, 8), - "61:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "65:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 12, 8), - "70:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 7, 4), - "85:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 11, 8), - "88:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 10, 8), - "98:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation2", 0, 3), + "20:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_12", 8, 4), + "28:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_12", 8, 4), + "35:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 7, 4), + "39:9: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 8, 4), + "40:7: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_32", 6, 4), + "41:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_42", 10, 4), + "51:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnnotation_12", 12, 8), + "64:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 12, 8), + "68:13: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 12, 8), + "73:8: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 7, 4), + "88:12: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 11, 8), + "91:11: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 10, 8), + "101:1: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION, "MyAnn_22", 0, 3), }; - verify(checkConfig, getPath("InputAnnotationLocationIncorrect.java"), expected); + verify(checkConfig, getPath("InputAnnotationLocationIncorrect2.java"), expected); } @Test diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java index e68238faa1c..460136f5b2e 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect.java @@ -3,7 +3,7 @@ -@MyAnnotation2 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn //warn +@MyAnnotation2 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn (value = "") class InputAnnotationLocationIncorrect { @@ -11,10 +11,10 @@ class InputAnnotationLocationIncorrect @MyAnnotation2 @MyAnnotation1(value = "") public int a; - @MyAnnotation1(value = "") public int b; //warn + @MyAnnotation1(value = "") public int b; @MyAnnotation2 - @MyAnnotation1 //warn + @MyAnnotation1 (value = "") public int c; @@ -22,30 +22,30 @@ class InputAnnotationLocationIncorrect public int d; @MyAnnotation2 - @MyAnnotation1 //warn + @MyAnnotation1 (value = "") public InputAnnotationLocationIncorrect() {} - @MyAnnotation1("foo") @MyAnnotation2 void foo1() {} //warn + @MyAnnotation1("foo") @MyAnnotation2 void foo1() {} @MyAnnotation1(value = "") - @MyAnnotation2 //warn + @MyAnnotation2 void foo2() {} @MyAnnotation1(value = "") - @MyAnnotation2 //warn - @MyAnnotation3 //warn - @MyAnnotation4 //warn + @MyAnnotation2 + @MyAnnotation3 + @MyAnnotation4 class InnerClass { - @MyAnnotation2 @MyAnnotation1 //warn + @MyAnnotation2 @MyAnnotation1 (value = "") public int a; - @MyAnnotation1(value = "") public int b; //warn + @MyAnnotation1(value = "") public int b; @MyAnnotation2 - @MyAnnotation1 //warn + @MyAnnotation1 (value = "") public int c; @@ -53,26 +53,26 @@ class InnerClass public int d; @MyAnnotation2 - @MyAnnotation1(value = "") public InnerClass() //warn + @MyAnnotation1(value = "") public InnerClass() { // comment } @MyAnnotation1(value = "") - @MyAnnotation2 //warn + @MyAnnotation2 void foo1() {} @MyAnnotation1(value = "") - @MyAnnotation2 //warn + @MyAnnotation2 void foo2() {} } @MyAnnotation1(value = "") - @MyAnnotation2 //warn + @MyAnnotation2 InnerClass anon = new InnerClass() { @MyAnnotation2 @MyAnnotation1(value = "") public int a; - @MyAnnotation1(value = "") public int b; //warn + @MyAnnotation1(value = "") public int b; @MyAnnotation2 @MyAnnotation1(value = "") @@ -82,18 +82,18 @@ void foo2() {} public int d; @MyAnnotation1(value = "") - @MyAnnotation2 void foo1() {} //warn + @MyAnnotation2 void foo1() {} @MyAnnotation1(value = "") - @MyAnnotation2 //warn + @MyAnnotation2 void foo2() {} - @MyAnnotation1(value = "") void foo42() {} //warn + @MyAnnotation1(value = "") void foo42() {} }; } - @MyAnnotation1 //warn + @MyAnnotation1 (value = "") @MyAnnotation2 class Foo { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java new file mode 100644 index 00000000000..f259d2a40ba --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect2.java @@ -0,0 +1,124 @@ +package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation; + +/* Config: + * allowSamelineSingleParameterlessAnnotation = true + * allowSamelineParameterizedAnnotation = true + * allowSamelineMultipleAnnotations = true + */ + +@MyAnn_22 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn_2 // ok +(value = "") +class InputAnnotationLocationIncorrect2 +{ + + @MyAnn_22 @MyAnnotation_12(value = "") // ok + public int a; + + @MyAnnotation_12(value = "") public int b; // ok + + @MyAnn_22 // ok + @MyAnnotation_12 // violation +(value = "") + public int c; + + @MyAnnotation_12(value = "") // ok + public int d; + + @MyAnn_22 // ok + @MyAnnotation_12 // violation +(value = "") + public InputAnnotationLocationIncorrect2() {} + + @MyAnnotation_12("foo") @MyAnn_22 void foo1() {} // ok + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + void foo2() {} + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + @MyAnnotation_32 // violation + @MyAnnotation_42 // violation + class InnerClass + { + @MyAnn_22 @MyAnnotation_12 // ok +(value = "") + public int a; + + @MyAnnotation_12(value = "") public int b; // ok + + @MyAnn_22 // ok + @MyAnnotation_12 // violation +(value = "") + public int c; + + @MyAnnotation_12(value = "") // ok + public int d; + + @MyAnn_22 // ok + @MyAnnotation_12(value = "") public InnerClass() // ok + { + // comment + } + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + void foo1() {} + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + void foo2() {} + } + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + InnerClass anon = new InnerClass() + { + @MyAnn_22 @MyAnnotation_12(value = "") public int a; // ok + + @MyAnnotation_12(value = "") public int b; // ok + + @MyAnn_22 // ok + @MyAnnotation_12(value = "") // ok + public int c; + + @MyAnnotation_12(value = "") // ok + public int d; + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 void foo1() {} // violation + + @MyAnnotation_12(value = "") // ok + @MyAnn_22 // violation + void foo2() {} + + @MyAnnotation_12(value = "") void foo42() {} // ok + }; + +} + + @MyAnnotation_12 // ok +(value = "") +@MyAnn_22 // violation +class Foo2 { + public void method1(@MyAnnotation_32 @MyAnn_22 Object param1) { // ok + try { + } + catch (@MyAnnotation_32 @MyAnn_22 Exception e) { // ok + } + return; + } +} + +@interface MyAnnotation_12 { + + String value();} + +@interface MyAnn_22 {} + +@interface MyAnnotation_32 {} + +@interface MyAnnotation_42 {} + +@interface MyAnn_2 { + + String value();} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java new file mode 100644 index 00000000000..7ba498d1927 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/annotationlocation/InputAnnotationLocationIncorrect3.java @@ -0,0 +1,123 @@ +package com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation; + +/* Config: + * tokens = CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, + * ANNOTATION_DEF, ANNOTATION_FIELD_DEF, ENUM_CONSTANT_DEF, PACKAGE_DEF + */ + +@MyAnn_23 @com.puppycrawl.tools.checkstyle.checks.annotation.annotationlocation.MyAnn3 // violation +(value = "") +class InputAnnotationLocationIncorrect3 +{ + + @MyAnn_23 @MyAnnotation_13(value = "") // violation + public int a; + + @MyAnnotation_13(value = "") public int b; // violation + + @MyAnn_23 // ok + @MyAnnotation_13 // violation +(value = "") + public int c; + + @MyAnnotation_13(value = "") // ok + public int d; + + @MyAnn_23 + @MyAnnotation_13 // violation +(value = "") + public InputAnnotationLocationIncorrect3() {} + + @MyAnnotation_13("foo") @MyAnn_23 void foo1() {} // violation + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + void foo2() {} + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + @MyAnnotation_33 // violation + @MyAnnotation_43 // violation + class InnerClass3 + { + @MyAnn_23 @MyAnnotation_13 // violation +(value = "") + public int a; + + @MyAnnotation_13(value = "") public int b; // violation + + @MyAnn_23 // ok + @MyAnnotation_13 // violation +(value = "") + public int c; + + @MyAnnotation_13(value = "") // ok + public int d; + + @MyAnn_23 // ok + @MyAnnotation_13(value = "") public InnerClass3() // violation + { + // comment + } + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + void foo1() {} + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + void foo2() {} + } + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + InnerClass3 anon = new InnerClass3() + { + @MyAnn_23 @MyAnnotation_13(value = "") public int a; // violation + + @MyAnnotation_13(value = "") public int b; // violation + + @MyAnn_23 // ok + @MyAnnotation_13(value = "") // ok + public int c; + + @MyAnnotation_13(value = "") // ok + public int d; + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 void foo1() {} // violation + + @MyAnnotation_13(value = "") // ok + @MyAnn_23 // violation + void foo2() {} + + @MyAnnotation_13(value = "") void foo42() {} // violation + }; + +} + + @MyAnnotation_13 // ok +(value = "") +@MyAnn_23 // violation +class Foo3 { + public void method1(@MyAnnotation_33 @MyAnn_23 Object param1) { + try { + } + catch (@MyAnnotation_33 @MyAnn_23 Exception e) { + } + return; + } +} + +@interface MyAnnotation_13 { + + String value();} + +@interface MyAnn_23 {} + +@interface MyAnnotation_33 {} + +@interface MyAnnotation_43 {} + +@interface MyAnn3 { + + String value();}