aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java2
-rw-r--r--src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java17
-rw-r--r--src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java13
-rw-r--r--src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java2
-rw-r--r--src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java8
-rw-r--r--src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/beforeexecutionexclusionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java (renamed from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/exclusionbeforeexecutionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java)0
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java)2
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesAllIgnored.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesCommonPackage.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/InputClassDataAbstractionCouplingExcludedPackagesDirectPackages.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/aa/AAClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/a/ab/ABClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/b/BClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classdataabstractioncoupling/inputs/c/CClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesAllIgnored.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesCommonPackage.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/InputClassFanOutComplexityExcludedPackagesDirectPackages.java8
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/aa/AAClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/a/ab/ABClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/b/BClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/classfanoutcomplexity/inputs/c/CClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/aa/AAClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/a/ab/ABClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/b/BClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/inputs/c/CClass.java4
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java)2
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java)2
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java)2
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java)2
-rw-r--r--src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java)4
30 files changed, 87 insertions, 65 deletions
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
index 83fb42716..c1384e476 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
@@ -31,7 +31,7 @@ public class OverloadMethodsDeclarationOrderCheckTest
extends AbstractModuleTestSupport {
@Override
protected String getPackageLocation() {
- return "com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration";
+ return "com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder";
}
@Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
index c0acc5828..e141d0987 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheckTest.java
@@ -64,8 +64,9 @@ public class ClassDataAbstractionCouplingCheckTest extends AbstractModuleTestSup
checkConfig.addAttribute("max", "0");
checkConfig.addAttribute("excludedPackages",
- "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b");
+ "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs.c,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling."
+ + "inputs.b");
final String[] expected = {
"8:1: " + getCheckMessage(MSG_KEY, 2, 0, "[AAClass, ABClass]"),
@@ -128,10 +129,14 @@ public class ClassDataAbstractionCouplingCheckTest extends AbstractModuleTestSup
checkConfig.addAttribute("max", "0");
checkConfig.addAttribute("excludedPackages",
- "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c");
+ "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling.inputs."
+ + "a.aa,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling."
+ + "inputs.a.ab,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling."
+ + "inputs.b,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classdataabstractioncoupling."
+ + "inputs.c");
final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
verify(checkConfig,
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
index 02d8b6e69..22e31d992 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheckTest.java
@@ -60,8 +60,8 @@ public class ClassFanOutComplexityCheckTest extends AbstractModuleTestSupport {
checkConfig.addAttribute("max", "0");
checkConfig.addAttribute("excludedPackages",
- "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b");
+ "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b");
final String[] expected = {
"8:1: " + getCheckMessage(MSG_KEY, 2, 0),
@@ -122,10 +122,11 @@ public class ClassFanOutComplexityCheckTest extends AbstractModuleTestSupport {
checkConfig.addAttribute("max", "0");
checkConfig.addAttribute("excludedPackages",
- "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.aa,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.a.ab,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.b,"
- + "com.puppycrawl.tools.checkstyle.checks.metrics.inputs.c");
+ "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.a.aa,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity."
+ + "inputs.a.ab,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.b,"
+ + "com.puppycrawl.tools.checkstyle.checks.metrics.classfanoutcomplexity.inputs.c");
final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
verify(checkConfig,
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
index 78371cef8..66fee81f6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
@@ -31,7 +31,7 @@ public class AbbreviationAsWordInNameCheckTest extends AbstractModuleTestSupport
@Override
protected String getPackageLocation() {
- return "com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname";
+ return "com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname";
}
@Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
index 9be28bdb9..41a74ec9c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheckTest.java
@@ -128,12 +128,12 @@ public class WhitespaceAroundCheckTest
"54:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"),
// + ":58:23: ';' is not followed by whitespace.",
// + ":58:29: ';' is not followed by whitespace.",
- "111:27: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"),
- "111:27: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"),
+ "111:43: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"),
+ "111:43: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"),
"114:40: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "{"),
"114:40: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "}"),
};
- verify(checkConfig, getPath("InputBraces.java"), expected);
+ verify(checkConfig, getPath("InputWhitespaceAroundBraces.java"), expected);
}
@Test
@@ -145,7 +145,7 @@ public class WhitespaceAroundCheckTest
"37:14: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "while"),
"54:12: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, "for"),
};
- verify(checkConfig, getPath("InputBraces.java"), expected);
+ verify(checkConfig, getPath("InputWhitespaceAroundBraces.java"), expected);
}
@Test
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/exclusionbeforeexecutionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/beforeexecutionexclusionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java
index 5adc947fc..5adc947fc 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/exclusionbeforeexecutionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/filefilters/beforeexecutionexclusionfilefilter/InputBeforeExecutionExclusionFileFilterIncorrectClass.java
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/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
index b56dd4fcc..2aa3520db 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethoddeclaration/InputOverloadMethodsDeclarationOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethoddeclaration;
+package com.puppycrawl.tools.checkstyle.checks.coding.overloadmethodsdeclarationorder;
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/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
index d7a1756a4..d888a7c70 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameAbstractMultisetSetCount.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname;
+package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
public abstract class InputAbbreviationAsWordInNameAbstractMultisetSetCount<E> {
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/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java
index e769e0421..f80ea9710 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameOverridableMethod.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname;
+package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
import org.junit.Before;
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/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java
index 756fb4f43..28c9ddb82 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameReceiver.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameReceiver.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname;
+package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
public class InputAbbreviationAsWordInNameReceiver {
public void foo4(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/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java
index fa5a3ab8f..8519b2967 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbrevationaswordinname/InputAbbreviationAsWordInNameType.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.naming.abbrevationaswordinname;
+package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
abstract class IIIInputAbstractClassName {
}
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/InputWhitespaceAroundBraces.java
index f52aa6a43..c1f411d63 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputBraces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/whitespacearound/InputWhitespaceAroundBraces.java
@@ -4,7 +4,7 @@
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle.checks.whitespace.whitespacearound;
-class InputBraces
+class InputWhitespaceAroundBraces
{
/** @return helper func **/
boolean condition()
@@ -108,7 +108,7 @@ class InputBraces
}
/** Empty constructor block. **/
- public InputBraces() {}
+ public InputWhitespaceAroundBraces() {}
/** Empty method block. **/
public void emptyImplementation() {}