From f395e1d7fdda887d752bcc3a963adbee1d21e9b5 Mon Sep 17 00:00:00 2001 From: Ruslan Diachenko Date: Thu, 9 Jul 2015 00:01:10 +0100 Subject: [PATCH] Issue #1288: 'AbstractClassNameCheck' refactored, UT coverage improved --- pom.xml | 1 - .../checks/naming/AbstractClassNameCheck.java | 2 +- .../naming/AbstractClassNameCheckTest.java | 36 +++++++++++++++---- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5898eae39..f4717d3b8 100644 --- a/pom.xml +++ b/pom.xml @@ -1188,7 +1188,6 @@ .*.checks.naming.AbstractAccessControlNameCheck9580 - .*.checks.naming.AbstractClassNameCheck10090 .*.checks.regexp.CommentSuppressor75100 .*.checks.regexp.DetectorOptions10096 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java index d45f86f1b..a42bcf229 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java @@ -90,7 +90,7 @@ public final class AbstractClassNameCheck extends AbstractFormatCheck { @Override public int[] getRequiredTokens() { - return getDefaultTokens(); + return new int[]{TokenTypes.CLASS_DEF}; } @Override diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java index e07be9f5e..403dd8aa1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java @@ -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); + } }