diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java index b158343dbc9..63282740728 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalIdentifierNameTest.java @@ -41,7 +41,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionIllegalIdentifierNameTestOne.java")); + "InputXpathIllegalIdentifierNameOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(IllegalIdentifierNameCheck.class); @@ -55,7 +55,7 @@ public void testOne() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/RECORD_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionIllegalIdentifierNameTestOne'" + + "[./IDENT[@text='InputXpathIllegalIdentifierNameOne'" + "]]/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='yield']" ); @@ -66,7 +66,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java")); + "InputXpathIllegalIdentifierNameTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(IllegalIdentifierNameCheck.class); @@ -80,7 +80,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionIllegalIdentifierNameTestTwo']" + + "[./IDENT[@text='InputXpathIllegalIdentifierNameTwo']" + "]/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]/PARAMETERS/PARAMETER_DEF" + "/IDENT[@text='yield']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java index 824a1e55ae7..90fd3c93a3b 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalInstantiationTest.java @@ -38,7 +38,7 @@ protected String getCheckName() { @Test public void testSimple() throws Exception { - final String fileName = "SuppressionXpathRegressionIllegalInstantiationSimple.java"; + final String fileName = "InputXpathIllegalInstantiationSimple.java"; final File fileToProcess = new File(getNonCompilablePath(fileName)); final DefaultConfiguration moduleConfig = @@ -52,11 +52,11 @@ public void testSimple() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionIllegalInstantiationSimple']]" + + "[@text='InputXpathIllegalInstantiationSimple']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/" + "VARIABLE_DEF[./IDENT[@text='x']]/ASSIGN/EXPR", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionIllegalInstantiationSimple']]" + + "[./IDENT[@text='InputXpathIllegalInstantiationSimple']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF" + "[./IDENT[@text='x']]/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Boolean']]" ); @@ -67,7 +67,7 @@ public void testSimple() throws Exception { @Test public void testAnonymous() throws Exception { - final String fileName = "SuppressionXpathRegressionIllegalInstantiationAnonymous.java"; + final String fileName = "InputXpathIllegalInstantiationAnonymous.java"; final File fileToProcess = new File(getNonCompilablePath(fileName)); final DefaultConfiguration moduleConfig = @@ -81,11 +81,11 @@ public void testAnonymous() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionIllegalInstantiationAnonymous']]" + + "[@text='InputXpathIllegalInstantiationAnonymous']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF" + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='e']]/ASSIGN/EXPR", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionIllegalInstantiationAnonymous']]" + + "[@text='InputXpathIllegalInstantiationAnonymous']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]/OBJBLOCK/METHOD_DEF" + "[./IDENT[@text='test']]/SLIST/VARIABLE_DEF[./IDENT[@text='e']]" + "/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='Integer']]" @@ -97,7 +97,7 @@ public void testAnonymous() throws Exception { @Test public void testInterface() throws Exception { - final String fileName = "SuppressionXpathRegressionIllegalInstantiationInterface.java"; + final String fileName = "InputXpathIllegalInstantiationInterface.java"; final File fileToProcess = new File(getNonCompilablePath(fileName)); final DefaultConfiguration moduleConfig = @@ -111,12 +111,12 @@ public void testInterface() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionIllegalInstantiationInterface']]" + + "[@text='InputXpathIllegalInstantiationInterface']]" + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Inner']]/" + "OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/" + "VARIABLE_DEF[./IDENT[@text='s']]/ASSIGN/EXPR", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionIllegalInstantiationInterface']]" + + "[@text='InputXpathIllegalInstantiationInterface']]" + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Inner']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/VARIABLE_DEF" + "[./IDENT[@text='s']]/ASSIGN/EXPR/LITERAL_NEW[./IDENT[@text='String']]" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java index fbf65bacaee..72dc53cfc8c 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageAnnotationTest.java @@ -41,7 +41,7 @@ protected String getCheckName() { public void testOne() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPackageAnnotationOne.java")); + "InputXpathPackageAnnotationOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(PackageAnnotationCheck.class); @@ -62,7 +62,7 @@ public void testOne() throws Exception { public void testTwo() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPackageAnnotationTwo.java")); + "InputXpathPackageAnnotationTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(PackageAnnotationCheck.class); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java index eef3d0a3c34..44d90d015e3 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPackageDeclarationTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void test1() throws Exception { + public void testWrongPackage() throws Exception { final File fileToProcess = - new File(getNonCompilablePath("SuppressionXpathRegression1.java")); + new File(getNonCompilablePath("InputXpathWrongPackage.java")); final DefaultConfiguration moduleConfig = createModuleConfig(PackageDeclarationCheck.class); @@ -59,9 +59,9 @@ public void test1() throws Exception { } @Test - public void test2() throws Exception { + public void testMissingPackage() throws Exception { final File fileToProcess = - new File(getNonCompilablePath("SuppressionXpathRegression2.java")); + new File(getNonCompilablePath("InputXpathMissingPackage.java")); final DefaultConfiguration moduleConfig = createModuleConfig(PackageDeclarationCheck.class); @@ -73,11 +73,11 @@ public void test2() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT", - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegression2']]", + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathMissingPackage']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegression2']]/MODIFIERS", + + "[./IDENT[@text='InputXpathMissingPackage']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegression2']]/MODIFIERS/LITERAL_PUBLIC" + + "[./IDENT[@text='InputXpathMissingPackage']]/MODIFIERS/LITERAL_PUBLIC" ); runVerifications(moduleConfig, fileToProcess, expectedViolation, diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java index 0176ac59d20..4b71fc653ac 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionPatternVariableNameTest.java @@ -42,7 +42,7 @@ protected String getCheckName() { public void testOne() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPatternVariableName1.java")); + "InputXpathPatternVariableNameOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(PatternVariableNameCheck.class); @@ -56,7 +56,7 @@ public void testOne() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName1']]" + + "[./IDENT[@text='InputXpathPatternVariableNameOne']]" + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/" + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/PATTERN_VARIABLE_DEF/" + "IDENT[@text='STRING1']" @@ -70,7 +70,7 @@ public void testOne() throws Exception { public void testTwo() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPatternVariableName2.java")); + "InputXpathPatternVariableNameTwo.java")); final String nonDefaultPattern = "^_[a-zA-Z0-9]*$"; @@ -85,7 +85,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName2']]" + + "[./IDENT[@text='InputXpathPatternVariableNameTwo']]" + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/" + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/" + "PATTERN_VARIABLE_DEF/IDENT[@text='s']" @@ -99,7 +99,7 @@ public void testTwo() throws Exception { public void testThree() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPatternVariableName3.java")); + "InputXpathPatternVariableNameThree.java")); final String nonDefaultPattern = "^[a-z](_?[a-zA-Z0-9]+)*$"; @@ -114,7 +114,7 @@ public void testThree() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName3']]" + + "[./IDENT[@text='InputXpathPatternVariableNameThree']]" + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/" + "EXPR/LITERAL_INSTANCEOF[./IDENT[@text='o1']]/" + "PATTERN_VARIABLE_DEF/IDENT[@text='STR']" @@ -128,7 +128,7 @@ public void testThree() throws Exception { public void testFour() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRegressionPatternVariableName4.java")); + "InputXpathPatternVariableNameFour.java")); final String nonDefaultPattern = "^[a-z][_a-zA-Z0-9]{2,}$"; @@ -143,7 +143,7 @@ public void testFour() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionPatternVariableName1']]" + + "[./IDENT[@text='InputXpathPatternVariableNameFour']]" + "/OBJBLOCK/CTOR_DEF[./IDENT[@text='MyClass']]/SLIST/LITERAL_IF/EXPR/" + "LITERAL_INSTANCEOF[./IDENT[@text='o1']]/" + "PATTERN_VARIABLE_DEF/IDENT[@text='st']" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java index 146c8851f62..29a365b56df 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNameTest.java @@ -39,9 +39,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testDefault() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRecordComponentName1.java")); + "InputXpathRecordComponentNameDefault.java")); final DefaultConfiguration moduleConfig = createModuleConfig(RecordComponentNameCheck.class); @@ -53,7 +53,7 @@ public void testOne() throws Exception { }; final List expectedXpathQueries = Collections.singletonList( - "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentName1']]" + "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNameDefault']]" + "/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='_value']" ); @@ -62,9 +62,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testFormat() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRecordComponentName2.java")); + "InputXpathRecordComponentNameFormat.java")); final DefaultConfiguration moduleConfig = createModuleConfig(RecordComponentNameCheck.class); @@ -78,7 +78,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRecordComponentName2']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathRecordComponentNameFormat']]/OBJBLOCK" + "/RECORD_DEF[./IDENT[@text='MyRecord']]" + "/RECORD_COMPONENTS/RECORD_COMPONENT_DEF/IDENT[@text='otherValue']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java index 57544091ed3..7ccafe659e8 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionRecordComponentNumberTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testDefault() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRecordComponentNumber1.java")); + "InputXpathRecordComponentNumberDefault.java")); final DefaultConfiguration moduleConfig = createModuleConfig(RecordComponentNumberCheck.class); @@ -52,10 +52,10 @@ public void testOne() throws Exception { }; final List expectedXpathQueries = Arrays.asList( - "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]", - "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]" + "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]", + "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]" + "/MODIFIERS", - "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber1']]" + "/COMPILATION_UNIT/RECORD_DEF[./IDENT[@text='InputXpathRecordComponentNumberDefault']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -64,9 +64,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testCustomMax() throws Exception { final File fileToProcess = new File(getNonCompilablePath( - "SuppressionXpathRecordComponentNumber2.java")); + "InputXpathRecordComponentNumberCustomMax.java")); final DefaultConfiguration moduleConfig = createModuleConfig(RecordComponentNumberCheck.class); @@ -79,11 +79,11 @@ public void testTwo() throws Exception { }; final List expectedXpathQueries = Arrays.asList( - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]" + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]", - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]" + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]/MODIFIERS", - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRecordComponentNumber2']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathRecordComponentNumberCustomMax']]" + "/OBJBLOCK/RECORD_DEF[./IDENT[@text='MyRecord']]/MODIFIERS" + "/LITERAL_PUBLIC" ); diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java similarity index 77% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java index 24417eaf730..f44d10b4e71 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestOne.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameOne.java @@ -5,7 +5,7 @@ * * default */ -public record SuppressionXpathRegressionIllegalIdentifierNameTestOne +public record InputXpathIllegalIdentifierNameOne (String string, String yield, // warn String otherString){ diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java similarity index 82% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java index 966376ded91..e6dbf371b5d 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/SuppressionXpathRegressionIllegalIdentifierNameTestTwo.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalidentifiername/InputXpathIllegalIdentifierNameTwo.java @@ -5,7 +5,7 @@ * * default */ -public class SuppressionXpathRegressionIllegalIdentifierNameTestTwo { +public class InputXpathIllegalIdentifierNameTwo { int foo(int yield) { // warn return switch (yield) { case 1 -> 2; diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationAnonymous.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java similarity index 81% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationAnonymous.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java index bcac8c37d83..fd102f38a0d 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationAnonymous.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationAnonymous.java @@ -2,7 +2,7 @@ package org.checkstyle.suppressionxpathfilter.illegalinstantiation; -public class SuppressionXpathRegressionIllegalInstantiationAnonymous { +public class InputXpathIllegalInstantiationAnonymous { int b = 5; // ok class Inner{ public void test() { diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationInterface.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java similarity index 82% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationInterface.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java index 77ceeda44ed..bc77bc3d394 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationInterface.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationInterface.java @@ -2,7 +2,7 @@ package org.checkstyle.suppressionxpathfilter.illegalinstantiation; -public class SuppressionXpathRegressionIllegalInstantiationInterface { +public class InputXpathIllegalInstantiationInterface { interface Inner { default void test() { Boolean x = new Boolean(true); // ok diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationSimple.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java similarity index 79% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationSimple.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java index a95edce94b3..3f5d3121c78 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/SuppressionXpathRegressionIllegalInstantiationSimple.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/illegalinstantiation/InputXpathIllegalInstantiationSimple.java @@ -2,7 +2,7 @@ package org.checkstyle.suppressionxpathfilter.illegalinstantiation; -public class SuppressionXpathRegressionIllegalInstantiationSimple { +public class InputXpathIllegalInstantiationSimple { int b = 5; // ok public void test() { Boolean x = new Boolean(true); // warn diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java similarity index 78% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java index 389588cf9ef..ebdc152242f 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationOne.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationOne.java @@ -3,6 +3,6 @@ @Deprecated package com.puppycrawl.tools.checkstyle.checks.annotation.packageannotation; // warn -public class SuppressionXpathRegressionPackageAnnotationOne { +public class InputXpathPackageAnnotationOne { } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java similarity index 82% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java index 377d6614107..62dcd55063d 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/SuppressionXpathRegressionPackageAnnotationTwo.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packageannotation/InputXpathPackageAnnotationTwo.java @@ -5,6 +5,6 @@ import javax.annotation.Generated; -public class SuppressionXpathRegressionPackageAnnotationOne { +public class InputXpathPackageAnnotationTwo { } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java similarity index 67% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java index b3c4f5b13e3..39c32922a5e 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression2.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathMissingPackage.java @@ -1,5 +1,5 @@ // non-compiled with javac: missing package. Used for Testing purpose. // package is missing. -public class SuppressionXpathRegression2 { // warn +public class InputXpathMissingPackage { // warn // code } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java similarity index 75% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java index f0b5261b516..e99f4c59afd 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/SuppressionXpathRegression1.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/packagedeclaration/InputXpathWrongPackage.java @@ -1,6 +1,6 @@ // non-compiled with javac: wrong package. Used for Testing purpose. package my.packagename.mismatch.with.folder; // warn -public class SuppressionXpathRegression1 { +public class InputXpathWrongPackage { // code } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java similarity index 76% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java index 8eeffc210f1..1c54a465220 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName4.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameFour.java @@ -1,7 +1,7 @@ //non-compiled with javac: Compilable with Java14 package com.puppycrawl.tools.checkstyle.checks.naming; -public class SuppressionXpathRegressionPatternVariableName1 { +public class InputXpathPatternVariableNameFour { MyClass(Object o1){ if (o1 instanceof String st) { // warning } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java similarity index 76% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java index cb084cd2100..899e018a1c9 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName1.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameOne.java @@ -1,7 +1,7 @@ //non-compiled with javac: Compilable with Java14 package com.puppycrawl.tools.checkstyle.checks.naming; -public class SuppressionXpathRegressionPatternVariableName1 { +public class InputXpathPatternVariableNameOne { MyClass(Object o1){ if (o1 instanceof String STRING1) { // warning } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java similarity index 76% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java index 8915ded5185..22f2c353c81 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName3.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameThree.java @@ -1,7 +1,7 @@ //non-compiled with javac: Compilable with Java14 package com.puppycrawl.tools.checkstyle.checks.naming; -public class SuppressionXpathRegressionPatternVariableName3 { +public class InputXpathPatternVariableNameThree { MyClass(Object o1){ if (o1 instanceof String STR) { // warning } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java similarity index 76% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java index 1475ca2e97f..8a9a1efd8ba 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/SuppressionXpathRegressionPatternVariableName2.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/patternvariablename/InputXpathPatternVariableNameTwo.java @@ -1,7 +1,7 @@ //non-compiled with javac: Compilable with Java14 package com.puppycrawl.tools.checkstyle.checks.naming; -public class SuppressionXpathRegressionPatternVariableName2 { +public class InputXpathPatternVariableNameTwo { MyClass(Object o1){ if (o1 instanceof String s) { // warning } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java similarity index 71% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java index 236ca74f1a4..cec589978e3 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName1.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameDefault.java @@ -3,6 +3,6 @@ /* Config: default */ -public record SuppressionXpathRecordComponentName1(int _value) { // warn +public record InputXpathRecordComponentNameDefault(int _value) { // warn } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java similarity index 84% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java index a22ff3cd765..4b73fa6978e 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/SuppressionXpathRecordComponentName2.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentname/InputXpathRecordComponentNameFormat.java @@ -4,7 +4,7 @@ /* Config: * format = ^[a-z][a-zA-Z0-9]*$ */ -public class SuppressionXpathRecordComponentName2 { +public class InputXpathRecordComponentNameFormat { public record MyRecord(int _underscoreValue, // ok int otherValue) { } // warn } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java similarity index 79% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java index 63dd71b3c36..a15edbbab34 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber2.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberCustomMax.java @@ -5,6 +5,6 @@ * * max = 1 */ -public class SuppressionXpathRecordComponentNumber2 { +public class InputXpathRecordComponentNumberCustomMax { public record MyRecord(int x, int y) { } // warn } diff --git a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java similarity index 89% rename from src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java rename to src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java index 3ca4490d4d9..09e66c79b38 100644 --- a/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/SuppressionXpathRecordComponentNumber1.java +++ b/src/it/resources-noncompilable/org/checkstyle/suppressionxpathfilter/recordcomponentnumber/InputXpathRecordComponentNumberDefault.java @@ -5,7 +5,7 @@ * * max = 8 */ -public record SuppressionXpathRecordComponentNumber1(int x, int y, int z, // warn +public record InputXpathRecordComponentNumberDefault(int x, int y, int z, // warn int a, int b, int c, int d, int e, int f, int g, int h, int i, diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java index 32add8eb2ed..7d2b328ab1e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -118,14 +118,7 @@ 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 RENAME_INPUT_XPATH = Set.of( - "IllegalIdentifierName", - "IllegalInstantiation", - "PackageAnnotation", - "PackageDeclaration", - "PatternVariableName", - "RecordComponentName", - "RecordComponentNumber"); + private static final Set RENAME_INPUT_XPATH = Set.of(); private Path javaDir; private Path inputDir;