Issue checkstyle#10448: Update inputs for AbbreviationAsWordInNameChe…

…ckTest
martin-mfg · Jul 30, 2021 · 2e453a5 · 2e453a5
1 parent 5cbaa50
commit 2e453a5
Show file tree

Hide file tree

Showing 23 changed files with 1,136 additions and 386 deletions.
diff --git a/config/checkstyle_input_suppressions.xml b/config/checkstyle_input_suppressions.xml
@@ -842,44 +842,6 @@
 
 
 
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameAbstractMultisetSetCount.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreFinal.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreFinalKeepStaticFinal.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnore.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreNonStaticFinal.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStaticFinal.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStatic.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStaticKeepStaticFinal.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameNoIgnore.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameOverridableMethod.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameReceiver.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameType.java"/>
 
   <suppress id="ConfigCommentOnTopInputs"
             files="naming[\\/]constantname[\\/]InputConstantNameInner.java"/>
@@ -2042,44 +2004,6 @@
 
 
 
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameAbstractMultisetSetCount.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreFinal.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreFinalKeepStaticFinal.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnore.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreNonStaticFinal.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStaticFinal.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStatic.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameIgnoreStaticKeepStaticFinal.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameNoIgnore.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameOverridableMethod.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameReceiver.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="naming[\\/]abbreviationaswordinname[\\/]InputAbbreviationAsWordInNameType.java"/>
 
   <suppress id="StyleValidationCommentInInputs"
             files="naming[\\/]constantname[\\/]InputConstantNameInner.java"/>

diff --git a/...java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/...java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
diff --git a/...naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java b/...naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceof.java
@@ -1,18 +1,24 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = (default)3
+allowedAbbreviations = (default)
+ignoreFinal = (default)true
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, \
+         PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \
+         RECORD_COMPONENT_DEF
+
+
+*/
+
 //non-compiled with javac: Compilable with Java14
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
 import java.util.ArrayList;
 import java.util.Locale;
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = n/a
- * tokens = CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
- *      PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,PATTERN_VARIABLE_DEF
- * ignoreStatic = true
- * ignoreFinal = true
- * ignoreStaticFinal = true
- */
+
 public class InputAbbreviationAsWordInNameCheckEnhancedInstanceof {
 
     public void t(Object o1, Object o2) {

diff --git a/...tionaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java b/...tionaswordinname/InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1.java
@@ -1,18 +1,24 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 1
+allowedAbbreviations = XML
+ignoreFinal = (default)true
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, \
+         PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \
+         RECORD_COMPONENT_DEF
+
+
+*/
+
 //non-compiled with javac: Compilable with Java14
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
 import java.util.ArrayList;
 import java.util.Locale;
-/*
- * Config:
- * allowedAbbreviationLength = 1
- * allowedAbbreviations = XML
- * tokens = CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
- *      PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,PATTERN_VARIABLE_DEF
- * ignoreStatic = true
- * ignoreFinal = true
- * ignoreStaticFinal = true
- */
+
 public class InputAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1 {
 
     public void t(Object o1, Object o2) {

diff --git a/...yle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java b/...yle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameCheckRecords.java
@@ -1,20 +1,23 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = (default)3
+allowedAbbreviations = (default)
+ignoreFinal = (default)true
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, \
+         PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \
+         RECORD_COMPONENT_DEF
+
+
+*/
+
 //non-compiled with javac: Compilable with Java14
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
 import org.w3c.dom.Node;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = n/a
- * tokens = {CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
- *      PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,PATTERN_VARIABLE_DEF, RECORD_DEF,
- *      RECORD_COMPONENT_DEF}
- * ignoreStatic = true
- * ignoreFinal = true
- * ignoreStaticFinal = true
- */
-
 public class InputAbbreviationAsWordInNameCheckRecords {
     class myCLASS { // violation
         int INTEGER = 2; // violation

diff --git a/...aming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java b/...aming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
@@ -1,6 +1,21 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 2
+allowedAbbreviations = null
+ignoreFinal = false
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = (default)CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, \
+         PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, \
+         RECORD_COMPONENT_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount<E> {
+public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount<E> { // ok
 
   private static final String SUPPORTS_REMOVE = "";
 

diff --git a/...heckstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnore.java b/...heckstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnore.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 5
+allowedAbbreviations = NUMBER, MARAZMATIC, VARIABLE
+ignoreFinal = (default)true
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 5
- * allowedAbbreviations = NUMBER,MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = true
- * ignoreFinal = true
- * ignoreStaticFinal = true
- */
 public class InputAbbreviationAsWordInNameIgnore {
 
     abstract class InputAbbreviationAsWordInNameType {

diff --git a/...tyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreFinal.java b/...tyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreFinal.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 4
+allowedAbbreviations = MARAZMATIC, VARIABLE
+ignoreFinal = (default)true
+ignoreStatic = false
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = false
- * ignoreFinal = true
- * ignoreStaticFinal = false
- */
 public class InputAbbreviationAsWordInNameIgnoreFinal {
 
     abstract class InputAbbreviationAsWordInNameType {

diff --git a/...ing/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreFinalKeepStaticFinal.java b/...ing/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreFinalKeepStaticFinal.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 4
+allowedAbbreviations = MARAZMATIC, VARIABLE
+ignoreFinal = (default)true
+ignoreStatic = false
+ignoreStaticFinal = false
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = false
- * ignoreFinal = true
- * ignoreStaticFinal = false
- */
 public class InputAbbreviationAsWordInNameIgnoreFinalKeepStaticFinal {
 
     abstract class InputAbbreviationAsWordInNameType {

diff --git a/...ks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreNonStaticFinal.java b/...ks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreNonStaticFinal.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 4
+allowedAbbreviations = MARAZMATIC, VARIABLE
+ignoreFinal = (default)true
+ignoreStatic = (default)true
+ignoreStaticFinal = false
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = true
- * ignoreFinal = true
- * ignoreStaticFinal = false
- */
 public class InputAbbreviationAsWordInNameIgnoreNonStaticFinal {
 
     abstract class InputAbbreviationAsWordInNameType {

diff --git a/...yle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreStatic.java b/...yle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreStatic.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 4
+allowedAbbreviations = MARAZMATIC, VARIABLE
+ignoreFinal = false
+ignoreStatic = (default)true
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = true
- * ignoreFinal = false
- * ignoreStaticFinal = true
- */
 public class InputAbbreviationAsWordInNameIgnoreStatic {
 
     abstract class InputAbbreviationAsWordInNameType {

diff --git a/...hecks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreStaticFinal.java b/...hecks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameIgnoreStaticFinal.java
@@ -1,15 +1,19 @@
+/*
+AbbreviationAsWordInName
+allowedAbbreviationLength = 4
+allowedAbbreviations = MARAZMATIC, VARIABLE
+ignoreFinal = false
+ignoreStatic = false
+ignoreStaticFinal = (default)true
+ignoreOverriddenMethods = (default)true
+tokens = CLASS_DEF, VARIABLE_DEF, METHOD_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, PARAMETER_DEF, \
+         INTERFACE_DEF, ANNOTATION_DEF
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
-/*
- * Config:
- * allowedAbbreviationLength = 4
- * allowedAbbreviations = MARAZMATIC,VARIABLE
- * tokens = CLASS_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_DEF,ENUM_CONSTANT_DEF,
- *      PARAMETER_DEF,INTERFACE_DEF,ANNOTATION_DEF
- * ignoreStatic = false
- * ignoreFinal = false
- * ignoreStaticFinal = true
- */
 public class InputAbbreviationAsWordInNameIgnoreStaticFinal {
 
     abstract class InputAbbreviationAsWordInNameType {