From 39518ec59bd13299b13605e4f42f83cec62a787b Mon Sep 17 00:00:00 2001 From: Akshita Date: Thu, 13 Apr 2017 23:22:30 +0530 Subject: Issue #4208: Split and Organize Checkstyle inputs by Test for StaticVariableName --- .../checks/naming/InputStaticVariableName.java | 16 -- .../InputStaticVariableName.java | 16 ++ .../InputStaticVariableName1.java | 225 +++++++++++++++++++++ 3 files changed, 241 insertions(+), 16 deletions(-) delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName1.java (limited to 'src/test/resources') diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java deleted file mode 100644 index 522caf889..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputStaticVariableName.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; - -public class InputStaticVariableName { - - /** Interface fields should be skipped */ - interface A { - public static int VAL_0 = 1; - } - - /** Annotation fields should be skipped */ - @interface B { - String name() default ""; - int version() default 0; - public static int VAL_1 = 0; - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java new file mode 100644 index 000000000..c8674db9b --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName.java @@ -0,0 +1,16 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename; + +public class InputStaticVariableName { + + /** Interface fields should be skipped */ + interface A { + public static int VAL_0 = 1; + } + + /** Annotation fields should be skipped */ + @interface B { + String name() default ""; + int version() default 0; + public static int VAL_1 = 0; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName1.java new file mode 100644 index 000000000..1914b7e60 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/staticvariablename/InputStaticVariableName1.java @@ -0,0 +1,225 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: Feb-2001 +// Ignore error +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.naming.staticvariablename; +import java.io.*; +/** + * Contains simple mistakes: + * - Long lines + * - Tabs + * - Format of variables and parameters + * - Order of modifiers + * @author Oliver Burn + **/ +final class InputStaticVariableName1 +{ + // 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 InputStaticVariableName1() + { + // 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 InputStaticVariableName2 +{ + /** 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; +} -- cgit v1.2.3