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

Change default value of property "format" to "^Abstract.*$" in AbstractClassNameCheck #1279

This commit is contained in:
Bhavik Patel 2015-07-04 10:48:17 +05:30 committed by Roman Ivanov
parent ac5dbc7363
commit 93c68168f3
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
View File

@ -54,7 +54,7 @@ public final class AbstractClassNameCheck extends AbstractFormatCheck {
public static final String NO_ABSTRACT_CLASS_MODIFIER = "no.abstract.class.modifier";
/** Default format for abstract class names */
private static final String DEFAULT_FORMAT = "^Abstract.+$|^.*Factory$";
private static final String DEFAULT_FORMAT = "^Abstract.+$";
/** whether to ignore checking the modifier */
private boolean ignoreModifier;

22
src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java
View File

@ -37,13 +37,12 @@ public class AbstractClassNameCheckTest extends BaseCheckTestSupport {
checkConfig.addAttribute("ignoreName", "false");
checkConfig.addAttribute("ignoreModifier", "true");
final String pattern = "^Abstract.+$|^.*Factory$";
final String pattern = "^Abstract.+$";
final String[] expected = {
"3:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", pattern),
"6:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", pattern),
"9:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "FactoryWithBadName", pattern),
"13:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern),
"10:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern),
};
verify(checkConfig, getPath("naming" + File.separator + "InputAbstractClassName.java"), expected);
@ -56,10 +55,8 @@ public class AbstractClassNameCheckTest extends BaseCheckTestSupport {
checkConfig.addAttribute("ignoreModifier", "false");
final String[] expected = {
"26:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
"29:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "Class1Factory"),
"33:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
"38:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "WellNamedFactory"),
"18:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
"22:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
};
verify(checkConfig, getPath("naming" + File.separator + "InputAbstractClassName.java"), expected);
@ -71,17 +68,14 @@ public class AbstractClassNameCheckTest extends BaseCheckTestSupport {
checkConfig.addAttribute("ignoreName", "false");
checkConfig.addAttribute("ignoreModifier", "false");
final String pattern = "^Abstract.+$|^.*Factory$";
final String pattern = "^Abstract.+$";
final String[] expected = {
"3:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName", pattern),
"6:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName", pattern),
"9:1: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "FactoryWithBadName", pattern),
"13:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern),
"26:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
"29:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "Class1Factory"),
"33:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
"38:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "WellNamedFactory"),
"10:5: " + getCheckMessage(ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass", pattern),
"18:1: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
"22:5: " + getCheckMessage(NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
};
verify(checkConfig, getPath("naming" + File.separator + "InputAbstractClassName.java"), expected);

20
src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputAbstractClassName.java
View File

@ -2,39 +2,23 @@ package com.puppycrawl.tools.checkstyle.naming;
abstract public class InputAbstractClassName {
}
// abstract --> ^Abstract.*$|^.*Factory$
// abstract --> ^Abstract.*$
abstract class NonAbstractClassName {
}
abstract class FactoryWithBadName {
}
abstract class AbstractClassName {
abstract class NonAbstractInnerClass {
}
}
abstract class ClassFactory {
abstract class WellNamedFactory {
}
}
class NonAbstractClass {
}
//^Abstract.*$|^.*Factory$ --> abstract
//^Abstract.*$ --> abstract
class AbstractClass {
}
class Class1Factory {
}
abstract class AbstractClassName2 {
class AbstractInnerClass {
}
}
abstract class Class2Factory {
class WellNamedFactory {
}
}