2 files changed, 137 insertions, 0 deletions
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 b356014c9..cc0cc7c61 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
@@ -29,6 +29,7 @@ import org.junit.Test;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.api.Scope;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
 
@@ -139,6 +140,68 @@ public class ParameterNameCheckTest
     }
 
     @Test
+    public void testScope()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(ParameterNameCheck.class);
+        checkConfig.addAttribute("format", "^h$");
+        checkConfig.addAttribute("scope", Scope.PUBLIC.getName());
+
+        final String pattern = "^h$";
+
+        final String[] expected = {
+            "5:27: " + getCheckMessage(MSG_INVALID_PATTERN, "pubconstr", pattern),
+            "9:31: " + getCheckMessage(MSG_INVALID_PATTERN, "inner", pattern),
+            "19:24: " + getCheckMessage(MSG_INVALID_PATTERN, "pubpub", pattern),
+            "30:21: " + getCheckMessage(MSG_INVALID_PATTERN, "pubifc", pattern),
+            "44:24: " + getCheckMessage(MSG_INVALID_PATTERN, "packpub", pattern),
+            "60:21: " + getCheckMessage(MSG_INVALID_PATTERN, "packifc", pattern),
+            };
+        verify(checkConfig, getPath("InputScope.java"), expected);
+    }
+
+    @Test
+    public void testExcludeScope()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(ParameterNameCheck.class);
+        checkConfig.addAttribute("format", "^h$");
+        checkConfig.addAttribute("excludeScope", Scope.PROTECTED.getName());
+
+        final String pattern = "^h$";
+
+        final String[] expected = {
+            "23:17: " + getCheckMessage(MSG_INVALID_PATTERN, "pubpack", pattern),
+            "25:25: " + getCheckMessage(MSG_INVALID_PATTERN, "pubpriv", pattern),
+            "48:17: " + getCheckMessage(MSG_INVALID_PATTERN, "packpack", pattern),
+            "50:25: " + getCheckMessage(MSG_INVALID_PATTERN, "packpriv", pattern),
+            "68:27: " + getCheckMessage(MSG_INVALID_PATTERN, "lexp", pattern),
+            "70:23: " + getCheckMessage(MSG_INVALID_PATTERN, "limp", pattern),
+            };
+        verify(checkConfig, getPath("InputScope.java"), expected);
+    }
+
+    @Test
+    public void testScopeExcludeScope()
+            throws Exception {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(ParameterNameCheck.class);
+        checkConfig.addAttribute("format", "^h$");
+        checkConfig.addAttribute("scope", Scope.PACKAGE.getName());
+        checkConfig.addAttribute("excludeScope", Scope.PUBLIC.getName());
+
+        final String pattern = "^h$";
+
+        final String[] expected = {
+            "21:27: " + getCheckMessage(MSG_INVALID_PATTERN, "pubprot", pattern),
+            "23:17: " + getCheckMessage(MSG_INVALID_PATTERN, "pubpack", pattern),
+            "46:27: " + getCheckMessage(MSG_INVALID_PATTERN, "packprot", pattern),
+            "48:17: " + getCheckMessage(MSG_INVALID_PATTERN, "packpack", pattern),
+            };
+        verify(checkConfig, getPath("InputScope.java"), expected);
+    }
+
+    @Test
     public void testIsOverriddenNoNullPointerException()
             throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(ParameterNameCheck.class);
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputScope.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputScope.java
new file mode 100644
index 000000000..aae4a4c34
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputScope.java
@@ -0,0 +1,74 @@
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+public class InputScope {
+
+    public InputScope(int pubconstr) {}
+
+    public void v1(int h) {
+        new Object () {
+            public void i(int inner) {}
+        };
+    }
+
+    protected void v4(int h) {}
+
+    void v2(int h) {}
+
+    private void v3(int h) {}
+
+    public void i1(int pubpub) {}
+
+    protected void i4(int pubprot) {}
+
+    void i2(int pubpack) {}
+
+    private void i3(int pubpriv) {}
+
+    public interface InterfaceScope {
+        void v1(int h);
+
+        void i1(int pubifc);
+    }
+}
+
+class PrivateScope {
+
+    public void v1(int h) {}
+
+    protected void v4(int h) {}
+
+    void v2(int h) {}
+
+    private void v3(int h) {}
+
+    public void i1(int packpub) {}
+
+    protected void i4(int packprot) {}
+
+    void i2(int packpack) {}
+
+    private void i3(int packpriv) {
+        try {
+            /* Make sure catch var is ignored */
+        } catch (Exception exc) {
+        }
+    }
+
+    interface InterfaceScope {
+        void v1(int h);
+
+        void i1(int packifc);
+    }
+
+    interface FuncIfc {
+        void a(int h);
+    }
+
+    public void l() {
+        FuncIfc l1 = (int lexp)->{};
+
+        FuncIfc l2 = (limp)->{};
+    }
+}
+
+