Skip to content

Commit 9e773ff

Browse files
Prarthana-Rameshromani
authored andcommitted
Issue #16332: Updated SuppressionSingleFilterExamplesTest methods to use verifyFilterWithInlineConfigParser
1 parent 688d0cd commit 9e773ff

File tree

14 files changed

+216
-152
lines changed

14 files changed

+216
-152
lines changed

src/site/xdoc/filters/suppressionsinglefilter.xml

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,9 @@
9393
</subsection>
9494
<subsection name="Examples" id="Examples">
9595
<p id="Example1-config">
96-
The following suppressions directs
97-
a <code>SuppressionSingleFilter</code> to
98-
reject <code>JavadocStyleCheck</code> violations for
99-
lines 82 and 108 to 122 of
100-
file <code>AbstractComplexityCheck.java</code>,
101-
and <code>MagicNumberCheck</code> violations for line
102-
221 of file <code>JavadocStyleCheck.java</code>,
103-
and <code>'Missing a Javadoc comment'</code> violations
104-
for all lines and files:
96+
To configure a filter to suppress violations of <code>JavadocStyle</code> and
97+
<code>MagicNumber</code> checks in <code>Example1.java</code> for specific line ranges
98+
using <code>SuppressionSingleFilter</code>:
10599
</p>
106100
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
107101
&lt;module name="Checker"&gt;
@@ -110,12 +104,7 @@
110104
&lt;module name="MagicNumber"/&gt;
111105
&lt;/module&gt;
112106
&lt;module name="SuppressionSingleFilter"&gt;
113-
&lt;property name="checks" value="JavadocStyle"/&gt;
114-
&lt;property name="files" value="Example1.java"/&gt;
115-
&lt;property name="lines" value="1,5-100"/&gt;
116-
&lt;/module&gt;
117-
&lt;module name="SuppressionSingleFilter"&gt;
118-
&lt;property name="checks" value="MagicNumber"/&gt;
107+
&lt;property name="checks" value="JavadocStyle|MagicNumber"/&gt;
119108
&lt;property name="files" value="Example1.java"/&gt;
120109
&lt;property name="lines" value="1,5-100"/&gt;
121110
&lt;/module&gt;
@@ -129,23 +118,24 @@
129118
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
130119
public class Example1 {
131120
public void exampleMethod() {
132-
int value = 100;
133-
// filtered violation ''100' is a magic number'
121+
int value = 100; // filtered violation ''100' is a magic number'
134122
}
135123
}
136124
</code></pre></div>
137125
<p id="Example2-config">
138-
Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a>
139-
when config have two instances on the same check:
126+
To configure a filter to suppress violations of <code>JavadocMethod</code> and
127+
<code>EqualsAvoidNull</code> checks in <code>Example2.java</code> using
128+
<code>SuppressionSingleFilter</code>:
140129
</p>
141130
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
142131
&lt;module name="Checker"&gt;
143-
&lt;module name="EqualsAvoidNull"/&gt;
144-
&lt;module name="JavadocMethod"/&gt;
132+
&lt;module name="TreeWalker"&gt;
133+
&lt;module name="JavadocMethod"/&gt;
134+
&lt;module name="EqualsAvoidNull"/&gt;
135+
&lt;/module&gt;
145136
&lt;module name="SuppressionSingleFilter"&gt;
146-
&lt;property name="id" value="stringEqual"/&gt;
147137
&lt;property name="files" value="Example2.java"/&gt;
148-
&lt;property name="checks" value="EqualsAvoidNull, JavadocMethod"/&gt;
138+
&lt;property name="checks" value="JavadocMethod|EqualsAvoidNull"/&gt;
149139
&lt;/module&gt;
150140
&lt;/module&gt;
151141
</code></pre></div>
@@ -154,19 +144,25 @@ public class Example1 {
154144
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
155145
public class Example2 {
156146

157-
public void checkStringEquality(String str1, String str2) {
158-
// filtered violation ''.equals()' should be used for string comparison'
159-
assert str1 == str2 ;
147+
public void checkStringEquality(String s) {
148+
// filtered violation below 'String literal expressions should be on the left'
149+
s.equals("M");
160150
}
151+
/**
152+
* @param p1 The first number
153+
*/
154+
// filtered violation below '@return tag should be present'
155+
private int m2(int p1) { return p1; }
161156
}
162157
</code></pre></div>
163158
<p id="Example3-config">
164-
Suppress all checks for hidden files and folders:
159+
To configure a filter to suppress violations of <code>RegexpSinglelineCheck</code>
160+
in <code>Example3.java</code> using <code>SuppressionSingleFilter</code>:
165161
</p>
166162
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
167163
&lt;module name="Checker"&gt;
168164
&lt;module name="RegexpSingleline"&gt;
169-
&lt;property name="format" value=".*example.*"/&gt;
165+
&lt;property name="format" value="example"/&gt;
170166
&lt;/module&gt;
171167
&lt;module name="SuppressionSingleFilter"&gt;
172168
&lt;property name="files" value="Example3.java"/&gt;
@@ -180,26 +176,28 @@ public class Example2 {
180176
public class Example3 {
181177

182178
public void printExample() {
183-
// filtered violation 'Line matches the illegal pattern 'example''
184179
System.out.println(
185-
"This is an example string."
180+
"example" // filtered violation 'Line matches the illegal pattern 'example''
186181
);
187182
}
188183

189184
public void noViolation() {
190185
System.out.println(
191-
"This string does not contain 'example'."
186+
"RegexpSingleline is case sensitive by default. 'Example' in not matching."
192187
);
193188
}
194189

195190
}
196191
</code></pre></div>
197192
<p id="Example4-config">
198-
Suppress all checks for Maven-generated code:
193+
To configure a filter to suppress violations of <code>NoWhitespaceAfter</code>
194+
in <code>Example4.java</code> using <code>SuppressionSingleFilter</code>:
199195
</p>
200196
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
201197
&lt;module name="Checker"&gt;
202-
&lt;module name="NoWhitespaceAfter"/&gt;
198+
&lt;module name="TreeWalker"&gt;
199+
&lt;module name="NoWhitespaceAfter"/&gt;
200+
&lt;/module&gt;
203201
&lt;module name="SuppressionSingleFilter"&gt;
204202
&lt;property name="files" value="Example4.java"/&gt;
205203
&lt;property name="checks" value="NoWhitespaceAfter"/&gt;
@@ -211,18 +209,20 @@ public class Example3 {
211209
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
212210
public class Example4 {
213211

214-
// filtered violation 'WhiteSpace after ',''
215212
public void exampleMethod(int a, int b) {
213+
// filtered violation below ''.' is followed by whitespace'
214+
Integer. parseInt("3");
216215
}
217216

218217
public void exampleMethod2() {
219-
int x = 5 ; // filtered violation 'WhiteSpace before ';''
218+
int [] x; // filtered violation ''int' is followed by whitespace'
220219
}
221220

222221
}
223222
</code></pre></div>
224223
<p id="Example5-config">
225-
Suppress all checks for archives, classes and other binary files:
224+
To configure a filter to suppress violations of <code>MethodName</code>
225+
in <code>Example5.java</code> using <code>SuppressionSingleFilter</code>:
226226
</p>
227227
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
228228
&lt;module name="Checker"&gt;
@@ -237,17 +237,17 @@ public class Example4 {
237237
</p>
238238
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
239239
public class Example5 {
240-
// filtered violation 'Name 'example_Method' must match pattern'
240+
// filtered violation below 'Name 'example_Method' must match pattern'
241241
public void example_Method() {
242242
}
243-
244-
// filtered violation Name 'Another_Method' must match pattern
243+
// filtered violation below 'Name 'Another_Method' must match pattern'
245244
public void Another_Method() {
246245
}
247246
}
248247
</code></pre></div>
249248
<p id="Example6-config">
250-
Suppress all checks for image files:
249+
To configure a filter to suppress violations of <code>ConstantName</code>
250+
in <code>Example6.java</code> using <code>SuppressionSingleFilter</code>:
251251
</p>
252252
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
253253
&lt;module name="Checker"&gt;
@@ -262,42 +262,40 @@ public class Example5 {
262262
</p>
263263
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
264264
public class Example6 {
265-
266-
// filtered violation 'Name 'myConstant' must match pattern'
265+
// filtered violation below 'Name 'myConstant' must match pattern'
267266
private static final int myConstant = 42;
268267

269268
}
270269
</code></pre></div>
271270
<p id="Example7-config">
272-
Suppress all checks for non-java files:
271+
To configure a filter to suppress violations of <code>MemberName</code>
272+
and <code>MethodName</code> in <code>Example7.java</code> using
273+
<code>SuppressionSingleFilter</code>:
273274
</p>
274275
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
275276
&lt;module name="Checker"&gt;
276277
&lt;module name="MemberName"/&gt;
278+
&lt;module name="MethodName"/&gt;
277279
&lt;module name="SuppressionSingleFilter"&gt;
278280
&lt;property name="files" value="Example7.java"/&gt;
279-
&lt;property name="checks" value="MemberName"/&gt;
281+
&lt;property name="checks" value="MemberName|MethodName"/&gt;
280282
&lt;/module&gt;
281283
&lt;/module&gt;
282284
</code></pre></div>
283285
<p id="Example7-code">
284286
</p>
285287
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
286288
public class Example7 {
287-
288-
// filtered violation 'Name 'MyVariable' must match pattern'
289+
// filtered violation below 'Name 'MyVariable' must match pattern'
289290
private int MyVariable = 5;
290-
291-
// filtered violation 'Name 'PrintHello' must match pattern'
292-
public void PrintHello() {
293-
}
294-
295-
public void printHello() {
291+
// filtered violation below 'Name 'MyMethod' must match pattern'
292+
public void MyMethod() {
296293
}
297294
}
298295
</code></pre></div>
299296
<p id="Example8-config">
300-
Suppress all checks in generated sources:
297+
To configure a filter to suppress <code>ParameterNumber</code> violations
298+
in <code>Example8.java</code> using <code>SuppressionSingleFilter</code>:
301299
</p>
302300
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
303301
&lt;module name="Checker"&gt;
@@ -316,15 +314,15 @@ public class Example7 {
316314
</p>
317315
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
318316
public class Example8 {
319-
// filtered violation 'more than 5 parameters'
317+
// filtered violation below 'More than 5 parameters (found 6)'
320318
public void exampleMethod(
321-
int param1, int param2, int param3, int param4,
322-
int param5
319+
int param1, int param2, int param3, int param4, int param5, int param6
323320
) {}
324321
}
325322
</code></pre></div>
326323
<p id="Example9-config">
327-
Suppress FileLength check on integration tests in certain folder:
324+
To configure a filter to suppress <code>FileLength</code> violations
325+
in <code>Example9.java</code> using <code>SuppressionSingleFilter</code>:
328326
</p>
329327
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
330328
&lt;module name="Checker"&gt;
@@ -342,12 +340,14 @@ public class Example8 {
342340
<p id="Example9-code">
343341
</p>
344342
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
343+
/* filtered violation on 1st line 'File length is 4 lines (max allowed is 1)' */
345344
public class Example9 {
346-
//filtered violation 'File length is 19 lines (max allowed is 1)'
345+
347346
}
348347
</code></pre></div>
349348
<p id="Example10-config">
350-
Suppress naming violations on variable named 'log' in all files:
349+
To configure a filter to suppress <code>MemberName</code> violations
350+
in <code>Example10.java</code> using <code>SuppressionSingleFilter</code>:
351351
</p>
352352
<div class="wrapper"><pre class="prettyprint"><code class="language-xml">
353353
&lt;module name="Checker"&gt;
@@ -364,8 +364,7 @@ public class Example9 {
364364
</p>
365365
<div class="wrapper"><pre class="prettyprint"><code class="language-java">
366366
public class Example10 {
367-
368-
// filtered violation 'Name 'log' must match pattern'
367+
// filtered violation below 'Name 'log' must match pattern'
369368
private String log = "Some log message";
370369

371370
}

src/site/xdoc/filters/suppressionsinglefilter.xml.template

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,9 @@
4646
</subsection>
4747
<subsection name="Examples" id="Examples">
4848
<p id="Example1-config">
49-
The following suppressions directs
50-
a <code>SuppressionSingleFilter</code> to
51-
reject <code>JavadocStyleCheck</code> violations for
52-
lines 82 and 108 to 122 of
53-
file <code>AbstractComplexityCheck.java</code>,
54-
and <code>MagicNumberCheck</code> violations for line
55-
221 of file <code>JavadocStyleCheck.java</code>,
56-
and <code>'Missing a Javadoc comment'</code> violations
57-
for all lines and files:
49+
To configure a filter to suppress violations of <code>JavadocStyle</code> and
50+
<code>MagicNumber</code> checks in <code>Example1.java</code> for specific line ranges
51+
using <code>SuppressionSingleFilter</code>:
5852
</p>
5953
<macro name="example">
6054
<param name="path"
@@ -69,8 +63,9 @@
6963
<param name="type" value="code"/>
7064
</macro>
7165
<p id="Example2-config">
72-
Suppress check by <a href="https://checkstyle.org/config.html#Id">module id</a>
73-
when config have two instances on the same check:
66+
To configure a filter to suppress violations of <code>JavadocMethod</code> and
67+
<code>EqualsAvoidNull</code> checks in <code>Example2.java</code> using
68+
<code>SuppressionSingleFilter</code>:
7469
</p>
7570
<macro name="example">
7671
<param name="path"
@@ -85,7 +80,8 @@
8580
<param name="type" value="code"/>
8681
</macro>
8782
<p id="Example3-config">
88-
Suppress all checks for hidden files and folders:
83+
To configure a filter to suppress violations of <code>RegexpSinglelineCheck</code>
84+
in <code>Example3.java</code> using <code>SuppressionSingleFilter</code>:
8985
</p>
9086
<macro name="example">
9187
<param name="path"
@@ -100,7 +96,8 @@
10096
<param name="type" value="code"/>
10197
</macro>
10298
<p id="Example4-config">
103-
Suppress all checks for Maven-generated code:
99+
To configure a filter to suppress violations of <code>NoWhitespaceAfter</code>
100+
in <code>Example4.java</code> using <code>SuppressionSingleFilter</code>:
104101
</p>
105102
<macro name="example">
106103
<param name="path"
@@ -115,7 +112,8 @@
115112
<param name="type" value="code"/>
116113
</macro>
117114
<p id="Example5-config">
118-
Suppress all checks for archives, classes and other binary files:
115+
To configure a filter to suppress violations of <code>MethodName</code>
116+
in <code>Example5.java</code> using <code>SuppressionSingleFilter</code>:
119117
</p>
120118
<macro name="example">
121119
<param name="path"
@@ -130,7 +128,8 @@
130128
<param name="type" value="code"/>
131129
</macro>
132130
<p id="Example6-config">
133-
Suppress all checks for image files:
131+
To configure a filter to suppress violations of <code>ConstantName</code>
132+
in <code>Example6.java</code> using <code>SuppressionSingleFilter</code>:
134133
</p>
135134
<macro name="example">
136135
<param name="path"
@@ -145,7 +144,9 @@
145144
<param name="type" value="code"/>
146145
</macro>
147146
<p id="Example7-config">
148-
Suppress all checks for non-java files:
147+
To configure a filter to suppress violations of <code>MemberName</code>
148+
and <code>MethodName</code> in <code>Example7.java</code> using
149+
<code>SuppressionSingleFilter</code>:
149150
</p>
150151
<macro name="example">
151152
<param name="path"
@@ -160,7 +161,8 @@
160161
<param name="type" value="code"/>
161162
</macro>
162163
<p id="Example8-config">
163-
Suppress all checks in generated sources:
164+
To configure a filter to suppress <code>ParameterNumber</code> violations
165+
in <code>Example8.java</code> using <code>SuppressionSingleFilter</code>:
164166
</p>
165167
<macro name="example">
166168
<param name="path"
@@ -175,7 +177,8 @@
175177
<param name="type" value="code"/>
176178
</macro>
177179
<p id="Example9-config">
178-
Suppress FileLength check on integration tests in certain folder:
180+
To configure a filter to suppress <code>FileLength</code> violations
181+
in <code>Example9.java</code> using <code>SuppressionSingleFilter</code>:
179182
</p>
180183
<macro name="example">
181184
<param name="path"
@@ -190,7 +193,8 @@
190193
<param name="type" value="code"/>
191194
</macro>
192195
<p id="Example10-config">
193-
Suppress naming violations on variable named 'log' in all files:
196+
To configure a filter to suppress <code>MemberName</code> violations
197+
in <code>Example10.java</code> using <code>SuppressionSingleFilter</code>:
194198
</p>
195199
<macro name="example">
196200
<param name="path"

0 commit comments

Comments
 (0)