Skip to content

Commit

Permalink
Issue #11439: Converted test for SuppressionXpathSingleFilterTest to …
Browse files Browse the repository at this point in the history
…use inlined config in Input files
  • Loading branch information
Vyom-Yadav authored and romani committed Mar 25, 2022
1 parent 51c0412 commit 56a87ad
Show file tree
Hide file tree
Showing 18 changed files with 521 additions and 217 deletions.
8 changes: 2 additions & 6 deletions config/checkstyle_input_suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@
<suppress id="StyleValidationCommentInInputs"
files="packageobjectfactory[\\/].*.java"/>

<!-- SuppressionXpathSingleFilterTest and XpathFilterElementTest
use assertions directly instead of using them through parser or the traditional
verify method -->
<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppressionxpathsinglefilter[\\/]InputSuppressionXpathSingleFilter.java"/>

<!-- XpathFilterElementTest uses assertions directly instead of using them through parser
or the traditional verify method -->
<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]xpathfilterelement[\\/]InputXpathFilterElementSuppressByXpath.java"/>

Expand Down

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
SuppressionXpathSingleFilter
files = (default)(null)
checks = (default)(null)
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF[./IDENT \
[@text='InputSuppressionXpathSingleFilterComplexQuery']]/OBJBLOCK/METHOD_DEF[./IDENT \
[@text='countTokens']]/SLIST/VARIABLE_DEF[./IDENT[@text='pi']] \
/ASSIGN/EXPR/NUM_FLOAT[@text='3.14']
com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck
ignoreNumbers = (default)-1, 0, 1, 2
ignoreHashCodeMethod = (default)false
ignoreAnnotation = (default)false
ignoreFieldDeclaration = (default)false
ignoreAnnotationElementDefaults = (default)true
constantWaiverParentToken = (default)TYPECAST, METHOD_CALL, EXPR, ARRAY_INIT, UNARY_MINUS, \
UNARY_PLUS, ELIST, STAR, ASSIGN, PLUS, MINUS, DIV, LITERAL_NEW
tokens = (default)NUM_DOUBLE, NUM_FLOAT, NUM_INT, NUM_LONG
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterComplexQuery {
private int countTokens() {
double pi = 3.14; // filtered violation
return 123; // violation
}

public String getName() {
int someVariable = 123; // violation
return "InputSuppressByXpathThree";
}

public int sum(int a, int b) {
String someVariable = "Hello World";
return a + b;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
SuppressionXpathSingleFilter
files = (null)
checks = (null)
message = Missing a Javadoc comment
id = (null)
query = (null)
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck
ignoreNumbers = (default)-1, 0, 1, 2
ignoreHashCodeMethod = (default)false
ignoreAnnotation = (default)false
ignoreFieldDeclaration = (default)false
ignoreAnnotationElementDefaults = (default)true
constantWaiverParentToken = (default)TYPECAST, METHOD_CALL, EXPR, ARRAY_INIT, UNARY_MINUS, \
UNARY_PLUS, ELIST, STAR, ASSIGN, PLUS, MINUS, DIV, LITERAL_NEW
tokens = (default)NUM_DOUBLE, NUM_FLOAT, NUM_INT, NUM_LONG
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterDecideByMessage { // filtered violation
private int countTokens() {
double pi = 3.14; // violation
return 123; // violation
}

public String getName() {
int someVariable = 123; // violation
return "InputSuppressByXpathThree";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterMatchingModuleId
checks = (default)(null)
message = (default)(null)
id = 007
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterMatchingModuleId']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
id = 007
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterMatchingModuleId { // filtered violation

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterMatchingTokenType
checks = MissingJavadocTypeCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterMatchingTokenType']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterMatchingTokenType { // filtered violation

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNoQuery
checks = (default)(null)
message = (default)(null)
id = (default)(null)
query = (default)(null)
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNoQuery { // filtered violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNonMatchingCheck
checks = UnusedLocalVariableCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterNonMatchingCheck']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingCheck { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNonMatchingColumnNumber
checks = TypeNameCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF[./IDENT \
[@text='InputSuppressionXpathSingleFilterNonMatchingColumnNumber']]
com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck
format = (default)^[A-Z][a-zA-Z0-9]*$
applyToPublic = (default)true
applyToProtected = (default)true
applyToPackage = (default)true
applyToPrivate = (default)true
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingColumnNumber {

class testClass { // violation
}

class anotherTestClass { // violation
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
SuppressionXpathSingleFilter
files = SomeFile
checks = UnusedLocalVariableCheck
message = (default)(null)
id = 64
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterNonMatchingFileNameModuleIdAndCheck']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
id = 007
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingFileNameModuleIdAndCheck { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
SuppressionXpathSingleFilter
files = NonMatchingClassName
checks = (default)(null)
message = (default)(null)
id = (default)(null)
query = (default)(null)
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingFileRegexp { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNonMatchingLineNumber
checks = MissingJavadocTypeCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF[./IDENT[@text='TestClass']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = package
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingLineNumber { // violation
}

class TestClass { // filtered violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNonMatchingModuleId
checks = MissingJavadocTypeCheck
message = (default)(null)
id = 64
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterNonMatchingModuleId']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
id = 007
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNonMatchingModuleId { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
SuppressionXpathSingleFilter
files = InputSuppressionXpathSingleFilterNonMatchingTokenType
checks = MissingJavadocTypeCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF[./IDENT \
[@text='InputSuppressionXpathSingleFilterNonMatchingTokenType']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF, INTERFACE_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public interface InputSuppressionXpathSingleFilterNonMatchingTokenType { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
SuppressionXpathSingleFilter
files = (default)(null)
checks = (default)(null)
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNullFileName { // violation
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
SuppressionXpathSingleFilter
files = SomeFile
checks = UnusedLocalVariableCheck
message = (default)(null)
id = (default)(null)
query = /COMPILATION_UNIT/CLASS_DEF \
[./IDENT[@text='InputSuppressionXpathSingleFilterNullModuleIdAndNonMatchingCheck']]
com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocTypeCheck
id = 007
scope = (default)public
excludeScope = (default)(null)
skipAnnotations = (default)Generated
tokens = CLASS_DEF
*/
package com.puppycrawl.tools.checkstyle.filters.suppressionxpathsinglefilter;

public class InputSuppressionXpathSingleFilterNullModuleIdAndNonMatchingCheck { // violation
}

0 comments on commit 56a87ad

Please sign in to comment.