Issue #3904: Split and Organize Checkstyle inputs by Test for SeparatorWrap

4 files changed, 200 insertions, 5 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
index 4ef2196ef..abb929afe 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SeparatorWrapCheckTest.java
@@ -38,7 +38,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
 
 public class SeparatorWrapCheckTest
-    extends BaseCheckTestSupport {
+        extends BaseCheckTestSupport {
     private DefaultConfiguration checkConfig;
 
     @Before
@@ -49,7 +49,7 @@ public class SeparatorWrapCheckTest
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "whitespace" + File.separator + filename);
+                + "whitespace" + File.separator + "separatorwrap" + File.separator + filename);
     }
 
     @Test
@@ -60,7 +60,7 @@ public class SeparatorWrapCheckTest
         final String[] expected = {
             "31:10: " + getCheckMessage(MSG_LINE_NEW, "."),
         };
-        verify(checkConfig, getPath("InputSeparatorWrap.java"), expected);
+        verify(checkConfig, getPath("InputSeparatorWrapForTestDot.java"), expected);
     }
 
     @Test
@@ -70,7 +70,7 @@ public class SeparatorWrapCheckTest
         final String[] expected = {
             "39:17: " + getCheckMessage(MSG_LINE_PREVIOUS, ","),
         };
-        verify(checkConfig, getPath("InputSeparatorWrap.java"), expected);
+        verify(checkConfig, getPath("InputSeparatorWrapForTestComma.java"), expected);
     }
 
     @Test
@@ -91,7 +91,7 @@ public class SeparatorWrapCheckTest
         try {
             final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-            verify(checkConfig, getPath("InputSeparatorWrap.java"), expected);
+            verify(checkConfig, getPath("InputSeparatorWrapForInvalidOption.java"), expected);
             fail("exception expected");
         }
         catch (CheckstyleException ex) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForInvalidOption.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForInvalidOption.java
new file mode 100644
index 000000000..f650ab2a1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForInvalidOption.java
@@ -0,0 +1,65 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.separatorwrap;
+
+public class InputSeparatorWrapForInvalidOption<T extends FooForInvalidOption
+        & BarForInvalidOption> {
+    public void goodCase() throws FooExceptionForInvalidOption, BarExceptionForInvalidOption
+    {
+        int i = 0;
+        String s = "ffffooooString";
+        s
+                .isEmpty(); //good wrapping
+        s.isEmpty();
+        try {
+            foo(i, s);
+        } catch (FooExceptionForInvalidOption |
+                BarExceptionForInvalidOption e) {}
+        foo(i,
+                s); //good wrapping
+    }
+    public static void foo(int i, String s) throws FooExceptionForInvalidOption, BarExceptionForInvalidOption
+    {
+
+    }
+}
+
+class badCaseForInvalidOption<T extends FooForInvalidOption &  BarForInvalidOption> {
+
+
+    public void goodCaseForInvalidOption(int... aFoo) throws FooExceptionForInvalidOption, BarExceptionForInvalidOption
+    {
+        String s = "ffffooooString";
+        s.
+                isEmpty(); //bad wrapping
+        try {
+            foo(1, s);
+        } catch (FooExceptionForInvalidOption
+                | BarExceptionForInvalidOption e) {}
+
+        foo(1
+                ,s);  //bad wrapping
+        int[] i;
+    }
+    public static String foo(int i, String s) throws FooExceptionForInvalidOption, BarExceptionForInvalidOption
+    {
+        return new StringBuilder("")
+                .append("", 0, 1)
+                .append("")
+                .toString();
+    }
+}
+
+interface FooForInvalidOption {
+
+}
+
+interface BarForInvalidOption {
+
+}
+
+class FooExceptionForInvalidOption extends Exception {
+
+}
+
+class BarExceptionForInvalidOption extends Exception {
+
+}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestComma.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestComma.java
new file mode 100644
index 000000000..51720b9b8
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestComma.java
@@ -0,0 +1,65 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.separatorwrap;
+
+public class InputSeparatorWrapForTestComma<T extends FooForTestComma
+        & BarForTestComma> {
+    public void goodCase() throws FooExceptionForTestComma, BarExceptionForTestComma
+    {
+        int i = 0;
+        String s = "ffffooooString";
+        s
+                .isEmpty(); //good wrapping
+        s.isEmpty();
+        try {
+            foo(i, s);
+        } catch (FooExceptionForTestComma |
+                BarExceptionForTestComma e) {}
+        foo(i,
+                s); //good wrapping
+    }
+    public static void foo(int i, String s) throws FooExceptionForTestComma, BarExceptionForTestComma
+    {
+
+    }
+}
+
+class badCaseForTestComma<T extends FooForTestComma &  BarForTestComma> {
+
+
+    public void goodCaseForTestComma(int... aFoo) throws FooExceptionForTestComma, BarExceptionForTestComma
+    {
+        String s = "ffffooooString";
+        s.
+                isEmpty(); //bad wrapping
+        try {
+            foo(1, s);
+        } catch (FooExceptionForTestComma
+                | BarExceptionForTestComma e) {}
+
+        foo(1
+                ,s);  //bad wrapping
+        int[] i;
+    }
+    public static String foo(int i, String s) throws FooExceptionForTestComma, BarExceptionForTestComma
+    {
+        return new StringBuilder("")
+                .append("", 0, 1)
+                .append("")
+                .toString();
+    }
+}
+
+interface FooForTestComma {
+
+}
+
+interface BarForTestComma {
+
+}
+
+class FooExceptionForTestComma extends Exception {
+
+}
+
+class BarExceptionForTestComma extends Exception {
+
+}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestDot.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestDot.java
new file mode 100644
index 000000000..60a2b4b52
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/separatorwrap/InputSeparatorWrapForTestDot.java
@@ -0,0 +1,65 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.separatorwrap;
+
+public class InputSeparatorWrapForTestDot<T extends FooForTestDot
+        & BarForTestDot> {
+    public void goodCase() throws FooExceptionForTestDot, BarExceptionForTestDot
+    {
+        int i = 0;
+        String s = "ffffooooString";
+        s
+                .isEmpty(); //good wrapping
+        s.isEmpty();
+        try {
+            foo(i, s);
+        } catch (FooExceptionForTestDot |
+                BarExceptionForTestDot e) {}
+        foo(i,
+                s); //good wrapping
+    }
+    public static void foo(int i, String s) throws FooExceptionForTestDot, BarExceptionForTestDot
+    {
+
+    }
+}
+
+class badCaseForTestDot<T extends FooForTestDot &  BarForTestDot> {
+
+
+    public void goodCaseForTestDot(int... aFoo) throws FooExceptionForTestDot, BarExceptionForTestDot
+    {
+        String s = "ffffooooString";
+        s.
+                isEmpty(); //bad wrapping
+        try {
+            foo(1, s);
+        } catch (FooExceptionForTestDot
+                | BarExceptionForTestDot e) {}
+
+        foo(1
+                ,s);  //bad wrapping
+        int[] i;
+    }
+    public static String foo(int i, String s) throws FooExceptionForTestDot, BarExceptionForTestDot
+    {
+        return new StringBuilder("")
+                .append("", 0, 1)
+                .append("")
+                .toString();
+    }
+}
+
+interface FooForTestDot {
+
+}
+
+interface BarForTestDot {
+
+}
+
+class FooExceptionForTestDot extends Exception {
+
+}
+
+class BarExceptionForTestDot extends Exception {
+
+}
\ No newline at end of file