Issue #4220: Split and Organize Checkstyle inputs by Test in the blocks package: NeedBraces

7 files changed, 23 insertions, 19 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
index 43c90011e..dac8a70ab 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
@@ -34,13 +34,17 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "blocks" + File.separator + filename);
+                + "blocks" + File.separator
+                + "needbraces" + File.separator
+                + filename);
     }
 
     @Override
     protected String getNonCompilablePath(String filename) throws IOException {
         return super.getNonCompilablePath("checks" + File.separator
-                + "blocks" + File.separator + filename);
+                + "blocks" + File.separator
+                + "needbraces" + File.separator
+                + filename);
     }
 
     @Test
@@ -66,7 +70,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
             "99: " + getCheckMessage(MSG_KEY_NEED_BRACES, "if"),
             "100: " + getCheckMessage(MSG_KEY_NEED_BRACES, "if"),
         };
-        verify(checkConfig, getPath("InputBraces.java"), expected);
+        verify(checkConfig, getPath("InputNeedBraces.java"), expected);
     }
 
     @Test
@@ -87,7 +91,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
             "107: " + getCheckMessage(MSG_KEY_NEED_BRACES, "if"),
             "114: " + getCheckMessage(MSG_KEY_NEED_BRACES, "for"),
         };
-        verify(checkConfig, getPath("InputBracesSingleLineStatements.java"), expected);
+        verify(checkConfig, getPath("InputNeedBracesSingleLineStatements.java"), expected);
     }
 
     @Test
@@ -99,7 +103,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "7: " + getCheckMessage(MSG_KEY_NEED_BRACES, "->"),
         };
-        verify(checkConfig, getPath("InputSingleLineLambda.java"), expected);
+        verify(checkConfig, getPath("InputNeedBracesSingleLineLambda.java"), expected);
     }
 
     @Test
@@ -112,7 +116,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
             "72: " + getCheckMessage(MSG_KEY_NEED_BRACES, "case"),
             "75: " + getCheckMessage(MSG_KEY_NEED_BRACES, "case"),
         };
-        verify(checkConfig, getPath("InputBracesSingleLineStatements.java"), expected);
+        verify(checkConfig, getPath("InputNeedBracesSingleLineStatements.java"), expected);
     }
 
     @Test
@@ -131,7 +135,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("tokens", "LITERAL_WHILE, LITERAL_DO, LITERAL_FOR");
         checkConfig.addAttribute("allowSingleLineStatement", "true");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputNeedBraces.java"), expected);
+        verify(checkConfig, getPath("InputNeedBracesConditional.java"), expected);
     }
 
     @Test
@@ -149,7 +153,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
             "49: " + getCheckMessage(MSG_KEY_NEED_BRACES, "default"),
             "56: " + getCheckMessage(MSG_KEY_NEED_BRACES, "default"),
         };
-        verify(checkConfig, getPath("InputNeedBraces.java"), expected);
+        verify(checkConfig, getPath("InputNeedBracesConditional.java"), expected);
     }
 
     @Test
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBraces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBraces.java
index 702d68d27..5a04483f3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBraces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBraces.java
@@ -2,13 +2,13 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
 /**
  * Test case for correct use of braces.
  * @author Oliver Burn
  **/
-class InputBraces
+class InputNeedBraces
 {
     /** @return helper func **/
     boolean condition()
@@ -112,7 +112,7 @@ class InputBraces
     }
 
     /** Empty constructor block. **/
-    public InputBraces() {}
+    public InputNeedBraces() {}
     
     /** Empty method block. **/
     public void emptyImplementation() {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBraces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesConditional.java
index 74a8f9ebd..765fb9930 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBraces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesConditional.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
-public class InputNeedBraces
+public class InputNeedBracesConditional
 {
     public void method() {
         if (false)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesEmptyDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptyDefault.java
index d482bddc3..d8abe0196 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesEmptyDefault.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesEmptyDefault.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
 public class InputNeedBracesEmptyDefault {
     int value;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesNoBodyLoops.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesNoBodyLoops.java
index cf74266b2..94d114479 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesNoBodyLoops.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesNoBodyLoops.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
 public class InputNeedBracesNoBodyLoops {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSingleLineLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineLambda.java
index d3a15d53c..b3e573727 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSingleLineLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineLambda.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
-public class InputSingleLineLambda {
+public class InputNeedBracesSingleLineLambda {
     
     static Runnable r1 = ()->String.CASE_INSENSITIVE_ORDER.equals("Hello world one!");
     static Runnable r2 = () -> String.CASE_INSENSITIVE_ORDER.equals("Hello world two!");
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBracesSingleLineStatements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java
index 5e89a77be..a11633914 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBracesSingleLineStatements.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/needbraces/InputNeedBracesSingleLineStatements.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.blocks;
+package com.puppycrawl.tools.checkstyle.checks.blocks.needbraces;
 
-public class InputBracesSingleLineStatements
+public class InputNeedBracesSingleLineStatements
 {
     private static class SomeClass {
         boolean flag = true;