From fa8b3ed7e1dfa251d0092263c77ddedbfd1d348e Mon Sep 17 00:00:00 2001
From: Ruslan Diachenko <rd.ryly@gmail.com>
Date: Tue, 7 Jul 2015 23:37:16 +0100
Subject: [PATCH] Issue #1288: 'ParameterNameCheck' refactored, UT coverage
 improved

---
 pom.xml                                       |  1 -
 .../checks/naming/ParameterNameCheck.java     |  4 +---
 .../checks/naming/ParameterNameCheckTest.java | 20 ++++++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index bba7a8b2d..8970c5e44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -877,7 +877,6 @@
           <regex><pattern>.*.checks.naming.MemberNameCheck</pattern><branchRate>91</branchRate><lineRate>85</lineRate></regex>
           <regex><pattern>.*.checks.naming.MethodNameCheck</pattern><branchRate>100</branchRate><lineRate>93</lineRate></regex>
           <regex><pattern>.*.checks.naming.PackageNameCheck</pattern><branchRate>100</branchRate><lineRate>88</lineRate></regex>
-          <regex><pattern>.*.checks.naming.ParameterNameCheck</pattern><branchRate>75</branchRate><lineRate>80</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>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
index 37658fbf0..94d364c78 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java
@@ -69,8 +69,6 @@ public class ParameterNameCheck
 
     @Override
     protected boolean mustCheckName(DetailAST ast) {
-        return !(
-            ast.getParent() != null
-                && ast.getParent().getType() == TokenTypes.LITERAL_CATCH);
+        return ast.getParent().getType() != TokenTypes.LITERAL_CATCH;
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
index 02627b4be..00a6f036e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheckTest.java
@@ -19,11 +19,14 @@
 
 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.AbstractNameCheck.MSG_INVALID_PATTERN;
+
+import org.junit.Assert;
 import org.junit.Test;
 
-import static com.puppycrawl.tools.checkstyle.checks.naming.AbstractNameCheck.MSG_INVALID_PATTERN;
+import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 public class ParameterNameCheckTest
     extends BaseCheckTestSupport {
@@ -64,4 +67,15 @@ public class ParameterNameCheckTest
         };
         verify(checkConfig, getPath("InputSimple.java"), expected);
     }
+
+    @Test
+    public void testGetAcceptableTokens() {
+        ParameterNameCheck parameterNameCheckObj = new ParameterNameCheck();
+        int[] actual = parameterNameCheckObj.getAcceptableTokens();
+        int[] expected = new int[] {
+            TokenTypes.PARAMETER_DEF,
+        };
+        Assert.assertNotNull(actual);
+        Assert.assertArrayEquals(expected, actual);
+    }
 }