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

This commit is contained in:
Ruslan Diachenko 2015-07-09 00:01:10 +01:00 committed by Roman Ivanov
parent 1d932b1131
commit f395e1d7fd
3 changed files with 31 additions and 8 deletions

View File

@ -1188,7 +1188,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.regexp.CommentSuppressor</pattern><branchRate>75</branchRate><lineRate>100</lineRate></regex>
<regex><pattern>.*.checks.regexp.DetectorOptions</pattern><branchRate>100</branchRate><lineRate>96</lineRate></regex>

View File

@ -90,7 +90,7 @@ public final class AbstractClassNameCheck extends AbstractFormatCheck {
@Override
public int[] getRequiredTokens() {
return getDefaultTokens();
return new int[]{TokenTypes.CLASS_DEF};
}
@Override

View File

@ -19,15 +19,17 @@
package com.puppycrawl.tools.checkstyle.checks.naming;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.ILLEGAL_ABSTRACT_CLASS_NAME;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck.NO_ABSTRACT_CLASS_MODIFIER;
import java.io.File;
import org.junit.Assert;
import org.junit.Test;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck
.ILLEGAL_ABSTRACT_CLASS_NAME;
import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck
.NO_ABSTRACT_CLASS_MODIFIER;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
public class AbstractClassNameCheckTest extends BaseCheckTestSupport {
@Test
@ -94,4 +96,26 @@ public class AbstractClassNameCheckTest extends BaseCheckTestSupport {
verify(checkConfig, getPath("naming" + File.separator
+ "InputAbstractClassNameFormerFalsePositive.java"), expected);
}
@Test
public void testGetAcceptableTokens() {
AbstractClassNameCheck classNameCheckObj = new AbstractClassNameCheck();
int[] actual = classNameCheckObj.getAcceptableTokens();
int[] expected = new int[] {
TokenTypes.CLASS_DEF,
};
Assert.assertNotNull(actual);
Assert.assertArrayEquals(expected, actual);
}
@Test
public void testGetRequiredTokens() {
AbstractClassNameCheck classNameCheckObj = new AbstractClassNameCheck();
int[] actual = classNameCheckObj.getRequiredTokens();
int[] expected = new int[] {
TokenTypes.CLASS_DEF,
};
Assert.assertNotNull(actual);
Assert.assertArrayEquals(expected, actual);
}
}