Issue #6320: added REMOVE_CONDITIONALS mutator for misc

config/checkstyle_resources_suppressions.xml

@@ -47,7 +47,11 @@
     files="linelength[\\/]InputLineLengthLongPackageStatement\.java"/>
 
   <!-- intentional problem for testing -->
+  <suppress checks="OuterTypeFilename"
+    files="outertypefilename[\\/]InputOuterTypeFilename1a\.java"/>
   <suppress checks="OuterTypeFilename"
     files="outertypefilename[\\/]InputOuterTypeFilename5\.java"/>
+  <suppress checks="OuterTypeFilename"
+    files="outertypefilename[\\/]InputOuterTypeFilenameNoPublic\.java"/>
 
 </suppressions>

config/suppressions.xml

@@ -88,7 +88,8 @@
     <suppress checks="ClassDataAbstractionCoupling"
               files="(Checker|Main|CheckstyleAntTask|JavadocDetailNodeParser)\.java"/>
     <suppress checks="ClassDataAbstractionCoupling"
-              files="(CheckerTest|AbstractModuleTestSupport|CheckstyleAntTaskTest)\.java"/>
+              files="(CheckerTest|AbstractModuleTestSupport|CheckstyleAntTaskTest|
+                     |TranslationCheckTest)\.java"/>
     <suppress checks="ClassDataAbstractionCoupling" files="PropertyCacheFileTest\.java"/>
     <suppress checks="ClassDataAbstractionCoupling"
               files="XpathFileGeneratorAuditListenerTest\.java"/>

pom.xml

@@ -1784,6 +1784,7 @@
                 <mutator>INVERT_NEGS</mutator>
                 <mutator>MATH</mutator>
                 <mutator>NEGATE_CONDITIONALS</mutator>
+                <mutator>REMOVE_CONDITIONALS</mutator>
                 <mutator>RETURN_VALS</mutator>
                 <mutator>TRUE_RETURNS</mutator>
                 <mutator>VOID_METHOD_CALLS</mutator>

src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java

@@ -137,14 +137,10 @@ else if (ast.getType() == TokenTypes.FOR_EACH_CLAUSE) {
     private void visitMethod(final DetailAST method) {
         final DetailAST modifiers =
             method.findFirstToken(TokenTypes.MODIFIERS);
-        // exit on fast lane if there is nothing to check here
 
-        if (method.findFirstToken(TokenTypes.PARAMETERS)
-                .findFirstToken(TokenTypes.PARAMETER_DEF) != null
-                // ignore abstract and native methods
-                && modifiers.findFirstToken(TokenTypes.ABSTRACT) == null
+        // ignore abstract and native methods
+        if (modifiers.findFirstToken(TokenTypes.ABSTRACT) == null
                 && modifiers.findFirstToken(TokenTypes.LITERAL_NATIVE) == null) {
-            // we can now be sure that there is at least one parameter
             final DetailAST parameters =
                 method.findFirstToken(TokenTypes.PARAMETERS);
             DetailAST child = parameters.getFirstChild();

src/main/java/com/puppycrawl/tools/checkstyle/checks/LineSeparatorOption.java

@@ -67,10 +67,9 @@ public enum LineSeparatorOption {
     public boolean matches(byte... bytes) {
         final boolean result;
         if (this == LF_CR_CRLF) {
-            // this silently assumes CRLF and ANY have the same length
-            // and LF and CR are of length 1
-            result = CRLF.matches(bytes)
-                || LF.matches(Arrays.copyOfRange(bytes, 1, 2))
+            // this silently assumes LF and CR are of length 1
+            // CRLF always matches LF, so CRLF isn't tested
+            result = LF.matches(Arrays.copyOfRange(bytes, 1, 2))
                 || CR.matches(Arrays.copyOfRange(bytes, 1, 2));
         }
         else {

src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java

@@ -51,9 +51,6 @@ public class OuterTypeFilenameCheck extends AbstractCheck {
     /** If file has public type. */
     private boolean hasPublic;
 
-    /** If first type has has same name as file. */
-    private boolean validFirst;
-
     /** Outer type with mismatched file name. */
     private DetailAST wrongType;
 
@@ -81,7 +78,6 @@ public int[] getRequiredTokens() {
     public void beginTree(DetailAST rootAST) {
         fileName = getFileName();
         seenFirstToken = false;
-        validFirst = false;
         hasPublic = false;
         wrongType = null;
     }
@@ -98,10 +94,7 @@ public void visitToken(DetailAST ast) {
         else {
             final String outerTypeName = ast.findFirstToken(TokenTypes.IDENT).getText();
 
-            if (fileName.equals(outerTypeName)) {
-                validFirst = true;
-            }
-            else {
+            if (!fileName.equals(outerTypeName)) {
                 wrongType = ast;
             }
         }
@@ -110,7 +103,7 @@ public void visitToken(DetailAST ast) {
 
     @Override
     public void finishTree(DetailAST rootAST) {
-        if (!validFirst && !hasPublic && wrongType != null) {
+        if (!hasPublic && wrongType != null) {
             log(wrongType.getLineNo(), MSG_KEY);
         }
     }

src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java

@@ -435,17 +435,15 @@ private static String getPath(String fileNameWithPath) {
      */
     private void checkTranslationKeys(ResourceBundle bundle) {
         final Set<File> filesInBundle = bundle.getFiles();
-        if (filesInBundle.size() >= 2) {
-            // build a map from files to the keys they contain
-            final Set<String> allTranslationKeys = new HashSet<>();
-            final Map<File, Set<String>> filesAssociatedWithKeys = new HashMap<>();
-            for (File currentFile : filesInBundle) {
-                final Set<String> keysInCurrentFile = getTranslationKeys(currentFile);
-                allTranslationKeys.addAll(keysInCurrentFile);
-                filesAssociatedWithKeys.put(currentFile, keysInCurrentFile);
-            }
-            checkFilesForConsistencyRegardingTheirKeys(filesAssociatedWithKeys, allTranslationKeys);
+        // build a map from files to the keys they contain
+        final Set<String> allTranslationKeys = new HashSet<>();
+        final Map<File, Set<String>> filesAssociatedWithKeys = new HashMap<>();
+        for (File currentFile : filesInBundle) {
+            final Set<String> keysInCurrentFile = getTranslationKeys(currentFile);
+            allTranslationKeys.addAll(keysInCurrentFile);
+            filesAssociatedWithKeys.put(currentFile, keysInCurrentFile);
         }
+        checkFilesForConsistencyRegardingTheirKeys(filesAssociatedWithKeys, allTranslationKeys);
     }
 
     /**
@@ -463,10 +461,8 @@ private void checkFilesForConsistencyRegardingTheirKeys(Map<File, Set<String>> f
             final Set<String> currentFileKeys = fileKey.getValue();
             final Set<String> missingKeys = keysThatMustExist.stream()
                 .filter(key -> !currentFileKeys.contains(key)).collect(Collectors.toSet());
-            if (!missingKeys.isEmpty()) {
-                for (Object key : missingKeys) {
-                    log(1, MSG_KEY, key);
-                }
+            for (Object key : missingKeys) {
+                log(1, MSG_KEY, key);
             }
             fireErrors(path);
             dispatcher.fireFileFinished(path);

src/test/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheckTest.java

@@ -127,6 +127,29 @@ public void testIgnorePrimitiveTypesParameters() throws Exception {
         verify(checkConfig, getPath("InputFinalParametersPrimitiveTypes.java"), expected);
     }
 
+    @Test
+    public void testPrimitiveTypesParameters() throws Exception {
+        final DefaultConfiguration checkConfig =
+            createModuleConfig(FinalParametersCheck.class);
+        final String[] expected = {
+            "5:14: " + getCheckMessage(MSG_KEY, "i"),
+            "6:15: " + getCheckMessage(MSG_KEY, "i"),
+            "6:22: " + getCheckMessage(MSG_KEY, "k"),
+            "6:32: " + getCheckMessage(MSG_KEY, "s"),
+            "7:15: " + getCheckMessage(MSG_KEY, "s"),
+            "7:25: " + getCheckMessage(MSG_KEY, "o"),
+            "7:35: " + getCheckMessage(MSG_KEY, "l"),
+            "8:15: " + getCheckMessage(MSG_KEY, "array"),
+            "9:15: " + getCheckMessage(MSG_KEY, "i"),
+            "9:22: " + getCheckMessage(MSG_KEY, "x"),
+            "9:31: " + getCheckMessage(MSG_KEY, "s"),
+            "10:15: " + getCheckMessage(MSG_KEY, "x"),
+            "10:22: " + getCheckMessage(MSG_KEY, "l"),
+            "10:32: " + getCheckMessage(MSG_KEY, "s"),
+        };
+        verify(checkConfig, getPath("InputFinalParametersPrimitiveTypes.java"), expected);
+    }
+
     @Test
     public void testReceiverParameters() throws Exception {
         final DefaultConfiguration checkConfig =

src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java

@@ -86,6 +86,15 @@ public void testNestedClass() throws Exception {
         verify(checkConfig, getPath("InputOuterTypeFilename1.java"), expected);
     }
 
+    @Test
+    public void testNestedClass2() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
+        final String[] expected = {
+            "3: " + getCheckMessage(MSG_KEY),
+        };
+        verify(checkConfig, getPath("InputOuterTypeFilename1a.java"), expected);
+    }
+
     @Test
     public void testFinePublic() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
@@ -100,6 +109,15 @@ public void testPublicClassIsNotFirst() throws Exception {
         verify(checkConfig, getPath("InputOuterTypeFilenameCheckPublic.java"), expected);
     }
 
+    @Test
+    public void testNoPublicClasses() throws Exception {
+        final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
+        final String[] expected = {
+            "3: " + getCheckMessage(MSG_KEY),
+        };
+        verify(checkConfig, getPath("InputOuterTypeFilenameNoPublic.java"), expected);
+    }
+
     @Test
     public void testFineDefault() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);

src/test/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolderTest.java

@@ -199,6 +199,14 @@ public void testIsSuppressedAfterEventEnd() throws Exception {
         assertFalse("Event is not suppressed", SuppressWarningsHolder.isSuppressed(event));
     }
 
+    @Test
+    public void testIsSuppressedAfterEventEnd2() throws Exception {
+        createHolder("check", 100, 100, 350, 350);
+        final AuditEvent event = createAuditEvent("check", 400, 10);
+
+        assertFalse("Event is not suppressed", SuppressWarningsHolder.isSuppressed(event));
+    }
+
     @Test
     public void testIsSuppressedAfterEventStart() throws Exception {
         createHolder("check", 100, 100, 350, 350);

src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java

@@ -62,6 +62,8 @@ public void testDefaults() throws Exception {
             "18: " + getCheckMessage(MSG_KEY),
             "19: " + getCheckMessage(MSG_KEY),
             "29: " + getCheckMessage(MSG_KEY),
+            "30: " + getCheckMessage(MSG_KEY),
+            "31: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputTrailingComment.java"), expected);
     }
@@ -76,6 +78,7 @@ public void testLegalComment() throws Exception {
             "8: " + getCheckMessage(MSG_KEY),
             "18: " + getCheckMessage(MSG_KEY),
             "19: " + getCheckMessage(MSG_KEY),
+            "31: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputTrailingComment.java"), expected);
     }
@@ -97,6 +100,8 @@ public void testFormat() throws Exception {
             "19: " + getCheckMessage(MSG_KEY),
             "26: " + getCheckMessage(MSG_KEY),
             "29: " + getCheckMessage(MSG_KEY),
+            "30: " + getCheckMessage(MSG_KEY),
+            "31: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputTrailingComment.java"), expected);
     }