From aef4a32f0da172ef3fc56a17891c53fccfeb7708 Mon Sep 17 00:00:00 2001 From: MANISH-K-07 Date: Fri, 29 Mar 2024 08:49:55 +0100 Subject: [PATCH] Issue #14715: Enforced new naming convention in IT area Five --- .../XpathRegressionJavaNCSSTest.java | 18 +++++------ ...hRegressionJavadocContentLocationTest.java | 8 ++--- .../XpathRegressionJavadocMethodTest.java | 26 ++++++++-------- .../XpathRegressionJavadocTypeTest.java | 30 +++++++++---------- .../XpathRegressionJavadocVariableTest.java | 20 ++++++------- ... InputXpathJavadocContentLocationOne.java} | 2 +- ... InputXpathJavadocContentLocationTwo.java} | 2 +- ....java => InputXpathJavadocMethodFive.java} | 2 +- ....java => InputXpathJavadocMethodFour.java} | 2 +- ...e.java => InputXpathJavadocMethodOne.java} | 2 +- ...java => InputXpathJavadocMethodThree.java} | 2 +- ...o.java => InputXpathJavadocMethodTwo.java} | 2 +- ...a => InputXpathJavadocTypeIncomplete.java} | 2 +- ...a => InputXpathJavadocTypeMissingTag.java} | 2 +- ... => InputXpathJavadocTypeWrongFormat.java} | 2 +- ...XpathJavadocVariableInnerClassFields.java} | 2 +- ...athJavadocVariablePrivateClassFields.java} | 2 +- ...CSSOne.java => InputXpathJavaNCSSOne.java} | 2 +- ...hree.java => InputXpathJavaNCSSThree.java} | 2 +- ...CSSTwo.java => InputXpathJavaNCSSTwo.java} | 2 +- .../internal/XpathRegressionTest.java | 5 ---- 21 files changed, 66 insertions(+), 71 deletions(-) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/{SuppressionXpathRegressionJavadocContentLocationOne.java => InputXpathJavadocContentLocationOne.java} (63%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/{SuppressionXpathRegressionJavadocContentLocationTwo.java => InputXpathJavadocContentLocationTwo.java} (64%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/{SuppressionXpathRegressionJavadocMethodFive.java => InputXpathJavadocMethodFive.java} (80%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/{SuppressionXpathRegressionJavadocMethodFour.java => InputXpathJavadocMethodFour.java} (77%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/{SuppressionXpathRegressionJavadocMethodOne.java => InputXpathJavadocMethodOne.java} (84%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/{SuppressionXpathRegressionJavadocMethodThree.java => InputXpathJavadocMethodThree.java} (82%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/{SuppressionXpathRegressionJavadocMethodTwo.java => InputXpathJavadocMethodTwo.java} (79%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/{SuppressionXpathRegressionJavadocTypeThree.java => InputXpathJavadocTypeIncomplete.java} (62%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/{SuppressionXpathRegressionJavadocTypeOne.java => InputXpathJavadocTypeMissingTag.java} (60%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/{SuppressionXpathRegressionJavadocTypeTwo.java => InputXpathJavadocTypeWrongFormat.java} (66%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/{SuppressionXpathRegressionJavadocVariableTwo.java => InputXpathJavadocVariableInnerClassFields.java} (68%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/{SuppressionXpathRegressionJavadocVariableOne.java => InputXpathJavadocVariablePrivateClassFields.java} (71%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/{SuppressionXpathRegressionJavaNCSSOne.java => InputXpathJavaNCSSOne.java} (96%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/{SuppressionXpathRegressionJavaNCSSThree.java => InputXpathJavaNCSSThree.java} (94%) rename src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/{SuppressionXpathRegressionJavaNCSSTwo.java => InputXpathJavaNCSSTwo.java} (94%) diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java index 1a7c793e5ed..441af676ead 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavaNCSSTest.java @@ -40,7 +40,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavaNCSSOne.java")); + new File(getPath("InputXpathJavaNCSSOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavaNCSSCheck.class); @@ -52,15 +52,15 @@ public void testOne() throws Exception { final List expectedXpathQueries = List.of( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSOne']]" + + "[./IDENT[@text='InputXpathJavaNCSSOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSOne']]" + + "[./IDENT[@text='InputXpathJavaNCSSOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSOne']]" + + "[./IDENT[@text='InputXpathJavaNCSSOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/MODIFIERS/LITERAL_PUBLIC" ); @@ -70,7 +70,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavaNCSSTwo.java")); + new File(getPath("InputXpathJavaNCSSTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavaNCSSCheck.class); @@ -84,13 +84,13 @@ public void testTwo() throws Exception { final List expectedXpathQueries = List.of( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSTwo']]", + + "[./IDENT[@text='InputXpathJavaNCSSTwo']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSTwo']]/MODIFIERS", + + "[./IDENT[@text='InputXpathJavaNCSSTwo']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavaNCSSTwo']]" + + "[./IDENT[@text='InputXpathJavaNCSSTwo']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -100,7 +100,7 @@ public void testTwo() throws Exception { @Test public void testThree() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavaNCSSThree.java")); + new File(getPath("InputXpathJavaNCSSThree.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavaNCSSCheck.class); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java index 25456ab7b98..fc1f8fea74c 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocContentLocationTest.java @@ -40,7 +40,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocContentLocationOne.java")); + new File(getPath("InputXpathJavadocContentLocationOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocContentLocationCheck.class); @@ -52,7 +52,7 @@ public void testOne() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/INTERFACE_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocContentLocationOne']]" + + "[./IDENT[@text='InputXpathJavadocContentLocationOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/BLOCK_COMMENT_BEGIN" + "[./COMMENT_CONTENT[@text='* Text. // warn\\n ']]" ); @@ -64,7 +64,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocContentLocationTwo.java")); + new File(getPath("InputXpathJavadocContentLocationTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocContentLocationCheck.class); @@ -78,7 +78,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionJavadocContentLocationTwo']]" + + "[@text='InputXpathJavadocContentLocationTwo']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='test']]/TYPE/BLOCK_COMMENT_BEGIN" + "[./COMMENT_CONTENT[@text='*\\n * Text.\\n ']]" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java index 7ccf1741e4c..0f22c8da1e8 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocMethodTest.java @@ -44,7 +44,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocMethodOne.java")); + new File(getPath("InputXpathJavadocMethodOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocMethodCheck.class); @@ -55,13 +55,13 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]" + + "[./IDENT[@text='InputXpathJavadocMethodOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]" + + "[./IDENT[@text='InputXpathJavadocMethodOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodOne']]" + + "[./IDENT[@text='InputXpathJavadocMethodOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='uninheritableMethod']]/MODIFIERS" + "/LITERAL_PRIVATE"); @@ -72,7 +72,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocMethodTwo.java")); + new File(getPath("InputXpathJavadocMethodTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocMethodCheck.class); @@ -84,7 +84,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodTwo']]" + + "[./IDENT[@text='InputXpathJavadocMethodTwo']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkParam']]/PARAMETERS" + "/PARAMETER_DEF/IDENT[@text='x']"); @@ -95,7 +95,7 @@ public void testTwo() throws Exception { @Test public void testThree() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocMethodThree.java")); + new File(getPath("InputXpathJavadocMethodThree.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocMethodCheck.class); @@ -107,11 +107,11 @@ public void testThree() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodThree']]" + + "[./IDENT[@text='InputXpathJavadocMethodThree']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkTypeParam']]/TYPE_PARAMETERS" + "/TYPE_PARAMETER[./IDENT[@text='T']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodThree']]" + + "[./IDENT[@text='InputXpathJavadocMethodThree']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='checkTypeParam']]/TYPE_PARAMETERS" + "/TYPE_PARAMETER/IDENT[@text='T']"); @@ -122,7 +122,7 @@ public void testThree() throws Exception { @Test public void testFour() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocMethodFour.java")); + new File(getPath("InputXpathJavadocMethodFour.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocMethodCheck.class); @@ -136,7 +136,7 @@ public void testFour() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodFour']]" + + "[./IDENT[@text='InputXpathJavadocMethodFour']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]" + "/LITERAL_THROWS/IDENT[@text='Exception']"); @@ -147,7 +147,7 @@ public void testFour() throws Exception { @Test public void testFive() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocMethodFive.java")); + new File(getPath("InputXpathJavadocMethodFive.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocMethodCheck.class); @@ -161,7 +161,7 @@ public void testFive() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocMethodFive']]" + + "[./IDENT[@text='InputXpathJavadocMethodFive']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='bar']]/SLIST" + "/LITERAL_THROW/EXPR/LITERAL_NEW" + "/DOT[./IDENT[@text='BuildException']]" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java index f8f9ec4dcc9..f09b0d1798c 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocTypeTest.java @@ -42,9 +42,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testMissingTag() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocTypeOne.java")); + new File(getPath("InputXpathJavadocTypeMissingTag.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocTypeCheck.class); @@ -58,12 +58,12 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]", + + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]" + + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]" + "/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeOne']]" + + "[./IDENT[@text='InputXpathJavadocTypeMissingTag']]" + "/MODIFIERS/LITERAL_PUBLIC"); runVerifications(moduleConfig, fileToProcess, expectedViolation, @@ -71,9 +71,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testWrongFormat() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocTypeTwo.java")); + new File(getPath("InputXpathJavadocTypeWrongFormat.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocTypeCheck.class); @@ -87,11 +87,11 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]", + + "[@text='InputXpathJavadocTypeWrongFormat']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]/MODIFIERS", + + "[@text='InputXpathJavadocTypeWrongFormat']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionJavadocTypeTwo']]" + + "[@text='InputXpathJavadocTypeWrongFormat']]" + "/MODIFIERS/LITERAL_PUBLIC"); runVerifications(moduleConfig, fileToProcess, expectedViolation, @@ -99,9 +99,9 @@ public void testTwo() throws Exception { } @Test - public void testThree() throws Exception { + public void testIncomplete() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocTypeThree.java")); + new File(getPath("InputXpathJavadocTypeIncomplete.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocTypeCheck.class); @@ -113,12 +113,12 @@ public void testThree() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]", + + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]" + + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]" + "/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocTypeThree']]" + + "[./IDENT[@text='InputXpathJavadocTypeIncomplete']]" + "/MODIFIERS/LITERAL_PUBLIC"); runVerifications(moduleConfig, fileToProcess, expectedViolation, diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java index 72766b39945..3f90d4cb643 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionJavadocVariableTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testPrivateClassFields() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocVariableOne.java")); + new File(getPath("InputXpathJavadocVariablePrivateClassFields.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocVariableCheck.class); @@ -52,13 +52,13 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='age']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='age']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableOne']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariablePrivateClassFields']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='age']]/MODIFIERS/LITERAL_PRIVATE" ); @@ -67,9 +67,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testInnerClassFields() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionJavadocVariableTwo.java")); + new File(getPath("InputXpathJavadocVariableInnerClassFields.java")); final DefaultConfiguration moduleConfig = createModuleConfig(JavadocVariableCheck.class); @@ -81,15 +81,15 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK" + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='fData']]", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK" + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='fData']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionJavadocVariableTwo']]/OBJBLOCK" + + "[./IDENT[@text='InputXpathJavadocVariableInnerClassFields']]/OBJBLOCK" + "/CLASS_DEF[./IDENT[@text='InnerInner2']]/OBJBLOCK" + "/VARIABLE_DEF[./IDENT[@text='fData']]/MODIFIERS" + "/LITERAL_PUBLIC" diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java similarity index 63% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java index 80a285ecd14..d2a274c469f 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationOne.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javadoccontentlocation; -public interface SuppressionXpathRegressionJavadocContentLocationOne { +public interface InputXpathJavadocContentLocationOne { /** Text. // warn */ diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java similarity index 64% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java index 6ddc0aaedfd..e1ecc2f9505 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/SuppressionXpathRegressionJavadocContentLocationTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoccontentlocation/InputXpathJavadocContentLocationTwo.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javadoccontentlocation; -public interface SuppressionXpathRegressionJavadocContentLocationTwo { +public interface InputXpathJavadocContentLocationTwo { /* warn */ /** * Text. diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java similarity index 80% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java index 0a74583fb40..3394b3fcb60 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFive.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFive.java @@ -4,7 +4,7 @@ * Config: * validateThrows = true */ -public class SuppressionXpathRegressionJavadocMethodFive { +public class InputXpathJavadocMethodFive { /** * Needs a throws tag. diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java similarity index 77% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java index 44224218b0d..272ac80d5cd 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodFour.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodFour.java @@ -4,7 +4,7 @@ * Config: * validateThrows = true */ -public class SuppressionXpathRegressionJavadocMethodFour { +public class InputXpathJavadocMethodFour { /** * Needs a throws tag. diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java similarity index 84% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java index 0308db07484..4f915d594cf 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodOne.java @@ -3,7 +3,7 @@ /** * Config: */ -public class SuppressionXpathRegressionJavadocMethodOne { +public class InputXpathJavadocMethodOne { /** {@inheritDoc} */ public void inheritableMethod() { diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java similarity index 82% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java index 60461bd20f8..42db3882c3e 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodThree.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodThree.java @@ -3,7 +3,7 @@ /** * Config: */ -public class SuppressionXpathRegressionJavadocMethodThree { +public class InputXpathJavadocMethodThree { /** * Needs a param tag for T. diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java similarity index 79% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java index 569b02b44aa..94b0468b06c 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/SuppressionXpathRegressionJavadocMethodTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocmethod/InputXpathJavadocMethodTwo.java @@ -3,7 +3,7 @@ /** * Config: */ -public class SuppressionXpathRegressionJavadocMethodTwo { +public class InputXpathJavadocMethodTwo { /** * Needs a param tag for x. diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java similarity index 62% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java index 800e5e359ee..ffd74088d4c 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeThree.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeIncomplete.java @@ -5,6 +5,6 @@ * @param * @param */ -public class SuppressionXpathRegressionJavadocTypeThree { //warn +public class InputXpathJavadocTypeIncomplete { //warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java similarity index 60% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java index 02335e0f1e8..dc80e9b7b5e 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeMissingTag.java @@ -3,6 +3,6 @@ /** * Needs an author tag. */ -public class SuppressionXpathRegressionJavadocTypeOne { //warn +public class InputXpathJavadocTypeMissingTag { //warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java similarity index 66% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java index 4fe5cffd17f..9ae8ea05b0f 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/SuppressionXpathRegressionJavadocTypeTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadoctype/InputXpathJavadocTypeWrongFormat.java @@ -4,6 +4,6 @@ * Has an author tag but wrong format. * @author bar */ -public class SuppressionXpathRegressionJavadocTypeTwo { //warn +public class InputXpathJavadocTypeWrongFormat { //warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java similarity index 68% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java index 57a3515893c..1ec67e4111d 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariableInnerClassFields.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javadocvariable; -public class SuppressionXpathRegressionJavadocVariableTwo { +public class InputXpathJavadocVariableInnerClassFields { class InnerInner2 { public int fData; //warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java similarity index 71% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java index f7ba64bd6de..53d7148e507 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/SuppressionXpathRegressionJavadocVariableOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javadocvariable/InputXpathJavadocVariablePrivateClassFields.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javadocvariable; -public class SuppressionXpathRegressionJavadocVariableOne { +public class InputXpathJavadocVariablePrivateClassFields { private int age; //warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java similarity index 96% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java index d1f4fe6b2c8..cb5370ce6f5 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSOne.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javancss; -public class SuppressionXpathRegressionJavaNCSSOne { +public class InputXpathJavaNCSSOne { public void test() { // warn int a1 = 1; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java similarity index 94% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSThree.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java index f20c7dab9bd..151530f901e 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSThree.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSThree.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javancss; // warn -public class SuppressionXpathRegressionJavaNCSSThree { +public class InputXpathJavaNCSSThree { int a1 = 1; int a2 = 1; int a3 = 1; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java similarity index 94% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java index 59056681d39..9eb109cb487 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/SuppressionXpathRegressionJavaNCSSTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/javancss/InputXpathJavaNCSSTwo.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.javancss; -public class SuppressionXpathRegressionJavaNCSSTwo { // warn +public class InputXpathJavaNCSSTwo { // warn int a1 = 1; int a2 = 1; 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 56f6bf4f445..85baf298fd6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -161,11 +161,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "InterfaceIsType", "InterfaceMemberImpliedModifier", "InvalidJavadocPosition", - "JavadocContentLocation", - "JavadocMethod", - "JavadocType", - "JavadocVariable", - "JavaNCSS", "LambdaBodyLength", "LambdaParameterName", "LeftCurly",