From a019b35e9abaa72f8cc28d04965a5182026c99c9 Mon Sep 17 00:00:00 2001 From: rnveach Date: Tue, 12 Sep 2017 12:33:51 -0400 Subject: Issue #3891: fixed remaining invalid input names and locations --- .../InputOverloadMethodsDeclarationOrder.java | 119 -------------------- .../InputOverloadMethodsDeclarationOrder.java | 119 ++++++++++++++++++++ ...tractionCouplingExcludedPackagesAllIgnored.java | 8 +- ...ctionCouplingExcludedPackagesCommonPackage.java | 8 +- ...tionCouplingExcludedPackagesDirectPackages.java | 8 +- .../inputs/a/aa/AAClass.java | 4 + .../inputs/a/ab/ABClass.java | 4 + .../inputs/b/BClass.java | 4 + .../inputs/c/CClass.java | 4 + ...FanOutComplexityExcludedPackagesAllIgnored.java | 8 +- ...OutComplexityExcludedPackagesCommonPackage.java | 8 +- ...utComplexityExcludedPackagesDirectPackages.java | 8 +- .../classfanoutcomplexity/inputs/a/aa/AAClass.java | 4 + .../classfanoutcomplexity/inputs/a/ab/ABClass.java | 4 + .../classfanoutcomplexity/inputs/b/BClass.java | 4 + .../classfanoutcomplexity/inputs/c/CClass.java | 4 + .../checks/metrics/inputs/a/aa/AAClass.java | 4 - .../checks/metrics/inputs/a/ab/ABClass.java | 4 - .../checkstyle/checks/metrics/inputs/b/BClass.java | 4 - .../checkstyle/checks/metrics/inputs/c/CClass.java | 4 - ...iationAsWordInNameAbstractMultisetSetCount.java | 18 ---- ...tAbbreviationAsWordInNameOverridableMethod.java | 39 ------- .../InputAbbreviationAsWordInNameReceiver.java | 9 -- .../InputAbbreviationAsWordInNameType.java | 120 --------------------- ...iationAsWordInNameAbstractMultisetSetCount.java | 18 ++++ ...tAbbreviationAsWordInNameOverridableMethod.java | 39 +++++++ .../InputAbbreviationAsWordInNameReceiver.java | 9 ++ .../InputAbbreviationAsWordInNameType.java | 120 +++++++++++++++++++++ .../whitespace/whitespacearound/InputBraces.java | 115 -------------------- .../InputWhitespaceAroundBraces.java | 115 ++++++++++++++++++++ 30 files changed, 476 insertions(+), 460 deletions(-) delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/aa/AAClass.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/ab/ABClass.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/b/BClass.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/c/CClass.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java (limited to 'src/test/resources/com/puppycrawl/tools/checkstyle/checks') diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java deleted file mode 100644 index b56dd4fcc..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethoddeclaration; - - - -class OverloadInput -{ - public void overloadMethod(int i) - { - //some foo code - } - - public void overloadMethod(String s) - { - //some foo code - } - - public void overloadMethod(boolean b) - { - //some foo code - } - - public void fooMethod() - { - - } - - //error because overloads never split - public void overloadMethod(String s, Boolean b, int i) //warn - { - //some foo code - } - - OverloadInput anonynous = new OverloadInput() - { - public void overloadMethod(int i) - { - //some foo code - } - - public void overloadMethod(String s) - { - //some foo code - } - - public void overloadMethod(boolean b) - { - //some foo code - } - - public void fooMethod() - { - - } - - //error because overloads never split - public void overloadMethod(String s, Boolean b, int i) //warn - { - //some foo code - } - }; -} - -interface Fooable -{ - public abstract void foo(int i); - public abstract void foo(String s); - public abstract void noFoo(); - public abstract void foo(String s, Boolean b, int i); //warn -} - -enum FooType { - Strategy(""), - Shooter(""), - RPG(""); - - private String description; - - private FooType(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public void overloadMethod(int i) - { - //some foo code - } - - public void overloadMethod(String s) - { - //some foo code - } - - public void overloadMethod(boolean b) - { - //some foo code - } - - public void fooMethod() - { - - } - - //error because overloads never split - public void overloadMethod(String s, Boolean b, int i) //warn - { - //some foo code - } -} - -@interface ClassPreamble { - String author(); -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java new file mode 100644 index 000000000..2aa3520db --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java @@ -0,0 +1,119 @@ +package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethodsdeclarationorder; + + + +class OverloadInput +{ + public void overloadMethod(int i) + { + //some foo code + } + + public void overloadMethod(String s) + { + //some foo code + } + + public void overloadMethod(boolean b) + { + //some foo code + } + + public void fooMethod() + { + + } + + //error because overloads never split + public void overloadMethod(String s, Boolean b, int i) //warn + { + //some foo code + } + + OverloadInput anonynous = new OverloadInput() + { + public void overloadMethod(int i) + { + //some foo code + } + + public void overloadMethod(String s) + { + //some foo code + } + + public void overloadMethod(boolean b) + { + //some foo code + } + + public void fooMethod() + { + + } + + //error because overloads never split + public void overloadMethod(String s, Boolean b, int i) //warn + { + //some foo code + } + }; +} + +interface Fooable +{ + public abstract void foo(int i); + public abstract void foo(String s); + public abstract void noFoo(); + public abstract void foo(String s, Boolean b, int i); //warn +} + +enum FooType { + Strategy(""), + Shooter(""), + RPG(""); + + private String description; + + private FooType(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public void overloadMethod(int i) + { + //some foo code + } + + public void overloadMethod(String s) + { + //some foo code + } + + public void overloadMethod(boolean b) + { + //some foo code + } + + public void fooMethod() + { + + } + + //error because overloads never split + public void overloadMethod(String s, Boolean b, int i) //warn + { + //some foo code + } +} + +@interface ClassPreamble { + String author(); +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java index 3221c311f..a94052450 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass; public class InputClassDataAbstractionCouplingExcludedPackagesAllIgnored { // total: ok public AAClass aa = new AAClass(); // ok diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java index cfed1a652..9f05852d9 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass; public class InputClassDataAbstractionCouplingExcludedPackagesCommonPackage { // total: ok public AAClass aa = new AAClass(); // ok diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java index 4fc3ca739..35f20a321 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c.CClass; public class InputClassDataAbstractionCouplingExcludedPackagesDirectPackages { // total: 2 violations public AAClass aa = new AAClass(); // violation diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java new file mode 100644 index 000000000..1398980c8 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.aa; + +public class AAClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java new file mode 100644 index 000000000..252f5d298 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.a.ab; + +public class ABClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java new file mode 100644 index 000000000..a9a003696 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.b; + +public class BClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java new file mode 100644 index 000000000..f08948b15 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c; + +public class CClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java index 40f3a385f..b3ace98da 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c.CClass; public class InputClassFanOutComplexityExcludedPackagesAllIgnored { // total: ok public AAClass aa; // ok diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesCommonPackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesCommonPackage.java index 10b1f6785..aba6e83c8 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesCommonPackage.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesCommonPackage.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c.CClass; public class InputClassFanOutComplexityExcludedPackagesCommonPackage { // total: 2 violations public AAClass aa; // violation diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java index 1d6733866..91f71cad7 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java @@ -1,9 +1,9 @@ package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa.AAClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab.ABClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b.BClass; -import com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c.CClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa.AAClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.ab.ABClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b.BClass; +import com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c.CClass; public class InputClassFanOutComplexityExcludedPackagesDirectPackages { // total: 2 violations public AAClass aa; // violation diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java new file mode 100644 index 000000000..a02f51728 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa; + +public class AAClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java new file mode 100644 index 000000000..335d82b6a --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.ab; + +public class ABClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java new file mode 100644 index 000000000..cd7bfa94a --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b; + +public class BClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java new file mode 100644 index 000000000..f49c95852 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java @@ -0,0 +1,4 @@ +package com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c; + +public class CClass { +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/aa/AAClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/aa/AAClass.java deleted file mode 100644 index 7e07ece8b..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/aa/AAClass.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa; - -public class AAClass { -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/ab/ABClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/ab/ABClass.java deleted file mode 100644 index f965291fb..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/ab/ABClass.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab; - -public class ABClass { -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/b/BClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/b/BClass.java deleted file mode 100644 index 4700d37a3..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/b/BClass.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b; - -public class BClass { -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/c/CClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/c/CClass.java deleted file mode 100644 index 6f24ceddb..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/c/CClass.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c; - -public class CClass { -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java deleted file mode 100644 index d7a1756a4..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname; - -public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount { - - private static final String SUPPORTS_REMOVE = ""; - -@CollectionFeature.Require(absent = SUPPORTS_REMOVE) - public void testSetCount_negative_removeUnsupported() { - } -} - -@interface CollectionFeature { - - public @interface Require - { - String absent(); - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java deleted file mode 100644 index e769e0421..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname; - -import org.junit.Before; - -abstract class NonAAAAbstractClassName1 extends Class1 { - public int serialNUMBER = 6; - public final int s1erialNUMBER = 6; - private static int s2erialNUMBER = 6; - private static final int s3erialNUMBER = 6; - - @Override - @SuppressWarnings(value = { "" }) - @Before - protected void oveRRRRRrriddenMethod(){ - int a = 0; - // blah-blah - } -} - -class Class1 { - @SuppressWarnings(value = { "" }) - protected void oveRRRRRrriddenMethod(){ - int a = 0; - // blah-blah - } - -} - -class Class2 extends Class1 { - - @Override - @SuppressWarnings(value = { "" }) - @Before - protected void oveRRRRRrriddenMethod(){ - int a = 0; - // blah-blah - } - -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java deleted file mode 100644 index 756fb4f43..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname; - -public class InputAbbreviationAsWordInNameReceiver { - public void foo4(InputAbbreviationAsWordInNameReceiver this) {} - - private class Inner { - public Inner(InputAbbreviationAsWordInNameReceiver InputAbbreviationAsWordInNameReceiver.this) {} - } -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java deleted file mode 100644 index fa5a3ab8f..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname; - -abstract class IIIInputAbstractClassName { -} - -abstract class NonAAAAbstractClassName { -} - -abstract class FactoryWithBADNAme { -} - -abstract class AbstractCLASSName { - abstract class NonAbstractInnerClass { - } -} - -abstract class ClassFactory1 { - abstract class WellNamedFactory { - } -} - -class NonAbstractClass1 { -} - -class AbstractClass1 { -} - -class Class1Factory1 { -} - -abstract class AbstractClassName3 { - class AbstractINNERRClass { - } -} - -abstract class Class3Factory { - class WellNamedFACTORY { - public void marazmaticMETHODName() { - int marazmaticVARIABLEName = 2; - int MARAZMATICVariableName = 1; - } - } -} - -interface Directions { - int RIGHT=1; - int LEFT=2; - int UP=3; - int DOWN=4; -} - -interface BadNameForInterfeis -{ - void interfaceMethod(); -} - -abstract class NonAAAAbstractClassName2 { - public int serialNUMBER = 6; - public final int s1erialNUMBER = 6; - private static int s2erialNUMBER = 6; - private static final int s3erialNUMBER = 6; -} - -interface Interface1 { - - String VALUEEEE = "value"; // in interface this is final/static - -} - -interface Interface2 { - - static String VALUEEEE = "value"; // in interface this is final/static - -} - -interface Interface3 { - - final String VALUEEEE = "value"; // in interface this is final/static - -} - -interface Interface4 { - - final static String VALUEEEE = "value"; // in interface this is final/static - -} - -class FIleNameFormatException extends Exception { - - private static final long serialVersionUID = 1L; - - public FIleNameFormatException(Exception e) { - super(e); - } -} - -class StateX { - int userID; - int scaleX, scaleY, scaleZ; - - int getScaleX() { - return this.scaleX; - } -} - -@interface Annotation1 { - String VALUE = "value"; // in @interface this is final/static -} - -@interface Annotation2 { - static String VALUE = "value"; // in @interface this is final/static -} - -@interface Annotation3 { - final String VALUE = "value"; // in @interface this is final/static -} - -@interface Annotation4 { - final static String VALUE = "value"; // in @interface this is final/static -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java new file mode 100644 index 000000000..d888a7c70 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java @@ -0,0 +1,18 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname; + +public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount { + + private static final String SUPPORTS_REMOVE = ""; + +@CollectionFeature.Require(absent = SUPPORTS_REMOVE) + public void testSetCount_negative_removeUnsupported() { + } +} + +@interface CollectionFeature { + + public @interface Require + { + String absent(); + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java new file mode 100644 index 000000000..f80ea9710 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java @@ -0,0 +1,39 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname; + +import org.junit.Before; + +abstract class NonAAAAbstractClassName1 extends Class1 { + public int serialNUMBER = 6; + public final int s1erialNUMBER = 6; + private static int s2erialNUMBER = 6; + private static final int s3erialNUMBER = 6; + + @Override + @SuppressWarnings(value = { "" }) + @Before + protected void oveRRRRRrriddenMethod(){ + int a = 0; + // blah-blah + } +} + +class Class1 { + @SuppressWarnings(value = { "" }) + protected void oveRRRRRrriddenMethod(){ + int a = 0; + // blah-blah + } + +} + +class Class2 extends Class1 { + + @Override + @SuppressWarnings(value = { "" }) + @Before + protected void oveRRRRRrriddenMethod(){ + int a = 0; + // blah-blah + } + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java new file mode 100644 index 000000000..28c9ddb82 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java @@ -0,0 +1,9 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname; + +public class InputAbbreviationAsWordInNameReceiver { + public void foo4(InputAbbreviationAsWordInNameReceiver this) {} + + private class Inner { + public Inner(InputAbbreviationAsWordInNameReceiver InputAbbreviationAsWordInNameReceiver.this) {} + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java new file mode 100644 index 000000000..8519b2967 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java @@ -0,0 +1,120 @@ +package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname; + +abstract class IIIInputAbstractClassName { +} + +abstract class NonAAAAbstractClassName { +} + +abstract class FactoryWithBADNAme { +} + +abstract class AbstractCLASSName { + abstract class NonAbstractInnerClass { + } +} + +abstract class ClassFactory1 { + abstract class WellNamedFactory { + } +} + +class NonAbstractClass1 { +} + +class AbstractClass1 { +} + +class Class1Factory1 { +} + +abstract class AbstractClassName3 { + class AbstractINNERRClass { + } +} + +abstract class Class3Factory { + class WellNamedFACTORY { + public void marazmaticMETHODName() { + int marazmaticVARIABLEName = 2; + int MARAZMATICVariableName = 1; + } + } +} + +interface Directions { + int RIGHT=1; + int LEFT=2; + int UP=3; + int DOWN=4; +} + +interface BadNameForInterfeis +{ + void interfaceMethod(); +} + +abstract class NonAAAAbstractClassName2 { + public int serialNUMBER = 6; + public final int s1erialNUMBER = 6; + private static int s2erialNUMBER = 6; + private static final int s3erialNUMBER = 6; +} + +interface Interface1 { + + String VALUEEEE = "value"; // in interface this is final/static + +} + +interface Interface2 { + + static String VALUEEEE = "value"; // in interface this is final/static + +} + +interface Interface3 { + + final String VALUEEEE = "value"; // in interface this is final/static + +} + +interface Interface4 { + + final static String VALUEEEE = "value"; // in interface this is final/static + +} + +class FIleNameFormatException extends Exception { + + private static final long serialVersionUID = 1L; + + public FIleNameFormatException(Exception e) { + super(e); + } +} + +class StateX { + int userID; + int scaleX, scaleY, scaleZ; + + int getScaleX() { + return this.scaleX; + } +} + +@interface Annotation1 { + String VALUE = "value"; // in @interface this is final/static +} + +@interface Annotation2 { + static String VALUE = "value"; // in @interface this is final/static +} + +@interface Annotation3 { + final String VALUE = "value"; // in @interface this is final/static +} + +@interface Annotation4 { + final static String VALUE = "value"; // in @interface this is final/static +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java deleted file mode 100644 index f52aa6a43..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java +++ /dev/null @@ -1,115 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// Test case file for checkstyle. -// Created: 2001 -//////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound; - -class InputBraces -{ - /** @return helper func **/ - boolean condition() - { - return false; - } - - /** Test do/while loops **/ - void testDoWhile() - { - // Valid - do { - testDoWhile(); - } - while (condition()); - - // Invalid - do testDoWhile(); while (condition()); - } - - /** Test while loops **/ - void testWhile() - { - // Valid - while (condition()) { - testWhile(); - } - - // Invalid - while(condition()); - while (condition()) - testWhile(); - while (condition()) - if (condition()) - testWhile(); - } - - /** Test for loops **/ - void testFor() - { - // Valid - for (int i = 1; i < 5; i++) { - testFor(); - } - - // Invalid - for(int i = 1;i < 5;i++); - for (int i = 1; i < 5; i++) - testFor(); - for (int i = 1; i < 5; - i++) - if (i > 2) - testFor(); - } - - /** Test if constructs **/ - public void testIf() - { - // Valid - if (condition()) { - testIf(); - } - else if (condition()) { - testIf(); - } - else { - testIf(); - } - - // Invalid - if (condition()); - if (condition()) - testIf(); - if (condition()) - testIf(); - else - testIf(); - if (condition()) - testIf(); - else { - testIf(); - } - if (condition()) { - testIf(); - } - else - testIf(); - if (condition()) - if (condition()) - testIf(); - } - - void whitespaceAfterSemi() - { - //reject - int i = 1;int j = 2; - - //accept - for (;;) { - } - } - - /** Empty constructor block. **/ - public InputBraces() {} - - /** Empty method block. **/ - public void emptyImplementation() {} -} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java new file mode 100644 index 000000000..c1f411d63 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java @@ -0,0 +1,115 @@ +//////////////////////////////////////////////////////////////////////////////// +// Test case file for checkstyle. +// Created: 2001 +//////////////////////////////////////////////////////////////////////////////// +package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound; + +class InputWhitespaceAroundBraces +{ + /** @return helper func **/ + boolean condition() + { + return false; + } + + /** Test do/while loops **/ + void testDoWhile() + { + // Valid + do { + testDoWhile(); + } + while (condition()); + + // Invalid + do testDoWhile(); while (condition()); + } + + /** Test while loops **/ + void testWhile() + { + // Valid + while (condition()) { + testWhile(); + } + + // Invalid + while(condition()); + while (condition()) + testWhile(); + while (condition()) + if (condition()) + testWhile(); + } + + /** Test for loops **/ + void testFor() + { + // Valid + for (int i = 1; i < 5; i++) { + testFor(); + } + + // Invalid + for(int i = 1;i < 5;i++); + for (int i = 1; i < 5; i++) + testFor(); + for (int i = 1; i < 5; + i++) + if (i > 2) + testFor(); + } + + /** Test if constructs **/ + public void testIf() + { + // Valid + if (condition()) { + testIf(); + } + else if (condition()) { + testIf(); + } + else { + testIf(); + } + + // Invalid + if (condition()); + if (condition()) + testIf(); + if (condition()) + testIf(); + else + testIf(); + if (condition()) + testIf(); + else { + testIf(); + } + if (condition()) { + testIf(); + } + else + testIf(); + if (condition()) + if (condition()) + testIf(); + } + + void whitespaceAfterSemi() + { + //reject + int i = 1;int j = 2; + + //accept + for (;;) { + } + } + + /** Empty constructor block. **/ + public InputWhitespaceAroundBraces() {} + + /** Empty method block. **/ + public void emptyImplementation() {} +} -- cgit v1.2.3