From 571e547a9f7b0a05503b8d76f34181059a8c3bbf Mon Sep 17 00:00:00 2001 From: MANISH-K-07 Date: Tue, 2 Apr 2024 15:06:09 +0100 Subject: [PATCH] Issue #14715: Enforced new naming convention in IT area Nine --- ...XpathRegressionEmptyLineSeparatorTest.java | 20 ++++++++-------- .../XpathRegressionEqualsAvoidNullTest.java | 12 +++++----- .../XpathRegressionEqualsHashCodeTest.java | 24 +++++++++---------- ...hRegressionExplicitInitializationTest.java | 12 +++++----- .../XpathRegressionFallThroughTest.java | 16 ++++++------- .../XpathRegressionFinalClassTest.java | 22 ++++++++--------- ... => InputXpathEmptyLineSeparatorFive.java} | 2 +- ... => InputXpathEmptyLineSeparatorFour.java} | 2 +- ...a => InputXpathEmptyLineSeparatorOne.java} | 0 ...=> InputXpathEmptyLineSeparatorThree.java} | 2 +- ...a => InputXpathEmptyLineSeparatorTwo.java} | 0 ...ll.java => InputXpathEqualsAvoidNull.java} | 2 +- ... InputXpathEqualsAvoidNullIgnoreCase.java} | 2 +- ...> InputXpathEqualsHashCodeEqualsOnly.java} | 2 +- ...InputXpathEqualsHashCodeHashCodeOnly.java} | 2 +- ...> InputXpathEqualsHashCodeNestedCase.java} | 2 +- ...pathExplicitInitializationObjectType.java} | 2 +- ...hExplicitInitializationPrimitiveType.java} | 2 +- ...ughOne.java => InputXpathFallThrough.java} | 2 +- ... => InputXpathFallThroughDefaultCase.java} | 2 +- .../InputXpathFinalClassDefault.java | 7 ++++++ ...va => InputXpathFinalClassInnerClass.java} | 2 +- ...SuppressionXpathRegressionFinalClass1.java | 7 ------ .../internal/XpathRegressionTest.java | 6 ----- 24 files changed, 73 insertions(+), 79 deletions(-) rename src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/{SuppressionXpathRegressionEmptyLineSeparator5.java => InputXpathEmptyLineSeparatorFive.java} (86%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/{SuppressionXpathRegressionEmptyLineSeparator4.java => InputXpathEmptyLineSeparatorFour.java} (84%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/{SuppressionXpathRegressionEmptyLineSeparator1.java => InputXpathEmptyLineSeparatorOne.java} (100%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/{SuppressionXpathRegressionEmptyLineSeparator3.java => InputXpathEmptyLineSeparatorThree.java} (84%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/{SuppressionXpathRegressionEmptyLineSeparator2.java => InputXpathEmptyLineSeparatorTwo.java} (100%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/{SuppressionXpathRegressionEqualsAvoidNull.java => InputXpathEqualsAvoidNull.java} (76%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/{SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java => InputXpathEqualsAvoidNullIgnoreCase.java} (74%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/{SuppressionXpathRegressionEqualsHashCode1.java => InputXpathEqualsHashCodeEqualsOnly.java} (71%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/{SuppressionXpathRegressionEqualsHashCode2.java => InputXpathEqualsHashCodeHashCodeOnly.java} (68%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/{SuppressionXpathRegressionEqualsHashCodeNestedCase.java => InputXpathEqualsHashCodeNestedCase.java} (74%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/{SuppressionXpathRegressionExplicitInitializationTwo.java => InputXpathExplicitInitializationObjectType.java} (66%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/{SuppressionXpathRegressionExplicitInitializationOne.java => InputXpathExplicitInitializationPrimitiveType.java} (60%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/{SuppressionXpathRegressionFallThroughOne.java => InputXpathFallThrough.java} (83%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/{SuppressionXpathRegressionFallThroughTwo.java => InputXpathFallThroughDefaultCase.java} (85%) create mode 100644 src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java rename src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/{SuppressionXpathRegressionFinalClass2.java => InputXpathFinalClassInnerClass.java} (70%) delete mode 100644 src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java index d3337aa8bfb..52c1d88a4f6 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyLineSeparatorTest.java @@ -39,7 +39,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEmptyLineSeparator1.java") + getPath("InputXpathEmptyLineSeparatorOne.java") ); final DefaultConfiguration moduleConfig = @@ -61,7 +61,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEmptyLineSeparator2.java") + getPath("InputXpathEmptyLineSeparatorTwo.java") ); final DefaultConfiguration moduleConfig = @@ -83,7 +83,7 @@ public void testTwo() throws Exception { @Test public void testThree() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEmptyLineSeparator3.java") + getPath("InputXpathEmptyLineSeparatorThree.java") ); final DefaultConfiguration moduleConfig = @@ -97,16 +97,16 @@ public void testThree() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]" + + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]" + + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]" + "/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator3']]" + + "[./IDENT[@text='InputXpathEmptyLineSeparatorThree']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -117,7 +117,7 @@ public void testThree() throws Exception { @Test public void testFour() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEmptyLineSeparator4.java") + getPath("InputXpathEmptyLineSeparatorFour.java") ); final DefaultConfiguration moduleConfig = @@ -131,7 +131,7 @@ public void testFour() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator4']]" + + "[./IDENT[@text='InputXpathEmptyLineSeparatorFour']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/RCURLY" ); @@ -141,7 +141,7 @@ public void testFour() throws Exception { @Test public void testFive() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEmptyLineSeparator5.java") + getPath("InputXpathEmptyLineSeparatorFive.java") ); final DefaultConfiguration moduleConfig = @@ -156,7 +156,7 @@ public void testFive() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionEmptyLineSeparator5']]" + + "[./IDENT[@text='InputXpathEmptyLineSeparatorFive']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo1']]/SLIST/LITERAL_TRY/SLIST" + "/SINGLE_LINE_COMMENT/COMMENT_CONTENT[@text=' warn\\n']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java index 5193b730271..6417509dde8 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsAvoidNullTest.java @@ -40,7 +40,7 @@ protected String getCheckName() { @Test public void testEquals() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEqualsAvoidNull.java")); + getPath("InputXpathEqualsAvoidNull.java")); final DefaultConfiguration moduleConfig = createModuleConfig(clazz); @@ -51,10 +51,10 @@ public void testEquals() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsAvoidNull']]" + + "[@text='InputXpathEqualsAvoidNull']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsAvoidNull']]" + + "[@text='InputXpathEqualsAvoidNull']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR/METHOD_CALL"); runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); @@ -63,7 +63,7 @@ public void testEquals() throws Exception { @Test public void testEqualsIgnoreCase() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java")); + getPath("InputXpathEqualsAvoidNullIgnoreCase.java")); final DefaultConfiguration moduleConfig = createModuleConfig(clazz); @@ -74,10 +74,10 @@ public void testEqualsIgnoreCase() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsAvoidNullIgnoreCase']]" + + "[@text='InputXpathEqualsAvoidNullIgnoreCase']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsAvoidNullIgnoreCase']]" + + "[@text='InputXpathEqualsAvoidNullIgnoreCase']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/SLIST/EXPR/METHOD_CALL"); runVerifications(moduleConfig, fileToProcess, expectedViolation, expectedXpathQueries); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java index 0a270959776..c7def594c13 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEqualsHashCodeTest.java @@ -37,7 +37,7 @@ protected String getCheckName() { @Test public void testEqualsOnly() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEqualsHashCode1.java")); + getPath("InputXpathEqualsHashCodeEqualsOnly.java")); final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class); @@ -48,13 +48,13 @@ public void testEqualsOnly() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode1']]" + + "[@text='InputXpathEqualsHashCodeEqualsOnly']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode1']]/OBJBLOCK/" + + "[@text='InputXpathEqualsHashCodeEqualsOnly']]/OBJBLOCK/" + "METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode1']]/OBJBLOCK/" + + "[@text='InputXpathEqualsHashCodeEqualsOnly']]/OBJBLOCK/" + "METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS/LITERAL_PUBLIC" ); @@ -64,7 +64,7 @@ public void testEqualsOnly() throws Exception { @Test public void testHashCodeOnly() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEqualsHashCode2.java")); + getPath("InputXpathEqualsHashCodeHashCodeOnly.java")); final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class); @@ -75,13 +75,13 @@ public void testHashCodeOnly() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode2']]" + + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode2']]" + + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCode2']]" + + "[@text='InputXpathEqualsHashCodeHashCodeOnly']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='hashCode']]/MODIFIERS/LITERAL_PUBLIC" ); @@ -91,7 +91,7 @@ public void testHashCodeOnly() throws Exception { @Test public void testNestedCase() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionEqualsHashCodeNestedCase.java")); + getPath("InputXpathEqualsHashCodeNestedCase.java")); final DefaultConfiguration moduleConfig = createModuleConfig(EqualsHashCodeCheck.class); @@ -102,15 +102,15 @@ public void testNestedCase() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCodeNestedCase']]" + + "[@text='InputXpathEqualsHashCodeNestedCase']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCodeNestedCase']]" + + "[@text='InputXpathEqualsHashCodeNestedCase']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionEqualsHashCodeNestedCase']]" + + "[@text='InputXpathEqualsHashCodeNestedCase']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='innerClass']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='equals']]" + "/MODIFIERS/LITERAL_PUBLIC" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java index cc60d45a77c..c95696cf7d4 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionExplicitInitializationTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testPrimitiveType() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionExplicitInitializationOne.java")); + new File(getPath("InputXpathExplicitInitializationPrimitiveType.java")); final DefaultConfiguration moduleConfig = createModuleConfig(ExplicitInitializationCheck.class); @@ -52,7 +52,7 @@ public void testOne() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionExplicitInitializationOne']]" + + "[./IDENT[@text='InputXpathExplicitInitializationPrimitiveType']]" + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='a']" ); @@ -61,9 +61,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testObjectType() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionExplicitInitializationTwo.java")); + new File(getPath("InputXpathExplicitInitializationObjectType.java")); final DefaultConfiguration moduleConfig = createModuleConfig(ExplicitInitializationCheck.class); @@ -75,7 +75,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionExplicitInitializationTwo']]" + + "[./IDENT[@text='InputXpathExplicitInitializationObjectType']]" + "/OBJBLOCK/VARIABLE_DEF/IDENT[@text='bar']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java index c9da5949858..592814097e4 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFallThroughTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testFallThrough() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionFallThroughOne.java")); + new File(getPath("InputXpathFallThrough.java")); final DefaultConfiguration moduleConfig = createModuleConfig(FallThroughCheck.class); @@ -51,11 +51,11 @@ public void testOne() throws Exception { }; final List expectedXpathQueries = Arrays.asList( - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughOne']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThrough']]" + "/OBJBLOCK" + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP[" + "./LITERAL_CASE/EXPR/NUM_INT[@text='2']]", - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughOne']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThrough']]" + "/OBJBLOCK" + "/METHOD_DEF[./IDENT[@text='test']]/SLIST/LITERAL_SWITCH/CASE_GROUP/LITERAL_CASE" ); @@ -65,9 +65,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testDefaultCase() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionFallThroughTwo.java")); + new File(getPath("InputXpathFallThroughDefaultCase.java")); final DefaultConfiguration moduleConfig = createModuleConfig(FallThroughCheck.class); @@ -79,11 +79,11 @@ public void testTwo() throws Exception { }; final List expectedXpathQueries = Arrays.asList( - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughTwo']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThroughDefaultCase']]" + "/OBJBLOCK/METHOD_DEF[" + "./IDENT[@text='methodFallThruCustomWords']]/SLIST/LITERAL_WHILE/SLIST" + "/LITERAL_SWITCH/CASE_GROUP[./SLIST/EXPR/POST_INC/IDENT[@text='i']]", - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionFallThroughTwo']]" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathFallThroughDefaultCase']]" + "/OBJBLOCK/METHOD_DEF[" + "./IDENT[@text='methodFallThruCustomWords']]/SLIST/LITERAL_WHILE/SLIST" + "/LITERAL_SWITCH/CASE_GROUP/LITERAL_DEFAULT" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java index 9c8336fcc7c..98373ba9592 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionFinalClassTest.java @@ -37,25 +37,25 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testDefault() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionFinalClass1.java")); + "InputXpathFinalClassDefault.java")); final DefaultConfiguration moduleConfig = createModuleConfig(FinalClassCheck.class); final String[] expectedViolation = { "3:1: " + getCheckMessage(FinalClassCheck.class, - FinalClassCheck.MSG_KEY, "SuppressionXpathRegressionFinalClass1"), + FinalClassCheck.MSG_KEY, "InputXpathFinalClassDefault"), }; final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass1']]", + + "@text='InputXpathFinalClassDefault']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass1']]/MODIFIERS", + + "@text='InputXpathFinalClassDefault']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass1']]/MODIFIERS/LITERAL_PUBLIC" + + "@text='InputXpathFinalClassDefault']]/MODIFIERS/LITERAL_PUBLIC" ); runVerifications(moduleConfig, fileToProcess, expectedViolation, @@ -63,9 +63,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testInnerClass() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionFinalClass2.java")); + "InputXpathFinalClassInnerClass.java")); final DefaultConfiguration moduleConfig = createModuleConfig(FinalClassCheck.class); @@ -77,13 +77,13 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass2']]" + + "@text='InputXpathFinalClassInnerClass']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass2']]" + + "@text='InputXpathFinalClassInnerClass']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionFinalClass2']]" + + "@text='InputXpathFinalClassInnerClass']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Test']]/LITERAL_CLASS" ); diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java similarity index 86% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java index 38086505d84..cc9486393f5 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator5.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFive.java @@ -2,7 +2,7 @@ import java.io.IOException; -public class SuppressionXpathRegressionEmptyLineSeparator5 { +public class InputXpathEmptyLineSeparatorFive { int foo1() throws Exception { int a = 1; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java similarity index 84% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java index 6a23443ad00..9ebe69cf295 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator4.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorFour.java @@ -4,7 +4,7 @@ package org.checkstyle.suppressionxpathfilter.emptylineseparator; -class SuppressionXpathRegressionEmptyLineSeparator4 { +class InputXpathEmptyLineSeparatorFour { public static final int FOO_CONST = 1; public void foo() {} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorOne.java similarity index 100% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator1.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorOne.java diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java similarity index 84% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java index 84616eb5f39..f2beb9314cf 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator3.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorThree.java @@ -3,7 +3,7 @@ /////////////////////////////////////////////////// package org.checkstyle.suppressionxpathfilter.emptylineseparator; import java.io.*; -class SuppressionXpathRegressionEmptyLineSeparator3 { +class InputXpathEmptyLineSeparatorThree { public static final int FOO_CONST = 1; public void foo() {} public void foo1() {} // warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorTwo.java similarity index 100% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/SuppressionXpathRegressionEmptyLineSeparator2.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/emptylineseparator/InputXpathEmptyLineSeparatorTwo.java diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java similarity index 76% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java index 551cecbfc48..1e7c41945d6 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNull.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNull.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.equalsavoidnull; -public class SuppressionXpathRegressionEqualsAvoidNull { +public class InputXpathEqualsAvoidNull { public void test() { String nullString = null; nullString.equals("Another string"); //warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java similarity index 74% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java index 892fcb79a27..a6762b01f47 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/SuppressionXpathRegressionEqualsAvoidNullIgnoreCase.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalsavoidnull/InputXpathEqualsAvoidNullIgnoreCase.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.equalsavoidnull; -public class SuppressionXpathRegressionEqualsAvoidNullIgnoreCase { +public class InputXpathEqualsAvoidNullIgnoreCase { public void test() { String nullString = null; nullString.equalsIgnoreCase("Another string"); //warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java similarity index 71% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode1.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java index bbf575f9739..f18f089bd3e 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode1.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeEqualsOnly.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.equalshashcode; -public class SuppressionXpathRegressionEqualsHashCode1 { +public class InputXpathEqualsHashCodeEqualsOnly { public boolean equals(Object obj) { // warn return false; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java similarity index 68% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode2.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java index 58e36b9162a..377992f1472 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCode2.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeHashCodeOnly.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.equalshashcode; -public class SuppressionXpathRegressionEqualsHashCode2 { +public class InputXpathEqualsHashCodeHashCodeOnly { public int hashCode() { // warn return 0; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCodeNestedCase.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java similarity index 74% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCodeNestedCase.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java index 149378a9a67..69b2c7b6403 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/SuppressionXpathRegressionEqualsHashCodeNestedCase.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/equalshashcode/InputXpathEqualsHashCodeNestedCase.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.equalshashcode; -public class SuppressionXpathRegressionEqualsHashCodeNestedCase { +public class InputXpathEqualsHashCodeNestedCase { public static class innerClass { public boolean equals(Object obj) { // warn return false; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java similarity index 66% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java index 2576ccdec13..47b032e5cc4 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationObjectType.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.explicitinitialization; -public class SuppressionXpathRegressionExplicitInitializationTwo { +public class InputXpathExplicitInitializationObjectType { private int a; private Object bar = null; //warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java similarity index 60% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java index 8fff9736304..508b9debe19 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/SuppressionXpathRegressionExplicitInitializationOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/explicitinitialization/InputXpathExplicitInitializationPrimitiveType.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.explicitinitialization; -public class SuppressionXpathRegressionExplicitInitializationOne { +public class InputXpathExplicitInitializationPrimitiveType { private int a = 0; //warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java similarity index 83% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java index 8fa1f7cb6c5..90b245bb840 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThrough.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.fallthrough; -public class SuppressionXpathRegressionFallThroughOne { +public class InputXpathFallThrough { public void test() { int id = 0; switch (id) { diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java similarity index 85% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java index 69bcf349797..57e60f0b97d 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/SuppressionXpathRegressionFallThroughTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/fallthrough/InputXpathFallThroughDefaultCase.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.fallthrough; -public class SuppressionXpathRegressionFallThroughTwo { +public class InputXpathFallThroughDefaultCase { void methodFallThruCustomWords(int i, int j, boolean cond) { while (true) { switch (i){ diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java new file mode 100644 index 00000000000..2295ed6e864 --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassDefault.java @@ -0,0 +1,7 @@ +package org.checkstyle.suppressionxpathfilter.finalclass; + +public class InputXpathFinalClassDefault { // warn + private InputXpathFinalClassDefault() { + + } +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java similarity index 70% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java index 36ac58ec39d..a86934321b3 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass2.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/InputXpathFinalClassInnerClass.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.finalclass; -public class SuppressionXpathRegressionFinalClass2 { +public class InputXpathFinalClassInnerClass { class Test { // warn private Test(){ diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java deleted file mode 100644 index be192f9e2b3..00000000000 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/finalclass/SuppressionXpathRegressionFinalClass1.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.checkstyle.suppressionxpathfilter.finalclass; - -public class SuppressionXpathRegressionFinalClass1 { // warn - private SuppressionXpathRegressionFinalClass1() { - - } -} 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 ba531948424..23cb4b1c213 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -125,12 +125,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "CovariantEquals", "CustomImportOrder", "CyclomaticComplexity", - "EmptyLineSeparator", - "EqualsAvoidNull", - "EqualsHashCode", - "ExplicitInitialization", - "FallThrough", - "FinalClass", "FinalLocalVariable", "FinalParameters", "IllegalThrows",