From 341cb5e207ccdb004a5b15e6749a92fdd5a506b2 Mon Sep 17 00:00:00 2001 From: MANISH-K-07 Date: Thu, 28 Mar 2024 17:53:19 +0100 Subject: [PATCH] Issue #14715: Enforced new naming convention in IT area Two --- ...ionAvoidDoubleBraceInitializationTest.java | 16 +++++----- ...sionAvoidEscapedUnicodeCharactersTest.java | 30 +++++++++---------- ...RegressionAvoidInlineConditionalsTest.java | 16 +++++----- .../XpathRegressionAvoidNestedBlocksTest.java | 28 ++++++++--------- ...DoubleBraceInitializationClassFields.java} | 2 +- ...idDoubleBraceInitializationMethodDef.java} | 2 +- ...idEscapedUnicodeCharactersAllEscaped.java} | 2 +- ...edUnicodeCharactersControlCharacters.java} | 2 +- ...AvoidEscapedUnicodeCharactersDefault.java} | 2 +- ...EscapedUnicodeCharactersNonPrintable.java} | 2 +- ...dEscapedUnicodeCharactersTailComment.java} | 2 +- ...utXpathAvoidInlineConditionalsAssert.java} | 2 +- ...utXpathAvoidInlineConditionalsAssign.java} | 2 +- ...thAvoidInlineConditionalsVariableDef.java} | 2 +- ...AvoidNestedBlocksAllowedInSwitchCase.java} | 2 +- ...utXpathAvoidNestedBlocksBreakOutside.java} | 2 +- ... => InputXpathAvoidNestedBlocksEmpty.java} | 2 +- ...idNestedBlocksNotAllowedInSwitchCase.java} | 2 +- ... InputXpathAvoidNestedBlocksVariable.java} | 2 +- .../internal/XpathRegressionTest.java | 4 --- 20 files changed, 60 insertions(+), 64 deletions(-) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/{SuppressionXpathRegressionAvoidDoubleBraceInitialization.java => InputXpathAvoidDoubleBraceInitializationClassFields.java} (70%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/{SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java => InputXpathAvoidDoubleBraceInitializationMethodDef.java} (79%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/{SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java => InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java} (69%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/{SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java => InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java} (68%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/{SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java => InputXpathAvoidEscapedUnicodeCharactersDefault.java} (63%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/{SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java => InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java} (69%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/{SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java => InputXpathAvoidEscapedUnicodeCharactersTailComment.java} (70%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/{SuppressionXpathRegressionAvoidInlineConditionalsAssert.java => InputXpathAvoidInlineConditionalsAssert.java} (79%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/{SuppressionXpathRegressionAvoidInlineConditionalsAssign.java => InputXpathAvoidInlineConditionalsAssign.java} (73%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/{SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java => InputXpathAvoidInlineConditionalsVariableDef.java} (73%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/{SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase.java => InputXpathAvoidNestedBlocksAllowedInSwitchCase.java} (87%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/{SuppressionXpathRegressionAvoidNestedBlocksBreakOutside.java => InputXpathAvoidNestedBlocksBreakOutside.java} (84%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/{SuppressionXpathRegressionAvoidNestedBlocksEmpty.java => InputXpathAvoidNestedBlocksEmpty.java} (63%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/{SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase.java => InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java} (82%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/{SuppressionXpathRegressionAvoidNestedBlocksVariable.java => InputXpathAvoidNestedBlocksVariable.java} (73%) diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java index 64f32eb3929..ceb996630c2 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidDoubleBraceInitializationTest.java @@ -39,9 +39,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testClassFields() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidDoubleBraceInitialization.java")); + getPath("InputXpathAvoidDoubleBraceInitializationClassFields.java")); final DefaultConfiguration moduleConfig = createModuleConfig(clazz); @@ -51,11 +51,11 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidDoubleBraceInitialization']]" + + "[./IDENT[@text='InputXpathAvoidDoubleBraceInitializationClassFields']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='list']]/ASSIGN/EXPR/" + "LITERAL_NEW[./IDENT[@text='ArrayList']]/OBJBLOCK", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidDoubleBraceInitialization']]" + + "[./IDENT[@text='InputXpathAvoidDoubleBraceInitializationClassFields']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='list']]/ASSIGN/EXPR/" + "LITERAL_NEW[./IDENT[@text='ArrayList']]/OBJBLOCK/LCURLY" ); @@ -64,9 +64,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testMethodDef() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java")); + getPath("InputXpathAvoidDoubleBraceInitializationMethodDef.java")); final DefaultConfiguration moduleConfig = createModuleConfig(clazz); @@ -76,12 +76,12 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text=" - + "'SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo']]" + + "'InputXpathAvoidDoubleBraceInitializationMethodDef']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]" + "/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='HashSet']]" + "/OBJBLOCK", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text=" - + "'SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo']]" + + "'InputXpathAvoidDoubleBraceInitializationMethodDef']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]" + "/SLIST/EXPR/LITERAL_NEW[./IDENT[@text='HashSet']]" + "/OBJBLOCK/LCURLY" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java index 8a717c58c3f..56bec5bc969 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidEscapedUnicodeCharactersTest.java @@ -41,7 +41,7 @@ protected String getCheckName() { @Test public void testDefault() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java")); + "InputXpathAvoidEscapedUnicodeCharactersDefault.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class); @@ -52,11 +52,11 @@ public void testDefault() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault']]" + + "[@text='InputXpathAvoidEscapedUnicodeCharactersDefault']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev2']]" + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault']]" + + "[@text='InputXpathAvoidEscapedUnicodeCharactersDefault']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev2']]" + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']" ); @@ -68,7 +68,7 @@ public void testDefault() throws Exception { @Test public void testControlCharacters() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java") + "InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java") ); final DefaultConfiguration moduleConfig = @@ -82,12 +82,12 @@ public void testControlCharacters() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters']]" + + "'InputXpathAvoidEscapedUnicodeCharactersControlCharacters']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]", "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters']]" + + "'InputXpathAvoidEscapedUnicodeCharactersControlCharacters']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']" ); @@ -99,7 +99,7 @@ public void testControlCharacters() throws Exception { @Test public void testTailComment() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java")); + "InputXpathAvoidEscapedUnicodeCharactersTailComment.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class); @@ -112,12 +112,12 @@ public void testTailComment() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment']]" + + "'InputXpathAvoidEscapedUnicodeCharactersTailComment']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]", "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment']]" + + "'InputXpathAvoidEscapedUnicodeCharactersTailComment']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']" ); @@ -129,7 +129,7 @@ public void testTailComment() throws Exception { @Test public void testAllCharactersEscaped() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java")); + "InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class); @@ -142,12 +142,12 @@ public void testAllCharactersEscaped() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped']]" + + "'InputXpathAvoidEscapedUnicodeCharactersAllEscaped']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]", "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped']]" + + "'InputXpathAvoidEscapedUnicodeCharactersAllEscaped']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']" ); @@ -159,7 +159,7 @@ public void testAllCharactersEscaped() throws Exception { @Test public void testNonPrintableCharacters() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java")); + "InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidEscapedUnicodeCharactersCheck.class); @@ -172,12 +172,12 @@ public void testNonPrintableCharacters() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable']]" + + "'InputXpathAvoidEscapedUnicodeCharactersNonPrintable']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR[./STRING_LITERAL[@text='\\u03bcs']]", "/COMPILATION_UNIT/CLASS_DEF[." + "/IDENT[@text=" - + "'SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable']]" + + "'InputXpathAvoidEscapedUnicodeCharactersNonPrintable']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='unitAbbrev9']]" + "/ASSIGN/EXPR/STRING_LITERAL[@text='\\u03bcs']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java index 95104903891..da04e7a6bd8 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidInlineConditionalsTest.java @@ -39,7 +39,7 @@ protected String getCheckName() { @Test public void testInlineConditionalsVariableDef() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java")); + getPath("InputXpathAvoidInlineConditionalsVariableDef.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidInlineConditionalsCheck.class); @@ -51,11 +51,11 @@ public void testInlineConditionalsVariableDef() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='" - + "SuppressionXpathRegressionAvoidInlineConditionalsVariableDef']]" + + "InputXpathAvoidInlineConditionalsVariableDef']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='substring']]/SLIST" + "/VARIABLE_DEF[./IDENT[@text='b']]/ASSIGN/EXPR", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='" - + "SuppressionXpathRegressionAvoidInlineConditionalsVariableDef']]" + + "InputXpathAvoidInlineConditionalsVariableDef']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='substring']]/SLIST" + "/VARIABLE_DEF[./IDENT[@text='b']]/ASSIGN/EXPR/QUESTION" ); @@ -67,7 +67,7 @@ public void testInlineConditionalsVariableDef() throws Exception { @Test public void testInlineConditionalsAssign() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidInlineConditionalsAssign.java")); + getPath("InputXpathAvoidInlineConditionalsAssign.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidInlineConditionalsCheck.class); @@ -79,7 +79,7 @@ public void testInlineConditionalsAssign() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='" - + "SuppressionXpathRegressionAvoidInlineConditionalsAssign']]" + + "InputXpathAvoidInlineConditionalsAssign']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setB']]/SLIST" + "/EXPR/ASSIGN[./IDENT[@text='b']]/QUESTION" ); @@ -91,7 +91,7 @@ public void testInlineConditionalsAssign() throws Exception { @Test public void testInlineConditionalsAssert() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidInlineConditionalsAssert.java")); + getPath("InputXpathAvoidInlineConditionalsAssert.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidInlineConditionalsCheck.class); @@ -103,11 +103,11 @@ public void testInlineConditionalsAssert() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='" - + "SuppressionXpathRegressionAvoidInlineConditionalsAssert']]" + + "InputXpathAvoidInlineConditionalsAssert']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='assertA']]/SLIST" + "/LITERAL_ASSERT/EXPR[./QUESTION/METHOD_CALL/DOT/IDENT[@text='a']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='" - + "SuppressionXpathRegressionAvoidInlineConditionalsAssert']]" + + "InputXpathAvoidInlineConditionalsAssert']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='assertA']]/SLIST" + "/LITERAL_ASSERT/EXPR/QUESTION" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java index ae1208aa873..e14606d97ef 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAvoidNestedBlocksTest.java @@ -39,7 +39,7 @@ protected String getCheckName() { @Test public void testEmpty() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidNestedBlocksEmpty.java")); + getPath("InputXpathAvoidNestedBlocksEmpty.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidNestedBlocksCheck.class); @@ -51,7 +51,7 @@ public void testEmpty() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksEmpty']]" + + "[./IDENT[@text='InputXpathAvoidNestedBlocksEmpty']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='empty']]/SLIST/SLIST" ); @@ -62,7 +62,7 @@ public void testEmpty() throws Exception { @Test public void testVariableAssignment() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidNestedBlocksVariable.java")); + getPath("InputXpathAvoidNestedBlocksVariable.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidNestedBlocksCheck.class); @@ -74,7 +74,7 @@ public void testVariableAssignment() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidNestedBlocksVariable']]" + + "[./IDENT[@text='InputXpathAvoidNestedBlocksVariable']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='varAssign']]/SLIST/SLIST" ); @@ -85,7 +85,7 @@ public void testVariableAssignment() throws Exception { @Test public void testSwitchAllowInSwitchCaseFalse() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase.java")); + "InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidNestedBlocksCheck.class); @@ -97,12 +97,12 @@ public void testSwitchAllowInSwitchCaseFalse() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidNested" - + "BlocksNotAllowedInSwitchCase']]/OBJBLOCK/METHOD_DEF" + + "[./IDENT[@text='InputXpathAvoidNestedBlocksNotAllowedInSwitchCase" + + "']]/OBJBLOCK/METHOD_DEF" + "[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionAvoidNested" - + "BlocksNotAllowedInSwitchCase']]/OBJBLOCK/METHOD_DEF" + + "[./IDENT[@text='InputXpathAvoidNestedBlocksNotAllowedInSwitchCase" + + "']]/OBJBLOCK/METHOD_DEF" + "[./IDENT[@text='s']]/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST" ); @@ -113,7 +113,7 @@ public void testSwitchAllowInSwitchCaseFalse() throws Exception { @Test public void testSwitchAllowInSwitchCaseTrue() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase.java")); + getPath("InputXpathAvoidNestedBlocksAllowedInSwitchCase.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidNestedBlocksCheck.class); @@ -126,7 +126,7 @@ public void testSwitchAllowInSwitchCaseTrue() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase" + + "[@text='InputXpathAvoidNestedBlocksAllowedInSwitchCase" + "']]/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]" + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST" ); @@ -138,7 +138,7 @@ public void testSwitchAllowInSwitchCaseTrue() throws Exception { @Test public void testSwitchWithBreakOutside() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionAvoidNestedBlocksBreakOutside.java")); + getPath("InputXpathAvoidNestedBlocksBreakOutside.java")); final DefaultConfiguration moduleConfig = createModuleConfig(AvoidNestedBlocksCheck.class); @@ -150,11 +150,11 @@ public void testSwitchWithBreakOutside() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionAvoidNestedBlocksBreakOutside']]" + + "[@text='InputXpathAvoidNestedBlocksBreakOutside']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]" + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionAvoidNestedBlocksBreakOutside']]" + + "[@text='InputXpathAvoidNestedBlocksBreakOutside']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='s']]" + "/SLIST/LITERAL_SWITCH/CASE_GROUP/SLIST/SLIST" ); diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java similarity index 70% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java index ed128f0141b..c7f1366fe0d 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitialization.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationClassFields.java @@ -2,7 +2,7 @@ import java.util.*; -public class SuppressionXpathRegressionAvoidDoubleBraceInitialization { +public class InputXpathAvoidDoubleBraceInitializationClassFields { List list = new ArrayList() { //warn {} }; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java similarity index 79% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java index 44cce2d161e..dc9588336c0 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoiddoublebraceinitialization/InputXpathAvoidDoubleBraceInitializationMethodDef.java @@ -2,7 +2,7 @@ import java.util.HashSet; -public class SuppressionXpathRegressionAvoidDoubleBraceInitializationTwo { +public class InputXpathAvoidDoubleBraceInitializationMethodDef { public void test() { new HashSet() {{ /** warn */ add("foo"); diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java similarity index 69% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java index b3ba68b1ab6..b5fa7ef1ce3 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersAllEscaped.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters; -public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersAllEscaped { +public class InputXpathAvoidEscapedUnicodeCharactersAllEscaped { private String unitAbbrev9 = "\u03bcs"; /* warn */ String allCharactersEscaped = "\u03bc\u03bc"; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java similarity index 68% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java index 2077c0f0476..86ef0415927 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersControlCharacters.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters; -public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersControlCharacters { +public class InputXpathAvoidEscapedUnicodeCharactersControlCharacters { private String unitAbbrev9 = "\u03bcs"; /* warn */ private String nonPrintableCharacter = "\u0008"; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java similarity index 63% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java index 44f22770de0..2d476fd06e6 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersDefault.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters; -public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersDefault { +public class InputXpathAvoidEscapedUnicodeCharactersDefault { private String unitAbbrev2 = "\u03bcs"; /* warn */ } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java similarity index 69% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java index 1802a76b5eb..069598675a3 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersNonPrintable.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters; -public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersNonPrintable { +public class InputXpathAvoidEscapedUnicodeCharactersNonPrintable { private String unitAbbrev9 = "\u03bcs"; /* warn */ private String nonPrintableCharacter = "\ufeff"; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java similarity index 70% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java index c1a75705c4f..f31f7264570 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidescapedunicodecharacters/InputXpathAvoidEscapedUnicodeCharactersTailComment.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidescapedunicodecharacters; -public class SuppressionXpathRegressionAvoidEscapedUnicodeCharactersTailComment { +public class InputXpathAvoidEscapedUnicodeCharactersTailComment { /* warn */ private String unitAbbrev9 = "\u03bcs"; String unitAbbrev = "\u03bcs"; // Greek letter mu, "s" } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java similarity index 79% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java index ffe5aacf788..a1f1d82e1fa 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssert.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssert.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals; -public class SuppressionXpathRegressionAvoidInlineConditionalsAssert { +public class InputXpathAvoidInlineConditionalsAssert { void assertA(String a) { // JLS ยง14.10 - The assert Statement diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java similarity index 73% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java index 9e60848ecfe..49ec1783c58 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsAssign.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsAssign.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals; -public class SuppressionXpathRegressionAvoidInlineConditionalsAssign { +public class InputXpathAvoidInlineConditionalsAssign { String b; void setB(String a) { diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java similarity index 73% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java index 0771f55b30a..a44da170dba 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/SuppressionXpathRegressionAvoidInlineConditionalsVariableDef.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidinlineconditionals/InputXpathAvoidInlineConditionalsVariableDef.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidinlineconditionals; -public class SuppressionXpathRegressionAvoidInlineConditionalsVariableDef { +public class InputXpathAvoidInlineConditionalsVariableDef { String substring(String a) { String b = (a == null || a.length() < 1) ? null : a.substring(1); // warn return b; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java similarity index 87% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java index 789b8ee73e6..ef81149e29a 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksAllowedInSwitchCase.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidnestedblocks; -public class SuppressionXpathRegressionAvoidNestedBlocksAllowedInSwitchCase { +public class InputXpathAvoidNestedBlocksAllowedInSwitchCase { int s(int a) { int x; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksBreakOutside.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java similarity index 84% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksBreakOutside.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java index 610abd2964a..820fef6fe29 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksBreakOutside.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksBreakOutside.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidnestedblocks; -public class SuppressionXpathRegressionAvoidNestedBlocksBreakOutside { +public class InputXpathAvoidNestedBlocksBreakOutside { int s(int a) { int x; int y; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java similarity index 63% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java index eacd47e4b8c..be16427fb09 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksEmpty.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksEmpty.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidnestedblocks; -public class SuppressionXpathRegressionAvoidNestedBlocksEmpty { +public class InputXpathAvoidNestedBlocksEmpty { void empty() { {} // warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java similarity index 82% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java index eda3e420810..3d4f571418b 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksNotAllowedInSwitchCase.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidnestedblocks; -public class SuppressionXpathRegressionAvoidNestedBlocksNotAllowedInSwitchCase { +public class InputXpathAvoidNestedBlocksNotAllowedInSwitchCase { int s(int a) { int x; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java similarity index 73% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java index 67aabc6794f..09ff5c51da5 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/SuppressionXpathRegressionAvoidNestedBlocksVariable.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/avoidnestedblocks/InputXpathAvoidNestedBlocksVariable.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.avoidnestedblocks; -public class SuppressionXpathRegressionAvoidNestedBlocksVariable { +public class InputXpathAvoidNestedBlocksVariable { void varAssign() { int whichIsWhich = 0; 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 4caf7953784..56f6bf4f445 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -119,10 +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 RENAME_INPUT_XPATH = Set.of( - "AvoidDoubleBraceInitialization", - "AvoidEscapedUnicodeCharacters", - "AvoidInlineConditionals", - "AvoidNestedBlocks", "AvoidNoArgumentSuperConstructorCall", "AvoidStarImport", "AvoidStaticImport",