Issue #4165: Split and Organize Checkstyle inputs by Test for checks in coding package: OneStatementPerLine

3 files changed, 9 insertions, 7 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
index f728eea7e..e9bb1216a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
@@ -34,7 +34,9 @@ public class OneStatementPerLineCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "coding" + File.separator + filename);
+                + "coding" + File.separator
+                + "onestatementperline" + File.separator
+                + filename);
     }
 
     @Override
@@ -57,7 +59,7 @@ public class OneStatementPerLineCheckTest extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-            getPath("InputOneStatementPerLine.java"),
+            getPath("InputOneStatementPerLineSingleLine.java"),
             expected);
     }
 
@@ -84,7 +86,7 @@ public class OneStatementPerLineCheckTest extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-            getPath("InputOneStatementPerLine2.java"),
+            getPath("InputOneStatementPerLineMultiline.java"),
             expected);
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultiline.java
index 161dcdf89..aa7b110bc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineMultiline.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
 
 /*
     This class provides test input for OneStatementPerLineCheck with different
@@ -10,7 +10,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 
     <variable> = <expression>;
  */
-public class InputOneStatementPerLine2 {
+public class InputOneStatementPerLineMultiline {
 
     /**
      * One multiline  assignment (declaration) statement
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLine.java
index 52c9c4501..185b7b74f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/onestatementperline/InputOneStatementPerLineSingleLine.java
@@ -16,7 +16,7 @@
 //License along with this library; if not, write to the Free Software
 //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.puppycrawl.tools.checkstyle.checks.coding.onestatementperline;
 
 /**
  * Two import statements on the same line are illegal.
@@ -29,7 +29,7 @@ import java.io.EOFException; import java.io.BufferedReader;
  * @author Alexander Jesse
  * @see com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck
  */
-public class InputOneStatementPerLine {
+public class InputOneStatementPerLineSingleLine {
   /**
    * Dummy innerclass to test the behaviour in the case of a smalltalk-style
    * statements (<code>myObject.firstMethod().secondMethod().thirdMethod()</code>).