TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

100% coverage for CustomImportOrder. #1128

This commit is contained in:
Aleksandr Ivanov 2015-07-25 18:45:22 +03:00 committed by Roman Ivanov
parent d27384e31d
commit 8f12d2b925
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -1135,8 +1135,6 @@
<regex><pattern>.*.checks.header.RegexpHeaderCheck</pattern><branchRate>88</branchRate><lineRate>94</lineRate></regex>
<regex><pattern>.*.checks.imports.CustomImportOrderCheck</pattern><branchRate>98</branchRate><lineRate>100</lineRate></regex>
<regex><pattern>.*.checks.javadoc.AbstractJavadocCheck</pattern><branchRate>90</branchRate><lineRate>93</lineRate></regex>
<regex><pattern>.*.checks.javadoc.AbstractJavadocCheck\$.*</pattern><branchRate>50</branchRate><lineRate>68</lineRate></regex>
<regex><pattern>.*.checks.javadoc.AtclauseOrderCheck</pattern><branchRate>88</branchRate><lineRate>88</lineRate></regex>

2
src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
View File

@ -370,7 +370,7 @@ public class CustomImportOrderCheck extends Check {
if (customImportOrderRules.size() > groupNumber + 1) {
final String nextGroup = getNextImportGroup(groupNumber + 1);
if (importGroup.equals(nextGroup)) {
if (separateLineBetweenGroups && previousImport != null
if (separateLineBetweenGroups
&& !hasEmptyLineBefore(importObject.getLineNumber())) {
log(importObject.getLineNumber(), MSG_LINE_SEPARATOR,
fullImportIdent);

16
src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
View File

@ -207,6 +207,22 @@ public class CustomImportOrderCheckTest extends BaseCheckTestSupport {
+ "InputCustomImportOrderSamePackage.java").getCanonicalPath(), expected);
}
@Test
public void testWithoutLineSeparator2() throws Exception {
final DefaultConfiguration checkConfig =
createCheckConfig(CustomImportOrderCheck.class);
checkConfig.addAttribute("separateLineBetweenGroups", "false");
checkConfig.addAttribute("customImportOrderRules",
"STATIC###STANDARD_JAVA_PACKAGE");
checkConfig.addAttribute("sortImportsInGroupAlphabetically", "true");
final String[] expected = {
"4: " + getCheckMessage(MSG_LEX, "java.io.File.createTempFile"),
};
verify(checkConfig, getPath("imports" + File.separator
+ "InputCustomImportOrder_NoSeparator.java"), expected);
}
@Test
public void testNoValid() throws Exception {
final DefaultConfiguration checkConfig =

12
src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoSeparator.java Normal file
View File

@ -0,0 +1,12 @@
package java.util.concurrent;
import static java.awt.Button.ABORT;
import static javax.swing.WindowConstants.*;
import static java.io.File.createTempFile;
import java.util.*;
import java.util.StringTokenizer;
import com.puppycrawl.tools.*;
import com.*;
import org.apache.*;
public class InputCustomImportOrder_NoSeparator {
}