From 4610a7176af9ac6c77d474593f6c4fb76640575d Mon Sep 17 00:00:00 2001 From: Dmytro Kytsmen Date: Mon, 1 May 2017 14:43:49 +0300 Subject: Issue #4151: Split and Organize Checkstyle inputs by Test for MemberName --- .../tools/checkstyle/checks/naming/InputInner.java | 79 -------- .../checkstyle/checks/naming/InputMemberName.java | 14 -- .../checks/naming/InputMemberNameExtended.java | 83 -------- .../checks/naming/membername/InputMemberName.java | 14 ++ .../naming/membername/InputMemberNameExtended.java | 83 ++++++++ .../naming/membername/InputMemberNameInner.java | 79 ++++++++ .../naming/membername/InputMemberNameSimple.java | 225 +++++++++++++++++++++ 7 files changed, 401 insertions(+), 176 deletions(-) delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberName.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameExtended.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameInner.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameSimple.java (limited to 'src/test/resources/com/puppycrawl/tools/checkstyle') diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java deleted file mode 100644 index 86f1d3e6a..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputInner.java +++ /dev/null @@ -1,79 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// Test case file for checkstyle. -// Created: 2001 -//////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.naming; - -/** - * Tests having inner types - * @author Oliver Burn - **/ -class InputInner -{ - // Ignore - two errors - class InnerInner2 - { - // Ignore - public int fData; - } - - // Ignore - 2 errors - interface InnerInterface2 - { - // Ignore - should be all upper case - String data = "zxzc"; - - // Ignore - class InnerInterfaceInnerClass - { - // Ignore - need Javadoc and made private - public int rData; - - /** needs to be made private unless allowProtected. */ - protected int protectedVariable; - - /** needs to be made private unless allowPackage. */ - int packageVariable; - } - } - - /** demonstrate bug in handling static final **/ - protected static Object sWeird = new Object(); - /** demonstrate bug in handling static final **/ - static Object sWeird2 = new Object(); - - /** demonstrate bug in local final variable */ - public interface Inter - { - } - - public static void main() - { - Inter m = new Inter() - { - private static final int CDS = 1; - - private int ABC; - }; - } - - /** annotation field incorrectly named. */ - @interface InnerAnnotation - { - /** Ignore - should be all upper case. */ - String data = "zxzc"; - } - - /** enum with public member variable */ - enum InnerEnum - { - /** First constant */ - A, - - /** Second constant */ - B; - - /** Should be private */ - public int someValue; - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java deleted file mode 100644 index 4e1bf7e7e..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberName.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; - -public class InputMemberName -{ - public int mPublic; - protected int mProtected; - int mPackage;//comment - private int mPrivate; - - public int _public; - protected int _protected; - int _package; - private int _private; -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java deleted file mode 100644 index e1a0f49b1..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputMemberNameExtended.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming; - - - - -public class InputMemberNameExtended -{ - public int mPublic; - protected int mProtected; - int mPackage; - private int mPrivate; - - public int _public; - protected int _protected; - int _package; - private int _private; - - class Inner { - public int mPublic; - protected int mProtected; - int mPackage; - private int mPrivate; - - public int _public; - protected int _protected; - int _package; - private int _private; - } - - Inner anon = new Inner() { - public int mPublic; - protected int mProtected; - int mPackage; - private int mPrivate; - - public int _public; - protected int _protected; - int _package; - private int _private; - }; -} - -interface In -{ - public int mPublic = 0; - int mProtected = 0; - int mPackage = 0; - int mPrivate = 0; - - public int _public = 0; - int _protected = 0; - int _package = 0; - int _private = 0; -} - -enum Direction { - - NORTH(1), - SOUTH(-1), - EAST(-2), - WEST(2); - - public int mPublic = 0; - int mProtected = 0; - int mPackage = 0; - int mPrivate = 0; - - public int _public = 0; - int _protected = 0; - int _package = 0; - int _private = 0; - - Direction(int code){ - this.code=code; - } - protected int code; - public int getCode() { - return this.code; - } - static Direction getOppositeDirection(Direction d){ - return null; - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberName.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberName.java new file mode 100644 index 000000000..9d85cbe61 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberName.java @@ -0,0 +1,14 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.membername; + +public class InputMemberName +{ + public int mPublic; + protected int mProtected; + int mPackage;//comment + private int mPrivate; + + public int _public; + protected int _protected; + int _package; + private int _private; +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameExtended.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameExtended.java new file mode 100644 index 000000000..10178a91f --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameExtended.java @@ -0,0 +1,83 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.membername; + + + + +public class InputMemberNameExtended +{ + public int mPublic; + protected int mProtected; + int mPackage; + private int mPrivate; + + public int _public; + protected int _protected; + int _package; + private int _private; + + class Inner { + public int mPublic; + protected int mProtected; + int mPackage; + private int mPrivate; + + public int _public; + protected int _protected; + int _package; + private int _private; + } + + Inner anon = new Inner() { + public int mPublic; + protected int mProtected; + int mPackage; + private int mPrivate; + + public int _public; + protected int _protected; + int _package; + private int _private; + }; +} + +interface In +{ + public int mPublic = 0; + int mProtected = 0; + int mPackage = 0; + int mPrivate = 0; + + public int _public = 0; + int _protected = 0; + int _package = 0; + int _private = 0; +} + +enum Direction { + + NORTH(1), + SOUTH(-1), + EAST(-2), + WEST(2); + + public int mPublic = 0; + int mProtected = 0; + int mPackage = 0; + int mPrivate = 0; + + public int _public = 0; + int _protected = 0; + int _package = 0; + int _private = 0; + + Direction(int code){ + this.code=code; + } + protected int code; + public int getCode() { + return this.code; + } + static Direction getOppositeDirection(Direction d){ + return null; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameInner.java new file mode 100644 index 000000000..289ae7d41 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameInner.java @@ -0,0 +1,79 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: 2001 +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.naming.membername; + +/** + * Tests having inner types + * @author Oliver Burn + **/ +class InputMemberNameInner +{ + // Ignore - two errors + class InnerInner2 + { + // Ignore + public int fData; + } + + // Ignore - 2 errors + interface InnerInterface2 + { + // Ignore - should be all upper case + String data = "zxzc"; + + // Ignore + class InnerInterfaceInnerClass + { + // Ignore - need Javadoc and made private + public int rData; + + /** needs to be made private unless allowProtected. */ + protected int protectedVariable; + + /** needs to be made private unless allowPackage. */ + int packageVariable; + } + } + + /** demonstrate bug in handling static final **/ + protected static Object sWeird = new Object(); + /** demonstrate bug in handling static final **/ + static Object sWeird2 = new Object(); + + /** demonstrate bug in local final variable */ + public interface Inter + { + } + + public static void main() + { + Inter m = new Inter() + { + private static final int CDS = 1; + + private int ABC; + }; + } + + /** annotation field incorrectly named. */ + @interface InnerAnnotation + { + /** Ignore - should be all upper case. */ + String data = "zxzc"; + } + + /** enum with public member variable */ + enum InnerEnum + { + /** First constant */ + A, + + /** Second constant */ + B; + + /** Should be private */ + public int someValue; + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameSimple.java new file mode 100644 index 000000000..9ac762f2a --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/membername/InputMemberNameSimple.java @@ -0,0 +1,225 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: Feb-2001 +// Ignore error +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.naming.membername; +import java.io.*; +/** + * Contains simple mistakes: + * - Long lines + * - Tabs + * - Format of variables and parameters + * - Order of modifiers + * @author Oliver Burn + **/ +final class InputMemberNameSimple +{ + // 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 InputMemberNameSimple() + { + // 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 InputMemberNameSimple2 +{ + /** 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