From 33efb558db835d60ca54644860a096f08d802fb5 Mon Sep 17 00:00:00 2001 From: Ruslan Diachenko Date: Sun, 26 Jul 2015 03:20:32 +0100 Subject: [PATCH] Issue #1289: 'AbstractParenPadCheck' UT coverage improved --- pom.xml | 2 -- .../whitespace/NoWhitespaceBeforeCheckTest.java | 1 + .../checks/whitespace/ParenPadCheckTest.java | 16 ++++++++-------- .../tools/checkstyle/InputWhitespace.java | 10 +++++++++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 705c34dc8..5971c1273 100644 --- a/pom.xml +++ b/pom.xml @@ -1152,8 +1152,6 @@ .*.checks.regexp.RegexpSinglelineCheck10076 .*.checks.regexp.SinglelineDetector9396 - .*.checks.whitespace.AbstractParenPadCheck88100 - .*.filters.SuppressionCommentFilter8393 .*.filters.SuppressionCommentFilter\$Tag9694 .*.filters.SuppressionsLoader6377 diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java index fefcb3f98..4b207e21d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheckTest.java @@ -49,6 +49,7 @@ public class NoWhitespaceBeforeCheckTest "211:15: " + getCheckMessage(MSG_KEY, ";"), "266:1: " + getCheckMessage(MSG_KEY, ";"), "270:15: " + getCheckMessage(MSG_KEY, ";"), + "284:1: " + getCheckMessage(MSG_KEY, ";"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java index 9664a3a48..e9f4e9c78 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheckTest.java @@ -44,8 +44,8 @@ public class ParenPadCheckTest "232:27: " + getCheckMessage(WS_PRECEDED, ")"), "241:24: " + getCheckMessage(WS_FOLLOWED, "("), "241:30: " + getCheckMessage(WS_PRECEDED, ")"), - "276:18: " + getCheckMessage(WS_FOLLOWED, "("), - "276:23: " + getCheckMessage(WS_PRECEDED, ")"), + "277:18: " + getCheckMessage(WS_FOLLOWED, "("), + "277:23: " + getCheckMessage(WS_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } @@ -84,12 +84,12 @@ public class ParenPadCheckTest "235:39: " + getCheckMessage(WS_NOT_PRECEDED, ")"), "252:21: " + getCheckMessage(WS_NOT_FOLLOWED, "("), "252:93: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "272:26: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "272:36: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "274:29: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "274:42: " + getCheckMessage(WS_NOT_PRECEDED, ")"), - "275:18: " + getCheckMessage(WS_NOT_FOLLOWED, "("), - "275:33: " + getCheckMessage(WS_NOT_PRECEDED, ")"), + "273:26: " + getCheckMessage(WS_NOT_FOLLOWED, "("), + "273:36: " + getCheckMessage(WS_NOT_PRECEDED, ")"), + "275:29: " + getCheckMessage(WS_NOT_FOLLOWED, "("), + "275:42: " + getCheckMessage(WS_NOT_PRECEDED, ")"), + "276:18: " + getCheckMessage(WS_NOT_FOLLOWED, "("), + "276:33: " + getCheckMessage(WS_NOT_PRECEDED, ")"), }; verify(checkConfig, getPath("InputWhitespace.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputWhitespace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputWhitespace.java index 8bddf6dcf..75df80731 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputWhitespace.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/InputWhitespace.java @@ -269,10 +269,18 @@ class SpecialCasesInForLoop public void testNullSemi() { return ; } + public void register(Object obj) { } public void doSomething(String args[]) { register(boolean[].class); register( args ); } -} \ No newline at end of file + + public void parentheses() { + testNullSemi +( +) +; + } +}