Skip to content

Commit 0ddd211

Browse files
committed
fix tests
1 parent 7ba9541 commit 0ddd211

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

code-assert/src/main/java/guru/nidi/codeassert/checkstyle/StyleChecks.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,17 @@ protected <T extends StyleChecks> T withParam(String name, Object value) {
5151
}
5252

5353
public static final class Google extends StyleChecks {
54+
private static final String VARIABLE_PATTERN = "^[a-z][a-z0-9][a-zA-Z0-9]*$";
55+
5456
protected Google() {
5557
super("/guru/nidi/codeassert/checkstyle/google_checks.xml",
5658
MAX_LINE_LEN, 100,
5759
"indent-basicOffset", 2, "indent-case", 2, "indent-arrayInit", 2, "indent-throws", 4,
5860
"indent-lineWrapping", 4,
59-
"parameterName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
60-
"catchParameterName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
61-
"localVariableName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
62-
"memberName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
61+
"parameterName", VARIABLE_PATTERN,
62+
"catchParameterName", VARIABLE_PATTERN,
63+
"localVariableName", VARIABLE_PATTERN,
64+
"memberName", VARIABLE_PATTERN,
6365
"methodName", "^[a-z][a-z0-9][a-zA-Z0-9_]*$",
6466
"emptyLine-tokens", asList(PACKAGE_DEF, IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
6567
STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF));

code-assert/src/test/java/guru/nidi/codeassert/EatYourOwnDogfoodTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ protected CheckstyleResult analyzeCheckstyle() {
115115
.just(In.classes("Coverage", "Constant").ignore("empty.line.separator"))
116116
.just(In.classes("BaseCollector", "In", "Location", "SourceFileParser").ignore("overload.methods.declaration"))
117117
.just(In.clazz(PmdRulesets.class).ignore("abbreviation.as.word"))
118-
.just(In.classes("SignatureParser").ignore("name.invalidPattern"))
119118
.just(In.classes("DependencyMap").ignore("tag.continuation.indent"));
120119

121120
return new CheckstyleAnalyzer(AnalyzerConfig.maven().main(), PredefConfig.adjustedGoogleStyleChecks(), collector).analyze();

0 commit comments

Comments
 (0)