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

Issue #1288: 'AbstractTypeParameterNameCheck' refactored, UT coverage improved

This commit is contained in:
Ruslan Diachenko 2015-07-08 23:07:40 +01:00
parent 2441120489
commit 20d8e4338d
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -1190,7 +1190,6 @@
<regex><pattern>.*.checks.naming.AbstractAccessControlNameCheck</pattern><branchRate>95</branchRate><lineRate>80</lineRate></regex>
<regex><pattern>.*.checks.naming.AbstractClassNameCheck</pattern><branchRate>100</branchRate><lineRate>90</lineRate></regex>
<regex><pattern>.*.checks.naming.AbstractNameCheck</pattern><branchRate>100</branchRate><lineRate>87</lineRate></regex>
<regex><pattern>.*.checks.naming.AbstractTypeParameterNameCheck</pattern><branchRate>75</branchRate><lineRate>81</lineRate></regex>
<regex><pattern>.*.checks.regexp.CommentSuppressor</pattern><branchRate>75</branchRate><lineRate>100</lineRate></regex>
<regex><pattern>.*.checks.regexp.DetectorOptions</pattern><branchRate>100</branchRate><lineRate>96</lineRate></regex>

16
src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java
View File

@ -34,8 +34,6 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
*/
public abstract class AbstractTypeParameterNameCheck
extends AbstractNameCheck {
/** the location of the type parameter **/
private int location;
/**
* Creates a new <code>AbstractTypeParameterNameCheck</code> instance.
@ -59,21 +57,11 @@ public abstract class AbstractTypeParameterNameCheck
};
}
@Override
public final void init() {
this.location = getLocation();
}
@Override
protected final boolean mustCheckName(DetailAST ast) {
DetailAST location =
final DetailAST location =
ast.getParent().getParent();
if (location.getType() == TokenTypes.MODIFIERS) {
location = location.getParent();
}
return location.getType() == this.location;
return location.getType() == getLocation();
}
/**

17
src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeParameterNameTest.java
View File

@ -19,14 +19,16 @@
package com.puppycrawl.tools.checkstyle.checks.naming;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
import java.io.File;
import org.junit.Assert;
import org.junit.Test;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
public class TypeParameterNameTest
extends BaseCheckTestSupport {
@ -130,4 +132,15 @@ public class TypeParameterNameTest
};
verify(checkConfig, getPath("naming" + File.separator + "InputTypeParameterName.java"), expected);
}
@Test
public void testGetAcceptableTokens() {
AbstractTypeParameterNameCheck typeParameterNameCheckObj = new ClassTypeParameterNameCheck();
int[] actual = typeParameterNameCheckObj.getAcceptableTokens();
int[] expected = new int[] {
TokenTypes.TYPE_PARAMETER,
};
Assert.assertNotNull(actual);
Assert.assertArrayEquals(expected, actual);
}
}