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

…or checks in annotation package: MissingDeprecated
timurt · May 6, 2017 · 477e5ce · 477e5ce
1 parent 935209d
commit 477e5ce
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 35 deletions.
diff --git a/...st/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java b/...st/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheckTest.java
@@ -38,7 +38,9 @@ public class MissingDeprecatedCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "annotation" + File.separator + filename);
+                + "annotation" + File.separator
+                + "missingdeprecated" + File.separator
+                + filename);
     }
 
     @Test
@@ -77,7 +79,7 @@ public void testBadDeprecatedAnnotation() throws Exception {
             "56: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputBadDeprecatedAnnotation.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedBadDeprecated.java"), expected);
     }
 
     /**
@@ -100,7 +102,7 @@ public void testBadDeprecatedJavadoc() throws Exception {
             "55: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputBadDeprecatedJavadoc.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedBadJavadoc.java"), expected);
     }
 
     /**
@@ -127,7 +129,7 @@ public void testSpecialCaseDeprecated() throws Exception {
             "51: " + getCheckMessage(MSG_KEY_JAVADOC_DUPLICATE_TAG, "@deprecated"),
         };
 
-        verify(checkConfig, getPath("InputSpecialCaseDeprecated.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedSpecialCase.java"), expected);
     }
 
     /**
@@ -140,7 +142,7 @@ public void testGoodDeprecated() throws Exception {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputGoodDeprecated.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedGood.java"), expected);
     }
 
     @Test
@@ -154,7 +156,7 @@ public void testTwoInJavadocWithoutAnnotation() throws Exception {
             "12: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputMissingDeprecated1.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedClass.java"), expected);
     }
 
     @Test
@@ -167,7 +169,7 @@ public void testEmptyJavadocLine() throws Exception {
             "11: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputMissingDeprecated2.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecatedMethod.java"), expected);
     }
 
     @Test

diff --git a/.../resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated2.java b/.../resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated2.java
diff --git a/...otation/InputBadDeprecatedAnnotation.java → .../InputMissingDeprecatedBadDeprecated.java b/...otation/InputBadDeprecatedAnnotation.java → .../InputMissingDeprecatedBadDeprecated.java
@@ -1,15 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 /**
  * @deprecated
  *  stuff
  */
-public class InputBadDeprecatedAnnotation
+public class InputMissingDeprecatedBadDeprecated
 {
     /**
      * @deprecated        stuff
      */
-    protected InputBadDeprecatedAnnotation() {
+    protected InputMissingDeprecatedBadDeprecated() {
 
     }
 

diff --git a/...annotation/InputBadDeprecatedJavadoc.java → ...ted/InputMissingDeprecatedBadJavadoc.java b/...annotation/InputBadDeprecatedJavadoc.java → ...ted/InputMissingDeprecatedBadJavadoc.java
@@ -1,15 +1,15 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 import java.lang.annotation.Inherited;
 
 @Deprecated
-public class InputBadDeprecatedJavadoc
+public class InputMissingDeprecatedBadJavadoc
 {
     /**
      * @Deprecated this is not the same
      */
     @Deprecated
-    protected InputBadDeprecatedJavadoc() {
+    protected InputMissingDeprecatedBadJavadoc() {
 
     }
 

diff --git a/...s/annotation/InputMissingDeprecated1.java → ...precated/InputMissingDeprecatedClass.java b/...s/annotation/InputMissingDeprecated1.java → ...precated/InputMissingDeprecatedClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 import java.lang.annotation.Inherited;
 /**
@@ -9,7 +9,7 @@
  *stuff
  *stuff
  */
-public class InputMissingDeprecated1
+public class InputMissingDeprecatedClass
 {
 
 }
diff --git a/...hecks/annotation/InputGoodDeprecated.java → ...eprecated/InputMissingDeprecatedGood.java b/...hecks/annotation/InputGoodDeprecated.java → ...eprecated/InputMissingDeprecatedGood.java
@@ -1,17 +1,17 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 /**
  * @deprecated
  * bleh
  */
 @Deprecated
-public class InputGoodDeprecated
+public class InputMissingDeprecatedGood
 {
     /**
      * @deprecated           bleh
      */
     @Deprecated
-    protected InputGoodDeprecated() {
+    protected InputMissingDeprecatedGood() {
     }
 
     /**

diff --git a/...wl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedMethod.java b/...wl/tools/checkstyle/checks/annotation/missingdeprecated/InputMissingDeprecatedMethod.java
@@ -0,0 +1,14 @@
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
+
+public class InputMissingDeprecatedMethod {
+
+
+    /**
+     * @deprecated
+     * 
+     * @param comment
+     */
+    public void method(){
+    }
+
+}
diff --git a/.../InputMissingDeprecatedSkipNoJavadoc.java → .../InputMissingDeprecatedSkipNoJavadoc.java b/.../InputMissingDeprecatedSkipNoJavadoc.java → .../InputMissingDeprecatedSkipNoJavadoc.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 public class InputMissingDeprecatedSkipNoJavadoc {
     @Deprecated

diff --git a/...nnotation/InputSpecialCaseDeprecated.java → ...ed/InputMissingDeprecatedSpecialCase.java b/...nnotation/InputSpecialCaseDeprecated.java → ...ed/InputMissingDeprecatedSpecialCase.java
@@ -1,11 +1,11 @@
-package com.puppycrawl.tools.checkstyle.checks.annotation;
+package com.puppycrawl.tools.checkstyle.checks.annotation.missingdeprecated;
 
 /**
  * @deprecated bleh
  * @deprecated boo
  */
 @Deprecated
-public class InputSpecialCaseDeprecated
+public class InputMissingDeprecatedSpecialCase
 {
     /**
      * @deprecated bleh