-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue #7721: Update AbstractChecks to log DetailAST - AnnotationOnSam…
…eLine
- Loading branch information
Showing
9 changed files
with
201 additions
and
34 deletions.
There are no files selected for viewing
146 changes: 146 additions & 0 deletions
146
...t/java/org/checkstyle/suppressionxpathfilter/XpathRegressionAnnotationOnSameLineTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
| // checkstyle: Checks Java source code for adherence to a set of rules. | ||
| // Copyright (C) 2001-2020 the original author or authors. | ||
| // | ||
| // This library is free software; you can redistribute it and/or | ||
| // modify it under the terms of the GNU Lesser General Public | ||
| // License as published by the Free Software Foundation; either | ||
| // version 2.1 of the License, or (at your option) any later version. | ||
| // | ||
| // This library is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| // Lesser General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Lesser General Public | ||
| // License along with this library; if not, write to the Free Software | ||
| // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| package org.checkstyle.suppressionxpathfilter; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import com.puppycrawl.tools.checkstyle.DefaultConfiguration; | ||
| import com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationOnSameLineCheck; | ||
|
|
||
| public class XpathRegressionAnnotationOnSameLineTest extends AbstractXpathTestSupport { | ||
|
|
||
| private final String checkName = AnnotationOnSameLineCheck.class.getSimpleName(); | ||
|
|
||
| @Override | ||
| protected String getCheckName() { | ||
| return checkName; | ||
| } | ||
|
|
||
| @Test | ||
| public void testOne() throws Exception { | ||
| final File fileToProcess = | ||
| new File(getPath( | ||
| "SuppressionXpathRegressionAnnotationOnSameLineOne.java")); | ||
|
|
||
| final DefaultConfiguration moduleConfig = | ||
| createModuleConfig(AnnotationOnSameLineCheck.class); | ||
|
|
||
| moduleConfig.addAttribute("tokens", | ||
| "CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, " | ||
| + "CTOR_DEF, VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, " | ||
| + "LITERAL_THROWS, IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, " | ||
| + "ANNOTATION_FIELD_DEF"); | ||
|
|
||
| final String[] expectedViolation = { | ||
| "6:5: " + getCheckMessage(AnnotationOnSameLineCheck.class, | ||
| AnnotationOnSameLineCheck.MSG_KEY_ANNOTATION_ON_SAME_LINE, | ||
| "Deprecated"), | ||
| }; | ||
|
|
||
| final List<String> expectedXpathQueries = Arrays.asList( | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]" | ||
| + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]" | ||
| + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]/MODIFIERS", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]" | ||
| + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]/MODIFIERS" | ||
| + "/ANNOTATION[./IDENT[@text='Deprecated']]", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineOne']]" | ||
| + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='getX']]" | ||
| + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]/AT" | ||
| ); | ||
|
|
||
| runVerifications(moduleConfig, fileToProcess, expectedViolation, | ||
| expectedXpathQueries); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTwo() throws Exception { | ||
| final File fileToProcess = | ||
| new File(getPath( | ||
| "SuppressionXpathRegressionAnnotationOnSameLineTwo.java")); | ||
|
|
||
| final DefaultConfiguration moduleConfig = | ||
| createModuleConfig(AnnotationOnSameLineCheck.class); | ||
|
|
||
| final String[] expectedViolation = { | ||
| "7:5: " + getCheckMessage(AnnotationOnSameLineCheck.class, | ||
| AnnotationOnSameLineCheck.MSG_KEY_ANNOTATION_ON_SAME_LINE, | ||
| "Deprecated"), | ||
| }; | ||
|
|
||
| final List<String> expectedXpathQueries = Arrays.asList( | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]" | ||
| + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]" | ||
| + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]" | ||
| + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS" | ||
| + "/ANNOTATION[./IDENT[@text='Deprecated']]", | ||
| "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineTwo']]" | ||
| + "/OBJBLOCK/VARIABLE_DEF[./IDENT[@text='names']]/MODIFIERS" | ||
| + "/ANNOTATION[./IDENT[@text='Deprecated']]/AT" | ||
| ); | ||
|
|
||
| runVerifications(moduleConfig, fileToProcess, expectedViolation, | ||
| expectedXpathQueries); | ||
| } | ||
|
|
||
| @Test | ||
| public void testThree() throws Exception { | ||
| final File fileToProcess = | ||
| new File(getPath( | ||
| "SuppressionXpathRegressionAnnotationOnSameLineThree.java")); | ||
|
|
||
| final DefaultConfiguration moduleConfig = | ||
| createModuleConfig(AnnotationOnSameLineCheck.class); | ||
| moduleConfig.addAttribute("tokens", "CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, " | ||
| + "CTOR_DEF, VARIABLE_DEF, PARAMETER_DEF, ANNOTATION_DEF, TYPECAST, " | ||
| + "LITERAL_THROWS, IMPLEMENTS_CLAUSE, TYPE_ARGUMENT, LITERAL_NEW, DOT, " | ||
| + "ANNOTATION_FIELD_DEF"); | ||
|
|
||
| final String[] expectedViolation = { | ||
| "3:1: " + getCheckMessage(AnnotationOnSameLineCheck.class, | ||
| AnnotationOnSameLineCheck.MSG_KEY_ANNOTATION_ON_SAME_LINE, | ||
| "Deprecated"), | ||
| }; | ||
|
|
||
| final List<String> expectedXpathQueries = Arrays.asList( | ||
| "/INTERFACE_DEF[" | ||
| + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]", | ||
| "/INTERFACE_DEF[" | ||
| + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]" | ||
| + "/MODIFIERS", | ||
| "/INTERFACE_DEF[" | ||
| + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]" | ||
| + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]", | ||
| "/INTERFACE_DEF[" | ||
| + "./IDENT[@text='SuppressionXpathRegressionAnnotationOnSameLineThree']]" | ||
| + "/MODIFIERS/ANNOTATION[./IDENT[@text='Deprecated']]/AT" | ||
| ); | ||
|
|
||
| runVerifications(moduleConfig, fileToProcess, expectedViolation, | ||
| expectedXpathQueries); | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
...onxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineOne.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.checkstyle.suppressionxpathfilter.annotationonsameline; | ||
|
|
||
| public class SuppressionXpathRegressionAnnotationOnSameLineOne { | ||
| @Deprecated int x; | ||
|
|
||
| @Deprecated //warn | ||
| public int getX() { | ||
| return (int) x; | ||
| } | ||
| } | ||
|
|
6 changes: 6 additions & 0 deletions
6
...xpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineThree.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package org.checkstyle.suppressionxpathfilter.annotationonsameline; | ||
|
|
||
| @Deprecated //warn | ||
| interface SuppressionXpathRegressionAnnotationOnSameLineThree { | ||
|
|
||
| } |
9 changes: 9 additions & 0 deletions
9
...onxpathfilter/annotationonsameline/SuppressionXpathRegressionAnnotationOnSameLineTwo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package org.checkstyle.suppressionxpathfilter.annotationonsameline; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class SuppressionXpathRegressionAnnotationOnSameLineTwo { | ||
| @Deprecated //warn | ||
| private List<String> names = new ArrayList<>(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters