Issue checkstyle#14715: Enforce new naming convention on Abbreviation…

…AsWordInName in IT area
Lmh-java · Mar 28, 2024 · 646ce60 · 646ce60
1 parent f4b7158
commit 646ce60
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 28 deletions.
diff --git a/...va/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java b/...va/org/checkstyle/suppressionxpathfilter/XpathRegressionAbbreviationAsWordInNameTest.java
@@ -40,7 +40,7 @@ protected String getCheckName() {
     @Test
     public void testAnnotation() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation.java"));
+                "InputXpathAbbreviationAsWordInNameAnnotation.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -52,7 +52,7 @@ public void testAnnotation() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameAnnotation']]"
                     + "/OBJBLOCK/ANNOTATION_DEF/IDENT[@text='ANNOTATION']"
         );
 
@@ -63,7 +63,7 @@ public void testAnnotation() throws Exception {
     @Test
     public void testAnnotationField() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField.java"));
+                "InputXpathAbbreviationAsWordInNameAnnotationField.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -75,7 +75,7 @@ public void testAnnotationField() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/ANNOTATION_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameAnnotationField']]"
                     + "/OBJBLOCK/ANNOTATION_FIELD_DEF/IDENT[@text='ANNOTATION_FIELD']"
         );
 
@@ -86,7 +86,7 @@ public void testAnnotationField() throws Exception {
     @Test
     public void testClass() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameClass.java"));
+                "InputXpathAbbreviationAsWordInNameClass.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -98,7 +98,7 @@ public void testClass() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameClass']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameClass']]"
                     + "/OBJBLOCK/CLASS_DEF/IDENT[@text='CLASS']"
         );
 
@@ -109,7 +109,7 @@ public void testClass() throws Exception {
     @Test
     public void testEnum() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameEnum.java"));
+                "InputXpathAbbreviationAsWordInNameEnum.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -121,7 +121,7 @@ public void testEnum() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameEnum']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameEnum']]"
                     + "/OBJBLOCK/ENUM_DEF/IDENT[@text='ENUMERATION']"
         );
 
@@ -132,7 +132,7 @@ public void testEnum() throws Exception {
     @Test
     public void testField() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameField.java"));
+                "InputXpathAbbreviationAsWordInNameField.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -144,7 +144,7 @@ public void testField() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameField']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameField']]"
                     + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='FIELD']"
         );
 
@@ -155,7 +155,7 @@ public void testField() throws Exception {
     @Test
     public void testInterface() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameInterface.java"));
+                "InputXpathAbbreviationAsWordInNameInterface.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -167,7 +167,7 @@ public void testInterface() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameInterface']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameInterface']]"
                     + "/OBJBLOCK/INTERFACE_DEF/IDENT[@text='INTERFACE']"
         );
 
@@ -178,7 +178,7 @@ public void testInterface() throws Exception {
     @Test
     public void testMethod() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameMethod.java"));
+                "InputXpathAbbreviationAsWordInNameMethod.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -190,7 +190,7 @@ public void testMethod() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameMethod']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameMethod']]"
                     + "/OBJBLOCK/METHOD_DEF/IDENT[@text='METHOD']"
         );
 
@@ -201,7 +201,7 @@ public void testMethod() throws Exception {
     @Test
     public void testParameter() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameParameter.java"));
+                "InputXpathAbbreviationAsWordInNameParameter.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -213,7 +213,7 @@ public void testParameter() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameParameter']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameParameter']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
                     + "/PARAMETERS/PARAMETER_DEF/IDENT[@text='PARAMETER']"
         );
@@ -225,7 +225,7 @@ public void testParameter() throws Exception {
     @Test
     public void testVariable() throws Exception {
         final File fileToProcess = new File(getPath(
-                "SuppressionXpathRegressionAbbreviationAsWordInNameVariable.java"));
+                "InputXpathAbbreviationAsWordInNameVariable.java"));
 
         final DefaultConfiguration moduleConfig =
                 createModuleConfig(AbbreviationAsWordInNameCheck.class);
@@ -237,7 +237,7 @@ public void testVariable() throws Exception {
 
         final List<String> expectedXpathQueries = Collections.singletonList(
                 "/COMPILATION_UNIT/CLASS_DEF[./IDENT["
-                    + "@text='SuppressionXpathRegressionAbbreviationAsWordInNameVariable']]"
+                    + "@text='InputXpathAbbreviationAsWordInNameVariable']]"
                     + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='method']]"
                     + "/SLIST/VARIABLE_DEF/IDENT[@text='VARIABLE']"
         );

diff --git a/...onAbbreviationAsWordInNameAnnotation.java → ...thAbbreviationAsWordInNameAnnotation.java b/...onAbbreviationAsWordInNameAnnotation.java → ...thAbbreviationAsWordInNameAnnotation.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameAnnotation {
+public class InputXpathAbbreviationAsWordInNameAnnotation {
 
     @interface ANNOTATION { // warn
 

diff --git a/...reviationAsWordInNameAnnotationField.java → ...reviationAsWordInNameAnnotationField.java b/...reviationAsWordInNameAnnotationField.java → ...reviationAsWordInNameAnnotationField.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public @interface SuppressionXpathRegressionAbbreviationAsWordInNameAnnotationField {
+public @interface InputXpathAbbreviationAsWordInNameAnnotationField {
 
     String ANNOTATION_FIELD(); // warn
 

diff --git a/...ressionAbbreviationAsWordInNameClass.java → ...utXpathAbbreviationAsWordInNameClass.java b/...ressionAbbreviationAsWordInNameClass.java → ...utXpathAbbreviationAsWordInNameClass.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameClass {
+public class InputXpathAbbreviationAsWordInNameClass {
 
     class CLASS { // warn
 

diff --git a/...gressionAbbreviationAsWordInNameEnum.java → ...putXpathAbbreviationAsWordInNameEnum.java b/...gressionAbbreviationAsWordInNameEnum.java → ...putXpathAbbreviationAsWordInNameEnum.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameEnum {
+public class InputXpathAbbreviationAsWordInNameEnum {
 
     enum ENUMERATION { // warn
 

diff --git a/...ressionAbbreviationAsWordInNameField.java → ...utXpathAbbreviationAsWordInNameField.java b/...ressionAbbreviationAsWordInNameField.java → ...utXpathAbbreviationAsWordInNameField.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameField {
+public class InputXpathAbbreviationAsWordInNameField {
 
     int FIELD; // warn
 

diff --git a/...ionAbbreviationAsWordInNameInterface.java → ...athAbbreviationAsWordInNameInterface.java b/...ionAbbreviationAsWordInNameInterface.java → ...athAbbreviationAsWordInNameInterface.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameInterface {
+public class InputXpathAbbreviationAsWordInNameInterface {
 
     interface INTERFACE { // warn
 

diff --git a/...essionAbbreviationAsWordInNameMethod.java → ...tXpathAbbreviationAsWordInNameMethod.java b/...essionAbbreviationAsWordInNameMethod.java → ...tXpathAbbreviationAsWordInNameMethod.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public interface SuppressionXpathRegressionAbbreviationAsWordInNameMethod {
+public interface InputXpathAbbreviationAsWordInNameMethod {
 
     void METHOD(); // warn
 

diff --git a/...ionAbbreviationAsWordInNameParameter.java → ...athAbbreviationAsWordInNameParameter.java b/...ionAbbreviationAsWordInNameParameter.java → ...athAbbreviationAsWordInNameParameter.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public interface SuppressionXpathRegressionAbbreviationAsWordInNameParameter {
+public interface InputXpathAbbreviationAsWordInNameParameter {
 
     void method(int PARAMETER); // warn
 

diff --git a/...sionAbbreviationAsWordInNameVariable.java → ...pathAbbreviationAsWordInNameVariable.java b/...sionAbbreviationAsWordInNameVariable.java → ...pathAbbreviationAsWordInNameVariable.java
@@ -1,6 +1,6 @@
 package org.checkstyle.suppressionxpathfilter.abbreviationaswordinname;
 
-public class SuppressionXpathRegressionAbbreviationAsWordInNameVariable {
+public class InputXpathAbbreviationAsWordInNameVariable {
 
     void method() {
         int VARIABLE; // warn

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java
@@ -119,7 +119,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport {
     // Checks whose files need to be renamed to new pattern "InputXpath{Check}Xxx.java"
     // until https://github.com/checkstyle/checkstyle/issues/14715
     private static final Set<String> RENAME_INPUT_XPATH = Set.of(
-            "AbbreviationAsWordInName",
             "AbstractClassName",
             "AnnotationLocation",
             "AnnotationOnSameLine",