Issue checkstyle#4313: Split and Organize Checkstyle inputs by Test f…

…or checks in annotation package: AnnotationUseStyle
Kietzmann · May 4, 2017 · ed4ca2d · ed4ca2d
1 parent 4063302
commit ed4ca2d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/...t/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java b/...t/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheckTest.java
@@ -42,7 +42,9 @@ public class AnnotationUseStyleCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "annotation" + File.separator + filename);
+                + "annotation" + File.separator
+                + "annotationusestyle" + File.separator
+                + filename);
     }
 
     /* Additional test for jacoco, since valueOf()

diff --git a/...on/InputAnnotationUseNoTrailingComma.java → ...le/InputAnnotationUseNoTrailingComma.java b/...on/InputAnnotationUseNoTrailingComma.java → ...le/InputAnnotationUseNoTrailingComma.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 // suppress
 @SuppressWarnings({})
 public class InputAnnotationUseNoTrailingComma

diff --git a/...s/annotation/InputAnnotationUseStyle.java → ...tionusestyle/InputAnnotationUseStyle.java b/...s/annotation/InputAnnotationUseStyle.java → ...tionusestyle/InputAnnotationUseStyle.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 
 @interface SomeArrays32 {

diff --git a/...kstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCustomAnnotations.java b/...kstyle/checks/annotation/annotationusestyle/InputAnnotationUseStyleCustomAnnotations.java
@@ -0,0 +1,26 @@
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
+
+@MyAnnotation11 @MyAnnotation12 @MyAnnotation13
+public class InputAnnotationUseStyleCustomAnnotations {
+
+    @MyAnnotation13
+    void method() {
+
+    }
+
+    @MyAnnotation13
+    @MyAnnotation12
+    void method2() {
+
+    }
+
+}
+
+@interface MyAnnotation11 {
+}
+
+@interface MyAnnotation12 {
+}
+
+@interface MyAnnotation13 {
+}
diff --git a/.../InputAnnotationUseWithTrailingComma.java → .../InputAnnotationUseWithTrailingComma.java b/.../InputAnnotationUseWithTrailingComma.java → .../InputAnnotationUseWithTrailingComma.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 //this file compiles in eclipse 3.4 but not with Sun's JDK 1.6.0.11
 
 /**

diff --git a/...ation/InputAnnotationsUseStyleParams.java → ...style/InputAnnotationsUseStyleParams.java b/...ation/InputAnnotationsUseStyleParams.java → ...style/InputAnnotationsUseStyleParams.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

diff --git a/...s/annotation/InputDifferentUseStyles.java → ...tionusestyle/InputDifferentUseStyles.java b/...s/annotation/InputDifferentUseStyles.java → ...tionusestyle/InputDifferentUseStyles.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.annotationusestyle;
 
 @Deprecated
 @SomeArrays(pooches={DOGS.LEO})