diff options
8 files changed, 296 insertions, 35 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 22166adfc..35694ef73 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 @@ -37,7 +37,9 @@ public class ParameterNameCheckTest @Override protected String getPath(String filename) throws IOException { return super.getPath("checks" + File.separator - + "naming" + File.separator + filename); + + "naming" + File.separator + + "parametername" + File.separator + + filename); } @Test @@ -54,7 +56,7 @@ public class ParameterNameCheckTest createCheckConfig(ParameterNameCheck.class); checkConfig.addAttribute("format", "^NO_WAY_MATEY$"); final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputCatchOnly.java"), expected); + verify(checkConfig, getPath("InputParameterNameCatchOnly.java"), expected); } @Test @@ -71,7 +73,7 @@ public class ParameterNameCheckTest "71:34: " + getCheckMessage(MSG_INVALID_PATTERN, "badFormat2", pattern), "72:25: " + getCheckMessage(MSG_INVALID_PATTERN, "badFormat3", pattern), }; - verify(checkConfig, getPath("InputSimple.java"), expected); + verify(checkConfig, getPath("InputParameterName.java"), expected); } @Test @@ -80,7 +82,7 @@ public class ParameterNameCheckTest final DefaultConfiguration checkConfig = createCheckConfig(ParameterNameCheck.class); final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputSimple.java"), expected); + verify(checkConfig, getPath("InputParameterName.java"), expected); } @Test @@ -166,7 +168,7 @@ public class ParameterNameCheckTest checkConfig.addAttribute("format", "^[a-z][a-zA-Z0-9]*$"); checkConfig.addAttribute("ignoreOverridden", "true"); final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputOverrideAnnotationNoNPE.java"), expected); + verify(checkConfig, getPath("InputParameterNameOverrideAnnotationNoNPE.java"), expected); } @Test diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOverrideAnnotationNoNPE.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOverrideAnnotationNoNPE.java deleted file mode 100644 index 8295a120e..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOverrideAnnotationNoNPE.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; - -class InputOverrideAnnotationNoNPE -{ - // method with many parameters - void myMethod(int a, int b) { - - } - - // method with many parameters - void myMethod2(int a, int b) { - - } -} - -class Test extends InputOverrideAnnotationNoNPE -{ - @Override - void myMethod(int a, int b) { - - } - - @java.lang.Override - void myMethod2(int a, int b) { - - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAccessModifier.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputAccessModifier.java index a242550dd..0fa58b8d2 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAccessModifier.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputAccessModifier.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; public class InputAccessModifier { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOverrideAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputOverrideAnnotation.java index e4e40d126..3e7a91fce 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputOverrideAnnotation.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputOverrideAnnotation.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; public class InputOverrideAnnotation { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java new file mode 100644 index 000000000..d38b31e80 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterName.java @@ -0,0 +1,225 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: Feb-2001 +// Ignore error +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; +import java.io.*; +/** + * Contains simple mistakes: + * - Long lines + * - Tabs + * - Format of variables and parameters + * - Order of modifiers + * @author Oliver Burn + **/ +final class InputParameterName +{ + // Long line ---------------------------------------------------------------- + // Contains a tab -> <- + // Contains trailing whitespace -> + + // Name format tests + // + /** Invalid format **/ + public static final int badConstant = 2; + /** Valid format **/ + public static final int MAX_ROWS = 2; + + /** Invalid format **/ + private static int badStatic = 2; + /** Valid format **/ + private static int sNumCreated = 0; + + /** Invalid format **/ + private int badMember = 2; + /** Valid format **/ + private int mNumCreated1 = 0; + /** Valid format **/ + protected int mNumCreated2 = 0; + + /** commas are wrong **/ + private int[] mInts = new int[] {1,2, 3, + 4}; + + // + // Accessor tests + // + /** should be private **/ + public static int sTest1; + /** should be private **/ + protected static int sTest3; + /** should be private **/ + static int sTest2; + + /** should be private **/ + int mTest1; + /** should be private **/ + public int mTest2; + + // + // Parameter name format tests + // + + /** + * @return hack + * @param badFormat1 bad format + * @param badFormat2 bad format + * @param badFormat3 bad format + * @throws java.lang.Exception abc + **/ + int test1(int badFormat1,int badFormat2, + final int badFormat3) + throws java.lang.Exception + { + return 0; + } + + /** method that is 20 lines long **/ + private void longMethod() + { + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + } + + /** constructor that is 10 lines long **/ + private InputParameterName() + { + // a line + // a line + // a line + // a line + // a line + // a line + // a line + // a line + } + + /** test local variables */ + private void localVariables() + { + // normal decl + int abc = 0; + int ABC = 0; + + // final decls + final int cde = 0; + final int CDE = 0; + + // decl in for loop init statement + for (int k = 0; k < 1; k++) + { + String innerBlockVariable = ""; + } + for (int I = 0; I < 1; I++) + { + String InnerBlockVariable = ""; + } + } + + /** test method pattern */ + void ALL_UPPERCASE_METHOD() + { + } + + /** test illegal constant **/ + private static final int BAD__NAME = 3; + + // A very, very long line that is OK because it matches the regexp "^.*is OK.*regexp.*$" + // long line that has a tab -> <- and would be OK if tab counted as 1 char + // tabs that count as one char because of their position -> <- -> <-, OK + + /** some lines to test the error column after tabs */ + void errorColumnAfterTabs() + { + // with tab-width 8 all statements below start at the same column, + // with different combinations of ' ' and '\t' before the statement + int tab0 =1; + int tab1 =1; + int tab2 =1; + int tab3 =1; + int tab4 =1; + int tab5 =1; + } + + // FIXME: + /* FIXME: a + * FIXME: + * TODO + */ + /* NOTHING */ + /* YES */ /* FIXME: x */ /* YES!! */ + + /** test long comments **/ + void veryLong() + { + /* + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + blah blah blah blah + enough talk */ + } + + /** + * @see to lazy to document all args. Testing excessive # args + **/ + void toManyArgs(int aArg1, int aArg2, int aArg3, int aArg4, int aArg5, + int aArg6, int aArg7, int aArg8, int aArg9) + { + } +} + +/** Test class for variable naming in for each clauses. */ +class InputParameterName2 +{ + /** Some more Javadoc. */ + public void doSomething() + { + //"O" should be named "o" + for (Object O : new java.util.ArrayList()) + { + + } + } +} + +/** Test enum for member naming check */ +enum InputParameterNameEnum1 +{ + /** ABC constant */ + ABC, + + /** XYZ constant */ + XYZ; + + /** Should be mSomeMemeber */ + private int someMember; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java new file mode 100644 index 000000000..966114bdf --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameCatchOnly.java @@ -0,0 +1,34 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; + +/** + * Test case for skipping over catch names. + **/ +public class InputParameterNameCatchOnly { + int foo() { + if (System.currentTimeMillis() > 1000) + return 1; + + int test = 0; + + try + { + return 1; + } + catch (Exception e) + { + return 0; + } + } + + public InputParameterNameCatchOnly() + { + return; + } + + class InnerFoo + { + public void fooInnerMethod () + { + } + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java new file mode 100644 index 000000000..549e770fb --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameOverrideAnnotationNoNPE.java @@ -0,0 +1,27 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; + +class InputParameterNameOverrideAnnotationNoNPE +{ + // method with many parameters + void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) { + + } + + // method with many parameters + void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) { + + } +} + +class Test extends InputParameterNameOverrideAnnotationNoNPE +{ + @Override + void InputParameterNameOverrideAnnotationNoNPEMethod(int a, int b) { + + } + + @java.lang.Override + void InputParameterNameOverrideAnnotationNoNPEMethod2(int a, int b) { + + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputParameterNameReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java index 1047f7f89..cd450bf3c 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputParameterNameReceiver.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/parametername/InputParameterNameReceiver.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.parametername; public class InputParameterNameReceiver { public void foo4(InputParameterNameReceiver this) {} |