From b8ca9f976501c36e77c6331c74de79c465486ca9 Mon Sep 17 00:00:00 2001
From: Ruslan Diachenko <rd.ryly@gmail.com>
Date: Mon, 6 Jul 2015 22:51:45 +0100
Subject: [PATCH] Issue #1288: 'AbbreviationAsWordInNameCheck' was refactored,
 UT coverage improved

---
 pom.xml                                               |  1 -
 .../checks/naming/AbbreviationAsWordInNameCheck.java  | 11 +++++------
 .../naming/AbbreviationAsWordInNameCheckTest.java     |  1 +
 ...viationAsWordInTypeNameCheckOverridableMethod.java |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2af8265e2..581e713c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -867,7 +867,6 @@
           <regex><pattern>.*.checks.metrics.NPathComplexityCheck</pattern><branchRate>100</branchRate><lineRate>90</lineRate></regex>
 
 
-          <regex><pattern>.*.checks.naming.AbbreviationAsWordInNameCheck</pattern><branchRate>93</branchRate><lineRate>100</lineRate></regex>
           <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>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
index d600f625e..b217bf65c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
@@ -245,12 +245,10 @@ public class AbbreviationAsWordInNameCheck extends Check {
     private static boolean isInterfaceDeclaration(DetailAST variableDefAst) {
         boolean result = false;
         final DetailAST astBlock = variableDefAst.getParent();
-        if (astBlock != null) {
-            final DetailAST astParent2 = astBlock.getParent();
-            if (astParent2 != null
-                    && astParent2.getType() == TokenTypes.INTERFACE_DEF) {
-                result = true;
-            }
+        final DetailAST astParent2 = astBlock.getParent();
+
+        if (astParent2.getType() == TokenTypes.INTERFACE_DEF) {
+            result = true;
         }
         return result;
     }
@@ -267,6 +265,7 @@ public class AbbreviationAsWordInNameCheck extends Check {
         for (DetailAST child : getChildren(methodModifiersAST)) {
             if (child.getType() == TokenTypes.ANNOTATION) {
                 final DetailAST annotationIdent = child.findFirstToken(TokenTypes.IDENT);
+
                 if (annotationIdent != null && "Override".equals(annotationIdent.getText())) {
                     result = true;
                     break;
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
index 40b44f868..02d995a32 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
@@ -296,6 +296,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
         warningMessage = getCheckMessage(MSG_KEY, expectedCapitalCount);
         checkConfig.addAttribute("allowedAbbreviationLength", String.valueOf(expectedCapitalCount));
         checkConfig.addAttribute("ignoreFinal", "false");
+        checkConfig.addAttribute("allowedAbbreviations", null);
 
         final String[] expected = {
         };
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java
index 17efb789c..c965d1ae2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java
@@ -18,7 +18,7 @@ abstract class NonAAAAbstractClassName1 extends Class1 {
 }
 
 class Class1 {
-    
+    @SuppressWarnings(value = { "" })
     protected void oveRRRRRrriddenMethod(){
         int a = 0;
         // blah-blah