diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java index 64b336df554..c05e828be7b 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionIllegalTypeTest.java @@ -40,7 +40,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionIllegalTypeOne.java")); + new File(getPath("InputXpathIllegalTypeOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(IllegalTypeCheck.class); moduleConfig.addProperty("tokens", "METHOD_DEF"); @@ -50,7 +50,7 @@ public void testOne() throws Exception { }; final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT" - + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalTypeOne']]" + + "/CLASS_DEF[./IDENT[@text='InputXpathIllegalTypeOne']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='typeParam']]/TYPE_PARAMETERS/TYPE_PARAMETER" + "[./IDENT[@text='T']]/TYPE_UPPER_BOUNDS/DOT" + "[./IDENT[@text='HashSet']]/DOT/IDENT[@text='java']" @@ -63,7 +63,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionIllegalTypeTwo.java")); + new File(getPath("InputXpathIllegalTypeTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(IllegalTypeCheck.class); @@ -74,7 +74,7 @@ public void testTwo() throws Exception { IllegalTypeCheck.MSG_KEY, "Boolean"), }; final List expectedXpathQueries = Collections.singletonList( - "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionIllegalTypeTwo']" + "/COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='InputXpathIllegalTypeTwo']" + "]/OBJBLOCK/METHOD_DEF[./IDENT[@text='typeParam']]/TYPE_PARAMETERS/" + "TYPE_PARAMETER[./IDENT[@text='T']]/TYPE_UPPER_BOUNDS/IDENT[@text='Boolean']" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java index 40f3f3294ab..603c6de0855 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerAssignmentTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testFile1() throws Exception { + public void testInnerAssignment() throws Exception { final File fileToProcess = new - File(getPath("SuppressionXpathRegressionInnerAssignment1.java")); + File(getPath("InputXpathInnerAssignment.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InnerAssignmentCheck.class); @@ -50,7 +50,7 @@ public void testFile1() throws Exception { final List expectedXpathQueries = List.of( "/COMPILATION_UNIT" - + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionInnerAssignment1']]" + + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignment']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]" + "/SLIST/EXPR/ASSIGN[./IDENT[@text='a']]/ASSIGN[./IDENT[@text='b']]" ); @@ -59,9 +59,9 @@ public void testFile1() throws Exception { } @Test - public void testFile2() throws Exception { + public void testArrays() throws Exception { final File fileToProcess = new - File(getPath("SuppressionXpathRegressionInnerAssignment2.java")); + File(getPath("InputXpathInnerAssignmentArrays.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InnerAssignmentCheck.class); @@ -71,12 +71,12 @@ public void testFile2() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT" - + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionInnerAssignment2']]" + + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignmentArrays']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]" + "/SLIST/VARIABLE_DEF[./IDENT[@text='doubleArray']]" + "/ASSIGN/EXPR/LITERAL_NEW/ARRAY_INIT/EXPR[./ASSIGN/IDENT[@text='myDouble']]", "/COMPILATION_UNIT" - + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionInnerAssignment2']]" + + "/CLASS_DEF[./IDENT[@text='InputXpathInnerAssignmentArrays']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='testMethod']]/" + "SLIST/VARIABLE_DEF[./IDENT[@text='doubleArray']]" + "/ASSIGN/EXPR/LITERAL_NEW/ARRAY_INIT/EXPR/ASSIGN[./IDENT[@text='myDouble']]" diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java index dfe9a51e0c3..0aef626e054 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInnerTypeLastTest.java @@ -42,7 +42,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInnerTypeLastOne.java")); + new File(getPath("InputXpathInnerTypeLastOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class); @@ -52,18 +52,18 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastOne']]" + + "[@text='InputXpathInnerTypeLastOne']]" + "/OBJBLOCK/CTOR_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInnerTypeLastOne']]", + + "[./IDENT[@text='InputXpathInnerTypeLastOne']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastOne']]" + + "[@text='InputXpathInnerTypeLastOne']]" + "/OBJBLOCK/CTOR_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastOne']]" + + "[@text='InputXpathInnerTypeLastOne']]" + "/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastOne']]" + + "[@text='InputXpathInnerTypeLastOne']]" + "/OBJBLOCK/CTOR_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastOne']]" + + "[@text='InputXpathInnerTypeLastOne']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -75,7 +75,7 @@ public void testOne() throws Exception { public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInnerTypeLastTwo.java")); + new File(getPath("InputXpathInnerTypeLastTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class); @@ -85,16 +85,16 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastTwo']]" + + "[@text='InputXpathInnerTypeLastTwo']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='innerMethod']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastTwo']]" + + "[@text='InputXpathInnerTypeLastTwo']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]" + "/OBJBLOCK/METHOD_DEF[./IDENT" + "[@text='innerMethod']]/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastTwo']]" + + "[@text='InputXpathInnerTypeLastTwo']]" + "/OBJBLOCK/CLASS_DEF[./IDENT[@text='Inner']]" + "/OBJBLOCK/METHOD_DEF[./IDENT" + "[@text='innerMethod']]/MODIFIERS/LITERAL_PUBLIC" @@ -109,7 +109,7 @@ public void testTwo() throws Exception { public void testThree() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionInnerTypeLastThree.java")); + getPath("InputXpathInnerTypeLastThree.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InnerTypeLastCheck.class); @@ -119,18 +119,18 @@ public void testThree() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]" + + "[@text='InputXpathInnerTypeLastThree']]" + "/OBJBLOCK/CTOR_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]", + + "[@text='InputXpathInnerTypeLastThree']]", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]" + + "[@text='InputXpathInnerTypeLastThree']]" + "/OBJBLOCK/CTOR_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]" + + "[@text='InputXpathInnerTypeLastThree']]" + "/MODIFIERS", "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]" + + "[@text='InputXpathInnerTypeLastThree']]" + "/OBJBLOCK/CTOR_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInnerTypeLastThree']]" + + "[@text='InputXpathInnerTypeLastThree']]" + "/MODIFIERS/LITERAL_PUBLIC" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java index a3bdd749b26..fdbc451f70f 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceIsTypeTest.java @@ -38,9 +38,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testAllowMarker() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionInterfaceIsType1.java")); + "InputXpathInterfaceIsTypeAllowMarker.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InterfaceIsTypeCheck.class); @@ -52,11 +52,11 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType1']]", + + "@text='InputXpathInterfaceIsTypeAllowMarker']]", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType1']]/MODIFIERS", + + "@text='InputXpathInterfaceIsTypeAllowMarker']]/MODIFIERS", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType1']]" + + "@text='InputXpathInterfaceIsTypeAllowMarker']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -65,9 +65,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testAllowMarkerFalse() throws Exception { final File fileToProcess = new File(getPath( - "SuppressionXpathRegressionInterfaceIsType2.java")); + "InputXpathInterfaceIsType.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InterfaceIsTypeCheck.class); @@ -81,11 +81,11 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType2']]", + + "@text='InputXpathInterfaceIsType']]", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType2']]/MODIFIERS", + + "@text='InputXpathInterfaceIsType']]/MODIFIERS", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT[" - + "@text='SuppressionXpathRegressionInterfaceIsType2']]" + + "@text='InputXpathInterfaceIsType']]" + "/MODIFIERS/LITERAL_PUBLIC" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java index 209972a2f15..ed19e0b1b33 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInterfaceMemberImpliedModifierTest.java @@ -36,9 +36,9 @@ protected String getCheckName() { } @Test - public void testOne() throws Exception { + public void testField() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java") + getPath("InputXpathInterfaceMemberImpliedModifierField.java") ); final DefaultConfiguration moduleConfig = @@ -51,16 +51,16 @@ public void testOne() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierField']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierField']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]" + "/MODIFIERS", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier1']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierField']]" + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='str']]" + "/MODIFIERS/LITERAL_PUBLIC" ); @@ -69,9 +69,9 @@ public void testOne() throws Exception { } @Test - public void testTwo() throws Exception { + public void testMethod() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java") + getPath("InputXpathInterfaceMemberImpliedModifierMethod.java") ); final DefaultConfiguration moduleConfig = @@ -84,16 +84,16 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]" + "/MODIFIERS", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier2']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierMethod']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='setData']]" + "/MODIFIERS/ABSTRACT" ); @@ -102,9 +102,9 @@ public void testTwo() throws Exception { } @Test - public void testThree() throws Exception { + public void testInner() throws Exception { final File fileToProcess = new File( - getPath("SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java") + getPath("InputXpathInterfaceMemberImpliedModifierInner.java") ); final DefaultConfiguration moduleConfig = @@ -117,16 +117,16 @@ public void testThree() throws Exception { final List expectedXpathQueries = Arrays.asList( "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]" + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]" + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]" + "/MODIFIERS", "/COMPILATION_UNIT/INTERFACE_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInterfaceMemberImpliedModifier3']]" + + "[@text='InputXpathInterfaceMemberImpliedModifierInner']]" + "/OBJBLOCK/INTERFACE_DEF[./IDENT[@text='Data']]" + "/MODIFIERS/LITERAL_PUBLIC" ); diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java index 56c45cf8165..2cd24d78858 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionInvalidJavadocPositionTest.java @@ -40,7 +40,7 @@ protected String getCheckName() { @Test public void testOne() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionOne.java")); + new File(getPath("InputXpathInvalidJavadocPositionOne.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -52,7 +52,7 @@ public void testOne() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionOne']]" + + "[./IDENT[@text='InputXpathInvalidJavadocPositionOne']]" + "/MODIFIERS/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc Comment\\n ']]" ); @@ -64,7 +64,7 @@ public void testOne() throws Exception { @Test public void testTwo() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionTwo.java")); + new File(getPath("InputXpathInvalidJavadocPositionTwo.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -76,7 +76,7 @@ public void testTwo() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF[./IDENT" - + "[@text='SuppressionXpathRegressionInvalidJavadocPositionTwo']]" + + "[@text='InputXpathInvalidJavadocPositionTwo']]" + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc comment\\n ']]" ); @@ -88,7 +88,7 @@ public void testTwo() throws Exception { @Test public void testThree() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionThree.java")); + new File(getPath("InputXpathInvalidJavadocPositionThree.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -100,7 +100,7 @@ public void testThree() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionThree']]/" + + "[./IDENT[@text='InputXpathInvalidJavadocPositionThree']]/" + "OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc comment\\n ']]" ); @@ -112,7 +112,7 @@ public void testThree() throws Exception { @Test public void testFour() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionFour.java")); + new File(getPath("InputXpathInvalidJavadocPositionFour.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -124,7 +124,7 @@ public void testFour() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionFour']]" + + "[./IDENT[@text='InputXpathInvalidJavadocPositionFour']]" + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc Comment\\n ']]" ); @@ -136,7 +136,7 @@ public void testFour() throws Exception { @Test public void testFive() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionFive.java")); + new File(getPath("InputXpathInvalidJavadocPositionFive.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -148,7 +148,7 @@ public void testFive() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionFive']]" + + "[./IDENT[@text='InputXpathInvalidJavadocPositionFive']]" + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]" + "/SLIST/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc comment\\n ']]" @@ -161,7 +161,7 @@ public void testFive() throws Exception { @Test public void testSix() throws Exception { final File fileToProcess = - new File(getPath("SuppressionXpathRegressionInvalidJavadocPositionSix.java")); + new File(getPath("InputXpathInvalidJavadocPositionSix.java")); final DefaultConfiguration moduleConfig = createModuleConfig(InvalidJavadocPositionCheck.class); @@ -173,7 +173,7 @@ public void testSix() throws Exception { final List expectedXpathQueries = Collections.singletonList( "/COMPILATION_UNIT/CLASS_DEF" - + "[./IDENT[@text='SuppressionXpathRegressionInvalidJavadocPositionSix']]" + + "[./IDENT[@text='InputXpathInvalidJavadocPositionSix']]" + "/OBJBLOCK/BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT" + "[@text='* // warn\\n * Javadoc Comment\\n ']]" ); diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java similarity index 70% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java index 08238330e26..d2dbd2b0442 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeOne.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.illegaltype; -public class SuppressionXpathRegressionIllegalTypeOne { +public class InputXpathIllegalTypeOne { public void typeParam(T t) {} // warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java similarity index 75% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java index ef0c166dff0..9b1c95a9b5b 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/SuppressionXpathRegressionIllegalTypeTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/illegaltype/InputXpathIllegalTypeTwo.java @@ -2,6 +2,6 @@ import java.io.Serializable; -public class SuppressionXpathRegressionIllegalTypeTwo { +public class InputXpathIllegalTypeTwo { public void typeParam(T a) {} // warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java similarity index 71% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment1.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java index fd7c6d44087..e0ae9ba571a 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment1.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignment.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.innerassignment; -public class SuppressionXpathRegressionInnerAssignment1 { +public class InputXpathInnerAssignment { public void testMethod() { int a, b; diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java similarity index 77% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment2.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java index 10daacfc133..5da5022b68c 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/SuppressionXpathRegressionInnerAssignment2.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innerassignment/InputXpathInnerAssignmentArrays.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.innerassignment; -public class SuppressionXpathRegressionInnerAssignment2 { +public class InputXpathInnerAssignmentArrays { public void testMethod() { double myDouble; double[] doubleArray = new double[] {myDouble = 4.5, 15.5}; // warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java new file mode 100644 index 00000000000..41fd10810ee --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastOne.java @@ -0,0 +1,11 @@ +package org.checkstyle.suppressionxpathfilter.innertypelast; + +public class InputXpathInnerTypeLastOne { + + public class Inner { + } + + public InputXpathInnerTypeLastOne() { // warn + } + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java new file mode 100644 index 00000000000..16c2f9bf3ff --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastThree.java @@ -0,0 +1,13 @@ +package org.checkstyle.suppressionxpathfilter.innertypelast; + +public class InputXpathInnerTypeLastThree { + + static {} // OK + + interface Inner { + } + + public InputXpathInnerTypeLastThree() { // warn + } + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java similarity index 79% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java index 018f51d9c01..78f8b1ec362 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/InputXpathInnerTypeLastTwo.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.innertypelast; -public class SuppressionXpathRegressionInnerTypeLastTwo { +public class InputXpathInnerTypeLastTwo { static {}; // OK diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastOne.java deleted file mode 100644 index 11675f1d750..00000000000 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastOne.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.checkstyle.suppressionxpathfilter.innertypelast; - -public class SuppressionXpathRegressionInnerTypeLastOne { - - public class Inner { - } - - public SuppressionXpathRegressionInnerTypeLastOne() { // warn - } - -} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastThree.java deleted file mode 100644 index 9a60650d682..00000000000 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/innertypelast/SuppressionXpathRegressionInnerTypeLastThree.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.checkstyle.suppressionxpathfilter.innertypelast; - -public class SuppressionXpathRegressionInnerTypeLastThree { - - static {} // OK - - interface Inner { - } - - public SuppressionXpathRegressionInnerTypeLastThree() { // warn - } - -} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java new file mode 100644 index 00000000000..8f1fbf8a98c --- /dev/null +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsType.java @@ -0,0 +1,5 @@ +package org.checkstyle.suppressionxpathfilter.interfaceistype; + +public interface InputXpathInterfaceIsType { // warn + +} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java similarity index 53% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java index 030bf25f5cc..d0dd03c9bf7 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType1.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/InputXpathInterfaceIsTypeAllowMarker.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.interfaceistype; -public interface SuppressionXpathRegressionInterfaceIsType1 { // warn +public interface InputXpathInterfaceIsTypeAllowMarker { // warn int a = 3; } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java deleted file mode 100644 index fd9b930be36..00000000000 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfaceistype/SuppressionXpathRegressionInterfaceIsType2.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.checkstyle.suppressionxpathfilter.interfaceistype; - -public interface SuppressionXpathRegressionInterfaceIsType2 { // warn - -} diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java similarity index 64% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java index 74c81b11e8c..043d2095cc7 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier1.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierField.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; -public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier1 { +public interface InputXpathInterfaceMemberImpliedModifierField { public static String str = "random string"; // warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java similarity index 60% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java index 18b982cbe19..2cf4c78c72c 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier3.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierInner.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; -public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier3 { +public interface InputXpathInterfaceMemberImpliedModifierInner { public interface Data {} // warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java similarity index 60% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java index d38d975fb3a..bffb6af5808 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/SuppressionXpathRegressionInterfaceMemberImpliedModifier2.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/interfacememberimpliedmodifier/InputXpathInterfaceMemberImpliedModifierMethod.java @@ -1,5 +1,5 @@ package org.checkstyle.suppressionxpathfilter.interfacememberimpliedmodifier; -public interface SuppressionXpathRegressionInterfaceMemberImpliedModifier2 { +public interface InputXpathInterfaceMemberImpliedModifierMethod { abstract void setData(); // warn } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java similarity index 70% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java index 2cb5606536c..6f050e510a0 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFive.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFive.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.invalidjavadocposition; -public class SuppressionXpathRegressionInvalidJavadocPositionFive { +public class InputXpathInvalidJavadocPositionFive { public void foo() { /** // warn * Javadoc comment diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java similarity index 63% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java index 5d65ecc150a..04adbf2c2c9 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionFour.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionFour.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.invalidjavadocposition; -public class SuppressionXpathRegressionInvalidJavadocPositionFour { +public class InputXpathInvalidJavadocPositionFour { /** // warn * Javadoc Comment */ diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java similarity index 66% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java index 89405e83077..82b85797327 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionOne.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionOne.java @@ -4,5 +4,5 @@ /** // warn * Javadoc Comment */ -public class SuppressionXpathRegressionInvalidJavadocPositionOne { +public class InputXpathInvalidJavadocPositionOne { } diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java similarity index 66% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java index 7f73f25e92e..763e720c073 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionSix.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionSix.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.invalidjavadocposition; -public class SuppressionXpathRegressionInvalidJavadocPositionSix { +public class InputXpathInvalidJavadocPositionSix { int a; /** // warn * Javadoc Comment diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java similarity index 68% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java index 6e64de7f644..98b397511ce 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionThree.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionThree.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.invalidjavadocposition; -public class SuppressionXpathRegressionInvalidJavadocPositionThree { +public class InputXpathInvalidJavadocPositionThree { public void foo(){ } /** // warn diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java similarity index 61% rename from src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java rename to src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java index bf9852b86af..7d6d961e37f 100644 --- a/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/SuppressionXpathRegressionInvalidJavadocPositionTwo.java +++ b/src/it/resources/org/checkstyle/suppressionxpathfilter/invalidjavadocposition/InputXpathInvalidJavadocPositionTwo.java @@ -1,6 +1,6 @@ package org.checkstyle.suppressionxpathfilter.invalidjavadocposition; -public class SuppressionXpathRegressionInvalidJavadocPositionTwo { +public class InputXpathInvalidJavadocPositionTwo { } /** // warn * Javadoc comment 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 920dfad87ce..a963857f367 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java @@ -126,12 +126,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport { "IllegalThrows", "IllegalToken", "IllegalTokenText", - "IllegalType", - "InnerAssignment", - "InnerTypeLast", - "InterfaceIsType", - "InterfaceMemberImpliedModifier", - "InvalidJavadocPosition", "MatchXpath", "MethodCount", "MethodLength", diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java index 6a970e3bbcf..39027cb5fbe 100644 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example1.java @@ -8,7 +8,7 @@ package com.puppycrawl.tools.checkstyle.checks.blocks.avoidnestedblocks; -import static org.checkstyle.suppressionxpathfilter.interfaceistype.SuppressionXpathRegressionInterfaceIsType1.a; +import static org.checkstyle.suppressionxpathfilter.interfaceistype.InputXpathInterfaceIsTypeAllowMarker.a; // xdoc section -- start public class Example1 { diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java index 02900103ccd..88308796e5a 100644 --- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java +++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/blocks/avoidnestedblocks/Example2.java @@ -10,7 +10,7 @@ package com.puppycrawl.tools.checkstyle.checks.blocks.avoidnestedblocks; -import static org.checkstyle.suppressionxpathfilter.interfaceistype.SuppressionXpathRegressionInterfaceIsType1.a; +import static org.checkstyle.suppressionxpathfilter.interfaceistype.InputXpathInterfaceIsTypeAllowMarker.a; // xdoc section -- start public class Example2 {