File tree 6 files changed +21
-1
lines changed
src/test/java/com/puppycrawl/tools/checkstyle/internal/utils
6 files changed +21
-1
lines changed Original file line number Diff line number Diff line change 35
35
<property key =" checkstyle.header.file" file =" config/java.header" />
36
36
<property key =" checkstyle.regexp.header.file" file =" config/java_regexp.header" />
37
37
<property key =" checkstyle.importcontrol.file" file =" config/import-control.xml" />
38
+ <property key =" checkstyle.importcontroltest.file" file =" config/import-control-test.xml" />
38
39
<property key =" checkstyle.suppressions.file"
39
40
file =" config/suppressions.xml" />
40
41
</checkstyle >
Original file line number Diff line number Diff line change 37
37
<property key =" checkstyle.header.file" file =" config/java.header" />
38
38
<property key =" checkstyle.regexp.header.file" file =" config/java_regexp.header" />
39
39
<property key =" checkstyle.importcontrol.file" file =" config/import-control.xml" />
40
+ <property key =" checkstyle.importcontroltest.file" file =" config/import-control-test.xml" />
40
41
<property key =" checkstyle.suppressions.file"
41
42
file =" config/suppressions.xml" />
42
43
</checkstyle >
Original file line number Diff line number Diff line change 329
329
</module >
330
330
<module name =" IllegalImport" />
331
331
<module name =" ImportControl" >
332
+ <property name =" id" value =" ImportControlMain" />
332
333
<property name =" file" value =" ${checkstyle.importcontrol.file}" />
333
334
<property name =" path" value =" ^.*[\\/]src[\\/]main[\\/].*$" />
334
335
</module >
336
+ <module name =" ImportControl" >
337
+ <property name =" id" value =" ImportControlTest" />
338
+ <property name =" file" value =" ${checkstyle.importcontroltest.file}" />
339
+ <property name =" path" value =" ^.*[\\/]src[\\/]test[\\/].*$" />
340
+ </module >
335
341
<module name =" ImportOrder" >
336
342
<property name =" groups" value =" /^java\./,javax,org" />
337
343
<property name =" ordered" value =" true" />
Original file line number Diff line number Diff line change
1
+ <?xml version =" 1.0" ?>
2
+ <!DOCTYPE import-control PUBLIC
3
+ "-//Puppy Crawl//DTD Import Control 1.3//EN"
4
+ "http://checkstyle.sourceforge.net/dtds/import_control_1_3.dtd">
5
+
6
+ <import-control pkg =" com.puppycrawl.tools.checkstyle" >
7
+
8
+ <allow pkg =" .*" regex =" true" />
9
+
10
+ <disallow pkg =" junit.framework" />
11
+
12
+ </import-control >
Original file line number Diff line number Diff line change 28
28
<suppress checks =" NPathComplexity" files =" [\\/]XdocsPagesTest\.java" />
29
29
<suppress checks =" IllegalCatch" files =" [\\/]internal[\\/].*[\\/]\w+Util\.java" />
30
30
<suppress checks =" EmptyBlock" files =" .*[\\/]src[\\/]test[\\/]" />
31
- <suppress checks =" ImportControl" files =" .*[\\/]src[\\/](test|it)[\\/]" />
32
31
<suppress checks =" Javadoc" files =" .*[\\/]src[\\/](test|it)[\\/]" />
33
32
<suppress checks =" MagicNumber" files =" .*[\\/]src[\\/](test|it)[\\/]" />
34
33
<suppress checks =" AvoidStaticImport" files =" .*[\\/]src[\\/](test|it)[\\/]" />
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ public static Configuration loadConfiguration(String path) throws CheckstyleExce
41
41
props .setProperty ("checkstyle.header.file" , "file" );
42
42
props .setProperty ("checkstyle.regexp.header.file" , "file" );
43
43
props .setProperty ("checkstyle.importcontrol.file" , "file" );
44
+ props .setProperty ("checkstyle.importcontroltest.file" , "file" );
44
45
45
46
return loadConfiguration (path , props );
46
47
}
You can’t perform that action at this time.
0 commit comments