From 448a62c9a6740c4e6e5435b4a89cd9c82e6b8957 Mon Sep 17 00:00:00 2001 From: alexkravin Date: Sat, 6 Dec 2014 13:14:55 +0400 Subject: [PATCH] Illegal Catch Check compilable UT inputs --- .../checks/coding/IllegalCatchCheckTest.java | 6 ++-- .../coding/InputIllegalCatchCheck.java | 2 +- .../coding/InputIllegalCatchCheck2.java | 28 ++++++++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java index d96e39f6f..911138a2a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java @@ -67,10 +67,10 @@ public class IllegalCatchCheckTest extends BaseCheckTestSupport DefaultConfiguration checkConfig = createCheckConfig(IllegalCatchCheck.class); String[] expected = { - "6:11: Catching 'RuntimeException' is not allowed.", - "8:11: Catching 'RuntimeException' is not allowed.", + "7:11: Catching 'RuntimeException' is not allowed.", "10:11: Catching 'RuntimeException' is not allowed.", - "12:11: Catching 'RuntimeException' is not allowed.", + "13:11: Catching 'RuntimeException' is not allowed.", + "16:11: Catching 'RuntimeException' is not allowed.", }; verify(checkConfig, getPath("coding" + File.separator + "InputIllegalCatchCheck2.java"), expected); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck.java index 976d795ff..bc00bcdaf 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.checks.coding; +package com.puppycrawl.tools.checkstyle.coding; public class InputIllegalCatchCheck { public void foo() { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck2.java index 8f637501c..66ddc2406 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck2.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/coding/InputIllegalCatchCheck2.java @@ -1,17 +1,31 @@ -package com.puppycrawl.tools.checkstyle.checks.coding; +package com.puppycrawl.tools.checkstyle.coding; public class InputIllegalCatchCheck2 { - public void foo() { + public void foo() throws OneMoreException { try { - } catch (RuntimeException | SQLException e) { + foo1(); + } catch (RuntimeException | SQLException e) {} + try { + foo1(); + } catch (RuntimeException | SQLException | OneMoreException e) {} + try { + foo1(); + } catch (OneMoreException | RuntimeException | SQLException e) {} + try { + foo1(); + } catch (OneMoreException | SQLException | RuntimeException e) {} - } catch (RuntimeException | SQLException | OneMoreException e) { + } + + private void foo1() throws RuntimeException, SQLException, OneMoreException { - } catch (OneMoreException | RuntimeException | SQLException e) { + } - } catch (OneMoreException | SQLException | RuntimeException e) { + private class SQLException extends Exception { - } + } + + private class OneMoreException extends Exception { } }