From 143e2d73093eae0897b8350e26e4bab4eaa126e1 Mon Sep 17 00:00:00 2001
From: Martin Dietze <mdietze@gmail.com>
Date: Mon, 15 Apr 2019 19:14:49 +0200
Subject: [PATCH] Issue #734: Remove some paranoia checks not covered in the
 tests

---
 .../coding/checkstyle-metadata.properties     |   6 +-
 sevntu-checks/pom.xml                         |   6 +-
 sevntu-checks/sevntu-checks.xml               |  16 +-
 .../checks/coding/Jsr305AnnotationsCheck.java | 221 ++++-----
 .../coding/Jsr305AnnotationsCheckTest.java    | 421 ++----------------
 ...InputJsr305AnnotationsCheckWithArrays.java |   2 +-
 .../InputJsr305AnnotationsCheckWithCatch.java |  44 ++
 .../InputJsr305AnnotationsCheckWithClass.java |   2 +-
 ...Jsr305AnnotationsCheckWithConstructor.java |   2 +-
 ...notationsCheckWithDefaultReturnValues.java |   2 +-
 ...AnnotationsCheckWithDefectConstructor.java |   2 +-
 .../InputJsr305AnnotationsCheckWithEnum.java  |   2 +-
 ...Jsr305AnnotationsCheckWithInheritance.java |   2 +-
 ...InputJsr305AnnotationsCheckWithLambda.java |   2 +-
 ...utJsr305AnnotationsCheckWithParameter.java |   2 +-
 ...tJsr305AnnotationsCheckWithPrimitives.java |   2 +-
 ...notationsCheckWithRedundantClassLevel.java |   2 +-
 ...Jsr305AnnotationsCheckWithReturnValue.java |   2 +-
 .../sonar/checkstyle-extensions.xml           |   4 +-
 19 files changed, 188 insertions(+), 554 deletions(-)
 create mode 100644 sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithCatch.java

diff --git a/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties
index d6f785e827..e286278314 100755
--- a/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties
+++ b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties
@@ -191,7 +191,7 @@ RequireFailForTryCatchInJunitCheck.desc = Checks if a try/catch block has a juni
 
 Jsr305AnnotationsCheck.name=Jsr305AnnotationsCheck
 Jsr305AnnotationsCheck.desc=Checks method parameters and return values for the presence of @Nonnull, @Nullable, or @CheckForNull annotations.
-Jsr305AnnotationsCheck.packages=Packages to be checked.
-Jsr305AnnotationsCheck.excludePackages=Packages excluded from checking.
+Jsr305AnnotationsCheck.packages=Sets the parent package for all classes that will be checked.
+Jsr305AnnotationsCheck.excludePackages=Packages excluded from checking. This can be useful if under the parent package set with "packages" there are subpackages which should not be checked.
 Jsr305AnnotationsCheck.allowOverridingReturnValue=Allow Overriding return values, useful for upgrading.
-Jsr305AnnotationsCheck.allowOverridingParameter=Allow Overriding paramaters, useful for upgrading.
+Jsr305AnnotationsCheck.allowOverridingParameter=Allow Overriding parameters, useful for upgrading.
diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
index 7298767531..e6cffcabc5 100644
--- a/sevntu-checks/pom.xml
+++ b/sevntu-checks/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.1</version>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -294,8 +294,8 @@
               <regex><pattern>.*.checks.coding.MapIterationInForEachLoopCheck</pattern><branchRate>90</branchRate><lineRate>98</lineRate></regex>
               <regex><pattern>.*.checks.coding.NoNullForCollectionReturnCheck</pattern><branchRate>85</branchRate><lineRate>96</lineRate></regex>
               <regex><pattern>.*.checks.coding.OverridableMethodInConstructorCheck</pattern><branchRate>94</branchRate><lineRate>99</lineRate></regex>
-              <regex><pattern>.*.checks.coding.Jsr305AnnotationsCheck</pattern><branchRate>84</branchRate><lineRate>93</lineRate></regex>
-              <regex><pattern>.*.checks.coding.Jsr305AnnotationsCheck.AbstractJsr305Check</pattern><branchRate>95</branchRate><lineRate>98</lineRate></regex>
+              <regex><pattern>.*.checks.coding.Jsr305AnnotationsCheck</pattern><branchRate>97</branchRate><lineRate>100</lineRate></regex>
+              <regex><pattern>.*.checks.coding.Jsr305AnnotationsCheck.AbstractJsr305Check</pattern><branchRate>99</branchRate><lineRate>100</lineRate></regex>
               <regex><pattern>.*.checks.design.HideUtilityClassConstructorCheck</pattern><branchRate>94</branchRate><lineRate>100</lineRate></regex>
             </regexes>
           </check>
diff --git a/sevntu-checks/sevntu-checks.xml b/sevntu-checks/sevntu-checks.xml
index dacefc8868..25cf1e5d33 100644
--- a/sevntu-checks/sevntu-checks.xml
+++ b/sevntu-checks/sevntu-checks.xml
@@ -159,6 +159,14 @@
     <module name="com.github.sevntu.checkstyle.checks.coding.WhitespaceBeforeArrayInitializerCheck"/>
     <module name="com.github.sevntu.checkstyle.checks.coding.MoveVariableInsideIfCheck" />
     <module name="com.github.sevntu.checkstyle.checks.coding.RequireFailForTryCatchInJunitCheck" />
+    <module name="com.github.sevntu.checkstyle.checks.coding.Jsr305AnnotationsCheck">
+      <property name="severity" value="ignore"/>
+      <property name="packages" value="com.github.sevntu.checkstyle.checks.naming,com.github.sevntu.checkstyle.checks.coding"/>
+      <property name="excludePackages" value="com.github.sevntu.checkstyle.checks.sizes,com.github.sevntu.checkstyle.checks.design"/>
+      <property name="allowOverridingReturnValue" value="false"/>
+      <property name="allowOverridingParameter" value="false"/>
+    </module>
+
 
     <!-- Design -->
     <module name="com.github.sevntu.checkstyle.checks.design.ChildBlockLengthCheck">
@@ -216,14 +224,6 @@
       <property name="ignoreMethod" value="false"/>
     </module>
 
-    <!-- Jsr305 -->
-    <module name="com.github.sevntu.checkstyle.checks.coding.Jsr305AnnotationsCheck">
-      <property name="packages" value="your.package.path.to.check,another.package.path.to.check"/>
-      <property name="excludePackages" value="your.package.path.not.to.check,another.package.path.not.to.check"/>
-      <property name="allowOverridingReturnValue" value="false"/>
-      <property name="allowOverridingParameter" value="false"/>
-    </module>
-
     <!-- moved to checkstyle project since 1.21.0 -->
     <!--
         <module name="com.github.sevntu.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck">
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
index d224c9da30..c3c84685b4 100644
--- a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
+++ b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheck.java
@@ -27,6 +27,7 @@
 import java.util.Set;
 
 import antlr.collections.AST;
+import com.github.sevntu.checkstyle.SevntuUtil;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FullIdent;
@@ -237,6 +238,35 @@ protected enum NullnessAnnotation {
     /** State, is a package excluded. */
     private boolean packageExcluded;
 
+    @Override
+    public final int[] getDefaultTokens() {
+        return getAcceptableTokens();
+    }
+
+    @Override
+    public final int[] getRequiredTokens() {
+        return new int[0];
+    }
+
+    @Override
+    public final int[] getAcceptableTokens() {
+        return DEFAULT_MODIFIERS.clone();
+    }
+
+    @Override
+    public final void visitToken(final DetailAST ast) {
+        if (ast.getType() == TokenTypes.PACKAGE_DEF) {
+            final DetailAST nameAST = ast.getLastChild().getPreviousSibling();
+            packageExcluded = isPackageExcluded(FullIdent.createFullIdent(nameAST));
+        }
+        else if (!packageExcluded) {
+            final AbstractJsr305Check handler = handleDefinition(ast);
+            if (handler != null) {
+                handler.check();
+            }
+        }
+    }
+
     /**
      * Sets the included packages parameter.
      * @param packageNames
@@ -270,15 +300,6 @@ public void setExcludePackages(final String... packageNames) {
         excludePackages = transformToUnique(packageNames);
     }
 
-    /**
-     * Gets the current value of the excluded packages parameter.
-     *
-     * @return the excluded packages
-     */
-    public String[] getExcludePackages() {
-        return excludePackages;
-    }
-
     /**
      * Removes duplicates from an array of strings.
      * @param input
@@ -290,35 +311,6 @@ private static String[] transformToUnique(final String... input) {
         return inputSet.toArray(new String[0]);
     }
 
-    @Override
-    public final int[] getDefaultTokens() {
-        return DEFAULT_MODIFIERS.clone();
-    }
-
-    @Override
-    public final int[] getRequiredTokens() {
-        return new int[0];
-    }
-
-    @Override
-    public final int[] getAcceptableTokens() {
-        return DEFAULT_MODIFIERS.clone();
-    }
-
-    @Override
-    public final void visitToken(final DetailAST ast) {
-        if (ast.getType() == TokenTypes.PACKAGE_DEF) {
-            final DetailAST nameAST = ast.getLastChild().getPreviousSibling();
-            packageExcluded = isPackageExcluded(FullIdent.createFullIdent(nameAST));
-        }
-        else if (!packageExcluded) {
-            final AbstractJsr305Check handler = handleDefinition(ast);
-            if (handler != null) {
-                handler.check();
-            }
-        }
-    }
-
     /**
      * Checks whether a package is excluded.
      * @param fullIdent
@@ -327,25 +319,20 @@ else if (!packageExcluded) {
      */
     protected boolean isPackageExcluded(final FullIdent fullIdent) {
         Boolean result = null;
-        if (fullIdent == null) {
-            result = true;
+        final String packageName = fullIdent.getText();
+        for (final String excludesPackageName : excludePackages) {
+            if (packageName.startsWith(excludesPackageName)) {
+                result = true;
+                break;
+            }
         }
-        else {
-            final String packageName = fullIdent.getText();
-            for (final String excludesPackageName : excludePackages) {
-                if (packageName.startsWith(excludesPackageName)) {
-                    result = true;
+        if (result == null) {
+            for (final String includePackageName : packages) {
+                if (packageName.startsWith(includePackageName)) {
+                    result = false;
                     break;
                 }
             }
-            if (result == null) {
-                for (final String includePackageName : packages) {
-                    if (packageName.startsWith(includePackageName)) {
-                        result = false;
-                        break;
-                    }
-                }
-            }
         }
         if (result == null) {
             result = true;
@@ -363,11 +350,8 @@ protected AbstractJsr305Check handleDefinition(final DetailAST ast) {
 
         // no definition in catch clause
         final DetailAST parent = ast.getParent();
-        final AbstractJsr305Check result;
-        if (parent != null && parent.getType() == TokenTypes.LITERAL_CATCH) {
-            result = null;
-        }
-        else {
+        AbstractJsr305Check result = null;
+        if (parent == null || parent.getType() != TokenTypes.LITERAL_CATCH) {
             // search modifiers
             final int type = ast.getType();
             switch (type) {
@@ -386,7 +370,8 @@ protected AbstractJsr305Check handleDefinition(final DetailAST ast) {
                     result = new ClassJsr305Check(ast);
                     break;
                 default:
-                    throw new UnsupportedOperationException("no implementation for " + type);
+                    SevntuUtil.reportInvalidToken(ast.getType());
+                    break;
             }
         }
         return result;
@@ -663,21 +648,14 @@ public abstract class AbstractJsr305Check {
         protected AbstractJsr305Check(final DetailAST ast) {
             theAst = ast;
             errorFound = false;
-            if (ast == null) {
-                theAnnotations = Collections.emptySet();
-            }
-            else {
-                theAnnotations = findAnnotation();
-            }
+            theAnnotations = findAnnotation();
         }
 
         /**
          * Run the actual check.
          */
         public final void check() {
-            if (theAst != null) {
-                runcheck();
-            }
+            runcheck();
         }
 
         /**
@@ -767,7 +745,8 @@ protected void checkRedundancyDueToClassLevelAnnotation(final String msg,
         protected boolean containsAll(final NullnessAnnotation... annotations) {
             Boolean result = null;
             if (theAnnotations.isEmpty()) {
-                result = annotations.length == 0;
+                // an empty list of annotations can never contain all
+                result = false;
             }
             else {
                 for (final NullnessAnnotation obj : annotations) {
@@ -797,15 +776,6 @@ protected void checkContainsNone(final String msg,
             }
         }
 
-        /**
-         * Returns the current error state.
-         *
-         * @return the current error state
-         */
-        protected boolean isErrorFound() {
-            return errorFound;
-        }
-
         /**
          * Logs an error.
          *
@@ -823,9 +793,7 @@ protected void reportError(final String msg) {
          *        the error message
          */
         protected void error(final String msg) {
-            if (!errorFound) {
-                reportError(msg);
-            }
+            reportError(msg);
             errorFound = true;
         }
 
@@ -836,32 +804,22 @@ protected void error(final String msg) {
         protected boolean isPrimitiveType() {
             final DetailAST parameterType = theAst.findFirstToken(TokenTypes.TYPE);
             final boolean result;
-            if (parameterType == null) {
-                result = false;
-            }
-            else {
-                final DetailAST identToken = parameterType.getFirstChild();
-
-                if (identToken == null) {
+            final DetailAST identToken = parameterType.getFirstChild();
+
+            switch (identToken.getType()) {
+                case TokenTypes.LITERAL_BOOLEAN:
+                case TokenTypes.LITERAL_INT:
+                case TokenTypes.LITERAL_LONG:
+                case TokenTypes.LITERAL_SHORT:
+                case TokenTypes.LITERAL_BYTE:
+                case TokenTypes.LITERAL_CHAR:
+                case TokenTypes.LITERAL_VOID:
+                case TokenTypes.LITERAL_DOUBLE:
+                case TokenTypes.LITERAL_FLOAT:
+                    result = !isArrayOrElipsis(parameterType);
+                    break;
+                default:
                     result = false;
-                }
-                else {
-                    switch (identToken.getType()) {
-                        case TokenTypes.LITERAL_BOOLEAN:
-                        case TokenTypes.LITERAL_INT:
-                        case TokenTypes.LITERAL_LONG:
-                        case TokenTypes.LITERAL_SHORT:
-                        case TokenTypes.LITERAL_BYTE:
-                        case TokenTypes.LITERAL_CHAR:
-                        case TokenTypes.LITERAL_VOID:
-                        case TokenTypes.LITERAL_DOUBLE:
-                        case TokenTypes.LITERAL_FLOAT:
-                            result = !isArrayOrElipsis(parameterType);
-                            break;
-                        default:
-                            result = false;
-                    }
-                }
             }
             return result;
         }
@@ -875,18 +833,13 @@ protected boolean isPrimitiveType() {
         protected boolean isArrayOrElipsis(final DetailAST identToken) {
             final DetailAST next = identToken.getNextSibling();
             final boolean result;
-            if (next == null) {
-                result = false;
-            }
-            else {
-                switch (next.getType()) {
-                    case TokenTypes.ARRAY_DECLARATOR:
-                    case TokenTypes.ELLIPSIS:
-                        result = true;
-                        break;
-                    default:
-                        result = false;
-                }
+            switch (next.getType()) {
+                case TokenTypes.ARRAY_DECLARATOR:
+                case TokenTypes.ELLIPSIS:
+                    result = true;
+                    break;
+                default:
+                    result = false;
             }
             return result;
         }
@@ -898,13 +851,8 @@ protected boolean isArrayOrElipsis(final DetailAST identToken) {
         protected boolean isVoid() {
             final DetailAST parameterType = theAst.findFirstToken(TokenTypes.TYPE);
             final boolean result;
-            if (parameterType == null) {
-                result = false;
-            }
-            else {
-                final DetailAST identToken = parameterType.getFirstChild();
-                result = identToken != null && identToken.getType() == TokenTypes.LITERAL_VOID;
-            }
+            final DetailAST identToken = parameterType.getFirstChild();
+            result = identToken.getType() == TokenTypes.LITERAL_VOID;
             return result;
         }
 
@@ -926,12 +874,10 @@ private Set<NullnessAnnotation> findAnnotations(final DetailAST ast) {
             final Set<NullnessAnnotation> result = new HashSet<>();
 
             final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
-            if (modifiers != null) {
-                for (AST child = modifiers.getFirstChild(); child != null; child =
-                        child.getNextSibling()) {
-                    if (child.getType() == TokenTypes.ANNOTATION) {
-                        addNextNullnessAnnotation(result, (DetailAST) child);
-                    }
+            for (AST child = modifiers.getFirstChild(); child != null; child =
+                    child.getNextSibling()) {
+                if (child.getType() == TokenTypes.ANNOTATION) {
+                    addNextNullnessAnnotation(result, (DetailAST) child);
                 }
             }
 
@@ -948,15 +894,10 @@ private Set<NullnessAnnotation> findAnnotations(final DetailAST ast) {
         protected final void addNextNullnessAnnotation(final Set<NullnessAnnotation> result,
                 DetailAST ast) {
             final DetailAST identifier = ast.findFirstToken(TokenTypes.IDENT);
-            if (identifier != null) {
-                final String annotationName = identifier.getText();
-                if (annotationName != null) {
-                    final NullnessAnnotation annotation =
-                            STRING2ANNOTATION.get(annotationName);
-                    if (annotation != null) {
-                        result.add(annotation);
-                    }
-                }
+            final String annotationName = identifier.getText();
+            final NullnessAnnotation annotation = STRING2ANNOTATION.get(annotationName);
+            if (annotation != null) {
+                result.add(annotation);
             }
         }
 
diff --git a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheckTest.java b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheckTest.java
index 5d25c949ae..9d90900152 100644
--- a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheckTest.java
+++ b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/checks/coding/Jsr305AnnotationsCheckTest.java
@@ -19,37 +19,19 @@
 
 package com.github.sevntu.checkstyle.checks.coding;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.junit.Assert;
 import org.junit.Test;
 
-import com.github.sevntu.checkstyle.checks.coding.Jsr305AnnotationsCheck.NullnessAnnotation;
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.FullIdent;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class Jsr305AnnotationsCheckTest extends AbstractModuleTestSupport {
 
-    private static final String[] EXCLUDED_PACKAGES = new String[] {
-        "com.foo", "org.bar",
-    };
-
-    private static final String[] INCLUDED_PACKAGES = new String[] {
-        "com.baz", "org.hmpf",
-    };
-
     // -------------- Function tests (execute check on test sources) --------------
 
     @Test
     public void testParameters() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "37:44: " + getCheckMessage(
@@ -71,7 +53,7 @@ public void testParameters() throws Exception {
     @Test
     public void testPrimitives() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "29:37: " + getCheckMessage(
@@ -99,7 +81,7 @@ public void testPrimitives() throws Exception {
     @Test
     public void testReturnValues() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "49:5: " + getCheckMessage(Jsr305AnnotationsCheck.MSG_RETURN_VALUE_WITH_NULLABLE, "e"),
@@ -129,7 +111,7 @@ public void testReturnValues() throws Exception {
     @Test
     public void testConstructors() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "38:55: " + getCheckMessage(Jsr305AnnotationsCheck.MSG_PARAM_NONNULL_AND_NULLABLE, "e"),
@@ -147,7 +129,7 @@ public void testConstructors() throws Exception {
     @Test
     public void testArrays() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "43:43: " + getCheckMessage(
@@ -172,7 +154,7 @@ public void testArrays() throws Exception {
     @Test
     public void testClasses() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "33:5: " + getCheckMessage(
@@ -205,7 +187,7 @@ public void testClasses() throws Exception {
     @Test
     public void testEnums() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "45:32: " + getCheckMessage(
@@ -226,7 +208,7 @@ public void testEnums() throws Exception {
     @Test
     public void testInheritance() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "44:47: " + getCheckMessage(
@@ -241,7 +223,7 @@ public void testInheritance() throws Exception {
     @Test
     public void testReturnValueDefaults() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "37:5: " + getCheckMessage(
@@ -255,7 +237,7 @@ public void testReturnValueDefaults() throws Exception {
     @Test
     public void testRedudantClassLevelAnnotations() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "28:5: " + getCheckMessage(
@@ -269,7 +251,7 @@ public void testRedudantClassLevelAnnotations() throws Exception {
     @Test
     public void testLambdas() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
 
         final String[] expected = {
             "35:10: " + getCheckMessage(
@@ -284,7 +266,7 @@ public void testLambdas() throws Exception {
     @Test
     public void testAllowOverridingParameters() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
         checkConfig.addAttribute("allowOverridingReturnValue", "true");
         checkConfig.addAttribute("allowOverridingParameter", "true");
 
@@ -306,7 +288,7 @@ public void testAllowOverridingParameters() throws Exception {
     @Test
     public void testAllowOverridingLambdas() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
         checkConfig.addAttribute("allowOverridingReturnValue", "true");
         checkConfig.addAttribute("allowOverridingParameter", "true");
 
@@ -321,7 +303,7 @@ public void testAllowOverridingLambdas() throws Exception {
     @Test
     public void testAllowOverridingInheritance() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
         checkConfig.addAttribute("allowOverridingReturnValue", "true");
         checkConfig.addAttribute("allowOverridingParameter", "true");
 
@@ -336,370 +318,41 @@ public void testAllowOverridingInheritance() throws Exception {
     }
 
     @Test
-    public void testExcludePackage() throws Exception {
+    public void testCatch() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
-        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding.test");
-        checkConfig.addAttribute("excludePackages",
-                "com.github.sevntu.checkstyle.checks.coding.test");
-        checkConfig.addAttribute("allowOverridingParameter", "true");
-
-        final String[] expected = {};
-
-        verify(checkConfig, getPath("InputJsr305AnnotationsCheckWithParameter.java"), expected);
-    }
-
-    // ------------------ Unit tests (test particular functions) ------------------
-
-    @Test
-    public void testIsPackageExcluded() {
-        // final String[] excludedPackages = new String[] {
-        final AbstractCheckAdapter check1 = new AbstractCheckAdapter() {
-            @Override
-            public void check() {
-                Assert.assertEquals(true, isPackageExcluded(null));
-
-                final DetailAST ast = new DetailAST();
-                ast.setText(EXCLUDED_PACKAGES[1]);
-                final FullIdent fullIdent1 = FullIdent.createFullIdent(ast);
-                Assert.assertEquals(EXCLUDED_PACKAGES[1], fullIdent1.getText());
-                Assert.assertEquals(true, isPackageExcluded(fullIdent1));
-            }
-        };
-        check1.setPackages(INCLUDED_PACKAGES);
-        check1.setExcludePackages(EXCLUDED_PACKAGES);
-        check1.check();
-
-        final AbstractCheckAdapter check2 = new AbstractCheckAdapter() {
-            @Override
-            public void check() {
-                final DetailAST ast = new DetailAST();
-                ast.setText(INCLUDED_PACKAGES[0]);
-                final FullIdent fullIdent2 = FullIdent.createFullIdent(ast);
-                Assert.assertEquals(INCLUDED_PACKAGES[0], fullIdent2.getText());
-                Assert.assertEquals(false, isPackageExcluded(fullIdent2));
-
-                ast.setText("xxx");
-                final FullIdent fullIdent3 = FullIdent.createFullIdent(ast);
-                Assert.assertEquals("xxx", fullIdent3.getText());
-                Assert.assertEquals(true, isPackageExcluded(fullIdent3));
-            }
-        };
-        check2.setPackages(INCLUDED_PACKAGES);
-        check2.setExcludePackages(EXCLUDED_PACKAGES);
-        check2.check();
-    }
-
-    @Test
-    public void testHandleDefinition() {
-        // final String[] excludedPackages = new String[] {
-        final AbstractCheckAdapter check = new AbstractCheckAdapter() {
-            @Override
-            public void check() {
-                final DetailAST ast = new DetailAST();
-                final DetailAST parent = new DetailAST();
-                parent.setType(TokenTypes.LITERAL_CATCH);
-                parent.addChild(ast);
-                Assert.assertNull(handleDefinition(ast));
-
-                try {
-                    handleDefinition(parent);
-                    Assert.fail("UnsupportedOperationException expected.");
-                }
-                catch (final UnsupportedOperationException exc) {
-                    // OK
-                }
-            }
-        };
-        check.check();
-    }
-
-    @Test
-    public void testGetAcceptableTokens() {
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        Assert.assertEquals(7, check.getAcceptableTokens().length);
-    }
-
-    @Test
-    public void testSetExcludePackages() {
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        Assert.assertEquals(0, check.getExcludePackages().length);
-        check.setExcludePackages(EXCLUDED_PACKAGES);
-        Assert.assertEquals(true, Arrays.equals(check.getExcludePackages(), EXCLUDED_PACKAGES));
-    }
-
-    @Test
-    public void testAbstractJsr305CheckConstructor() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        check.new AbstractJsr305Check(null) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-            }
-        };
-        Assert.assertEquals(false, executed.get());
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
+        verify(checkConfig, getPath("InputJsr305AnnotationsCheckWithCatch.java"),
+                new String[0]);
     }
 
     @Test
-    public void testMethodOverridden() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final AtomicBoolean overridden = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        ast.setType(TokenTypes.ARRAY_INIT);
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                overridden.set(isMethodOverridden());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, overridden.get());
-    }
-
-    @Test
-    public void testAddNextNullnessAnnotation() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final Set<NullnessAnnotation> nullnessAnnotations = new HashSet<>();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                addNextNullnessAnnotation(nullnessAnnotations, ast);
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(true, nullnessAnnotations.isEmpty());
-
-        executed.set(false);
-
-        final DetailAST identAst = new DetailAST();
-        identAst.setType(TokenTypes.IDENT);
-        ast.addChild(identAst);
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                addNextNullnessAnnotation(nullnessAnnotations, ast);
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(true, nullnessAnnotations.isEmpty());
-    }
+    public void testInclude1Package() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
+        checkConfig.addAttribute("packages",
+                "com.github.sevntu.checkstyle.checks.naming");
 
-    @Test
-    public void testIsVoid() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final AtomicBoolean isVoid = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                isVoid.set(isVoid());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, isVoid.get());
-
-        executed.set(false);
-
-        final DetailAST typeAst = new DetailAST();
-        typeAst.setType(TokenTypes.TYPE);
-        ast.addChild(typeAst);
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                isVoid.set(isVoid());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, isVoid.get());
+        verify(checkConfig, getPath("InputJsr305AnnotationsCheckWithCatch.java"), new String[0]);
     }
 
     @Test
-    public void testIsArrayOrEllipsis() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final AtomicBoolean arrayOrEllipsis = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                arrayOrEllipsis.set(isArrayOrElipsis(ast));
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, arrayOrEllipsis.get());
-    }
+    public void testInclude2Packages() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
+        checkConfig.addAttribute("packages",
+                "com.github.sevntu.checkstyle.internal,com.github.sevntu.checkstyle.checks.coding");
 
-    @Test
-    public void testIsPrimitiveType() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final AtomicBoolean primitiveType = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                primitiveType.set(isPrimitiveType());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, primitiveType.get());
-
-        executed.set(false);
-
-        final DetailAST parameterType = new DetailAST();
-        parameterType.setType(TokenTypes.TYPE);
-        ast.addChild(parameterType);
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                primitiveType.set(isPrimitiveType());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, primitiveType.get());
+        verify(checkConfig, getPath("InputJsr305AnnotationsCheckWithCatch.java"), new String[0]);
     }
 
     @Test
-    public void testError() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                Assert.assertEquals(false, isErrorFound());
-                error("foo");
-                Assert.assertEquals(true, isErrorFound());
-                error("foo");
-                Assert.assertEquals(true, isErrorFound());
-            }
-
-            @Override
-            protected void reportError(final String msg) {
-                // empty
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-    }
-
-    @Test
-    public void testContainsAll() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final AtomicBoolean containsAll = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final DetailAST ast = new DetailAST();
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                containsAll.set(containsAll());
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(true, containsAll.get());
-
-        executed.set(false);
-
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                containsAll.set(containsAll(NullnessAnnotation.CHECK_FOR_NULL));
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, containsAll.get());
-    }
+    public void testExcludePackage() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(Jsr305AnnotationsCheck.class);
+        checkConfig.addAttribute("packages", "com.github.sevntu.checkstyle.checks.coding");
+        checkConfig.addAttribute("excludePackages",
+                "com.github.sevntu.checkstyle.internal,com.github.sevntu.checkstyle.checks.coding");
 
-    @Test
-    public void testCollectLookedForAnnotations() {
-        final AtomicBoolean executed = new AtomicBoolean(false);
-        final Jsr305AnnotationsCheck check = new Jsr305AnnotationsCheck();
-        final Set<NullnessAnnotation> nullnessAnnotations = new HashSet<>();
-        final DetailAST ast = createAstWithTwoAnnotations();
-        final NullnessAnnotation[] annotationsToLookFor1 = new NullnessAnnotation[] {
-            NullnessAnnotation.CHECK_FOR_NULL, NullnessAnnotation.NONNULL,
-        };
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                nullnessAnnotations.addAll(collectLookedForAnnotations(ast, annotationsToLookFor1));
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, nullnessAnnotations.isEmpty());
-        Assert.assertEquals(true, nullnessAnnotations.contains(NullnessAnnotation.CHECK_FOR_NULL));
-        Assert.assertEquals(false, nullnessAnnotations.contains(NullnessAnnotation.NONNULL));
-        Assert.assertEquals(false, nullnessAnnotations.contains(NullnessAnnotation.NULLABLE));
-
-        nullnessAnnotations.clear();
-        executed.set(false);
-
-        final NullnessAnnotation[] annotationsToLookFor2 = new NullnessAnnotation[] {
-            NullnessAnnotation.CHECK_FOR_NULL,
-        };
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                nullnessAnnotations.addAll(collectLookedForAnnotations(ast, annotationsToLookFor2));
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(false, nullnessAnnotations.isEmpty());
-        Assert.assertEquals(true, nullnessAnnotations.contains(NullnessAnnotation.CHECK_FOR_NULL));
-        Assert.assertEquals(false, nullnessAnnotations.contains(NullnessAnnotation.NONNULL));
-        Assert.assertEquals(false, nullnessAnnotations.contains(NullnessAnnotation.NULLABLE));
-
-        nullnessAnnotations.clear();
-        executed.set(false);
-
-        final NullnessAnnotation[] annotationsToLookFor3 = new NullnessAnnotation[0];
-        check.new AbstractJsr305Check(ast) {
-            @Override
-            protected void runcheck() {
-                executed.set(true);
-                nullnessAnnotations.addAll(collectLookedForAnnotations(ast, annotationsToLookFor3));
-            }
-        }.check();
-        Assert.assertEquals(true, executed.get());
-        Assert.assertEquals(true, nullnessAnnotations.isEmpty());
-    }
+        final String[] expected = {};
 
-    private DetailAST createAstWithTwoAnnotations() {
-        final DetailAST ast = new DetailAST();
-        final DetailAST modifiersAst = new DetailAST();
-        modifiersAst.setType(TokenTypes.MODIFIERS);
-        ast.addChild(modifiersAst);
-        final DetailAST checkForNullAst = new DetailAST();
-        checkForNullAst.setType(TokenTypes.ANNOTATION);
-        final DetailAST checkForNullIdent = new DetailAST();
-        checkForNullIdent.setType(TokenTypes.IDENT);
-        checkForNullIdent.setText("CheckForNull");
-        checkForNullAst.addChild(checkForNullIdent);
-        modifiersAst.addChild(checkForNullAst);
-        final DetailAST nullableAst = new DetailAST();
-        nullableAst.setType(TokenTypes.ANNOTATION);
-        final DetailAST nullableIdent = new DetailAST();
-        nullableIdent.setType(TokenTypes.IDENT);
-        nullableIdent.setText("Nullable");
-        checkForNullAst.addChild(checkForNullIdent);
-        checkForNullAst.addNextSibling(nullableAst);
-        return ast;
+        verify(checkConfig, getPath("InputJsr305AnnotationsCheckWithParameter.java"), expected);
     }
 
     @Override
@@ -707,8 +360,4 @@ protected String getPackageLocation() {
         return "com/github/sevntu/checkstyle/checks/coding";
     }
 
-    private abstract static class AbstractCheckAdapter extends Jsr305AnnotationsCheck {
-        public abstract void check();
-    }
-
 }
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithArrays.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithArrays.java
index 3e7eea726a..421082fb38 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithArrays.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithArrays.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import java.io.Serializable;
 
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithCatch.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithCatch.java
new file mode 100644
index 0000000000..cf07ff31fe
--- /dev/null
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithCatch.java
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code for adherence to a set of rules.
+// Copyright (C) 2001-2019 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+////////////////////////////////////////////////////////////////////////////////
+
+package com.github.sevntu.checkstyle.checks.coding;
+
+import java.io.Serializable;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class InputJsr305AnnotationsCheckWithCatch {
+    
+    public InputJsr305AnnotationsCheckWithCatch() throws Exception {
+        try {
+            System.out.println("foo");
+        }
+        catch (Exception exc) {
+            throw new Exception() {
+                @Override
+                public String getMessage() {
+                    return "foo";
+                }
+            };
+        }
+    }
+
+}
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithClass.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithClass.java
index 37e4b6c617..8aad0697b1 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithClass.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithClass.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithConstructor.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithConstructor.java
index 2226a7ce9d..584146eba4 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithConstructor.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithConstructor.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.CheckReturnValue;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefaultReturnValues.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefaultReturnValues.java
index 8dc84d356f..481efcb5f3 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefaultReturnValues.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefaultReturnValues.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.Nonnull;
 
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefectConstructor.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefectConstructor.java
index e6c62a4555..fcdd25da8e 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefectConstructor.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithDefectConstructor.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.Nonnull;
 
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithEnum.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithEnum.java
index 2b47129e45..00039fd4c3 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithEnum.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithEnum.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithInheritance.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithInheritance.java
index 56ad86f846..4bb0596bc2 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithInheritance.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithInheritance.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithLambda.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithLambda.java
index 97e6eb98ce..93e1feeb55 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithLambda.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithLambda.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithParameter.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithParameter.java
index 87bad08e07..1b3ae42e7e 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithParameter.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithParameter.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithPrimitives.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithPrimitives.java
index 65c1090a59..a7b8d2fa29 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithPrimitives.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithPrimitives.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithRedundantClassLevel.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithRedundantClassLevel.java
index 357ca543e8..49b69d4f24 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithRedundantClassLevel.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithRedundantClassLevel.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 import javax.annotation.ParametersAreNullableByDefault;
diff --git a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithReturnValue.java b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithReturnValue.java
index a19aaa26c5..b214e629b8 100644
--- a/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithReturnValue.java
+++ b/sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputJsr305AnnotationsCheckWithReturnValue.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.github.sevntu.checkstyle.checks.coding.test;
+package com.github.sevntu.checkstyle.checks.coding;
 
 import java.io.Serializable;
 
diff --git a/sevntu-checkstyle-sonar-plugin/src/main/resources/com/github/sevntu/checkstyle/sonar/checkstyle-extensions.xml b/sevntu-checkstyle-sonar-plugin/src/main/resources/com/github/sevntu/checkstyle/sonar/checkstyle-extensions.xml
index 0b8b6e4ad4..55312ebb5c 100644
--- a/sevntu-checkstyle-sonar-plugin/src/main/resources/com/github/sevntu/checkstyle/sonar/checkstyle-extensions.xml
+++ b/sevntu-checkstyle-sonar-plugin/src/main/resources/com/github/sevntu/checkstyle/sonar/checkstyle-extensions.xml
@@ -930,11 +930,11 @@
 
     <param key="packages" type="STRING">
       <defaultValue></defaultValue>
-      <description>Packages to be checked.</description>
+      <description>Sets the parent package for all classes that will be checked.</description>
     </param>
     <param key="excludePackages" type="STRING">
       <defaultValue></defaultValue>
-      <description>Packages excluded from checking.</description>
+      <description>Packages excluded from checking. This can be useful if under the parent package set with "packages" there are subpackages which should not be checked.</description>
     </param>
     <param key="allowOverridingReturnValue" type="BOOLEAN">
       <defaultValue>false</defaultValue>