diff options
Diffstat (limited to 'src/test/java/com/puppycrawl')
5 files changed, 24 insertions, 18 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 |