diff options
author | Dmytro Kytsmen <dmitrokytsmen@gmail.com> | 2017-05-01 14:17:29 +0300 |
---|---|---|
committer | rnveach <rveach02@gmail.com> | 2017-05-01 15:00:01 -0400 |
commit | c3866aa5386105571463367a098314b3031c1b13 (patch) | |
tree | a1674b4c3807e6cdd3fffcaf2c91de1338e2b5ad /src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming | |
parent | 396a285549e89f618bab45b987c350dd1326379c (diff) | |
download | checkstyle-c3866aa5386105571463367a098314b3031c1b13.tar.gz |
Issue #4158: Split and Organize Checkstyle inputs by Test for MethodName
Diffstat (limited to 'src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming')
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameEqualClassName.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethNameEqualClsName.java) | 14 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameExtra.java) | 2 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameOverridenMethods.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameOverridenMethods.java) | 2 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameSimple.java | 225 |
4 files changed, 234 insertions, 9 deletions
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethNameEqualClsName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameEqualClassName.java index 573d66e7a..277ab486f 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethNameEqualClsName.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameEqualClassName.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.methodname; /** * Test input for MethodNameCheck specifically @@ -6,15 +6,15 @@ package com.puppycrawl.tools.checkstyle.checks.naming; * * @author Travis Schneeberger */ -public class InputMethNameEqualClsName { +public class InputMethodNameEqualClassName { //illegal name - public int InputMethNameEqualClsName() { + public int InputMethodNameEqualClassName() { return 0; } //illegal name - private int PRIVATEInputMethNameEqualClsName() { + private int PRIVATEInputMethodNameEqualClassName() { return 0; } @@ -25,16 +25,16 @@ public class InputMethNameEqualClsName { } //OK name - name of the outter class's ctor - public int InputMethNameEqualClsName() { + public int InputMethodNameEqualClassName() { return 0; } } public void anotherMethod() { - new InputMethNameEqualClsName() { + new InputMethodNameEqualClassName() { //illegal name - public int InputMethNameEqualClsName() { + public int InputMethodNameEqualClassName() { return 1; } }; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameExtra.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java index 8aa1c970b..239e00255 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameExtra.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameExtra.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.methodname; public class InputMethodNameExtra { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameOverridenMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameOverridenMethods.java index 396dcdb4a..c253ffaf9 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMethodNameOverridenMethods.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameOverridenMethods.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; +package com.puppycrawl.tools.checkstyle.checks.naming.methodname; public class InputMethodNameOverridenMethods extends SomeClass { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameSimple.java new file mode 100644 index 000000000..f096dddfd --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/methodname/InputMethodNameSimple.java @@ -0,0 +1,225 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: Feb-2001 +// Ignore error +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.naming.methodname; +import java.io.*; +/** + * Contains simple mistakes: + * - Long lines + * - Tabs + * - Format of variables and parameters + * - Order of modifiers + * @author Oliver Burn + **/ +final class InputMethodNameSimple +{ + // 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 InputMethodNameSimple() + { + // 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 InputMethodNameSimple2 +{ + /** 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 MyEnum1 +{ + /** ABC constant */ + ABC, + + /** XYZ constant */ + XYZ; + + /** Should be mSomeMemeber */ + private int someMember; +} |