Issue #2161: unify test input locations for blocks package

21 files changed, 311 insertions, 20 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyAllInOneLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyAllInOneLine.java
deleted file mode 100644
index 11ec6102d..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyAllInOneLine.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.puppycrawl.tools.checkstyle;import java.lang.annotation.ElementType;import java.lang.annotation.Target;import java.util.ArrayList;import java.util.List;class InputLeftCurlyAllInOneLine{
-    
-   
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBraces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBraces.java
new file mode 100644
index 000000000..702d68d27
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBraces.java
@@ -0,0 +1,119 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.blocks;
+
+/**
+ * Test case for correct use of braces.
+ * @author Oliver Burn
+ **/
+class InputBraces
+{
+    /** @return helper func **/
+    boolean condition()
+    {
+        return false;
+    }
+
+    /** Test do/while loops **/
+    void testDoWhile()
+    {
+        // Valid
+        do {
+            testDoWhile();
+        }
+        while (condition());
+
+        // Invalid
+        do testDoWhile(); while (condition());
+    }
+
+    /** Test while loops **/
+    void testWhile()
+    {
+        // Valid
+        while (condition()) {
+            testWhile();
+        }
+
+        // Invalid
+        while(condition());
+        while (condition())
+            testWhile();
+        while (condition())
+            if (condition())
+                testWhile();
+    }
+
+    /** Test for loops **/
+    void testFor()
+    {
+        // Valid
+        for (int i = 1; i < 5; i++) {
+            testFor();
+        }
+
+        // Invalid
+        for(int i = 1;i < 5;i++);
+        for (int i = 1; i < 5; i++)
+            testFor();
+        for (int i = 1; i < 5;
+             i++)
+            if (i > 2)
+                testFor();
+    }
+
+    /** Test if constructs **/
+    public void testIf()
+    {
+        // Valid
+        if (condition()) {
+            testIf();
+        }
+        else if (condition()) {
+            testIf();
+        }
+        else {
+            testIf();
+        }
+
+        // Invalid
+        if (condition());
+        if (condition())
+            testIf();
+        if (condition())
+            testIf();
+        else
+            testIf();
+        if (condition())
+            testIf();
+        else {
+            testIf();
+        }
+        if (condition()) {
+            testIf();
+        }
+        else
+            testIf();
+        if (condition())
+            if (condition())
+                testIf();
+    }
+
+    void whitespaceAfterSemi()
+    {
+        //reject
+        int i = 1;int j = 2;
+
+        //accept
+        for (;;) {
+        }
+    }
+
+    /** Empty constructor block. **/
+    public InputBraces() {}
+    
+    /** Empty method block. **/
+    public void emptyImplementation() {}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputBracesSingleLineStatements.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBracesSingleLineStatements.java
index 9d04f7fe3..6260ddd82 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputBracesSingleLineStatements.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputBracesSingleLineStatements.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 public class InputBracesSingleLineStatements
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyAllInOneLine.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyAllInOneLine.java
new file mode 100644
index 000000000..b6e33b174
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyAllInOneLine.java
@@ -0,0 +1,4 @@
+package com.puppycrawl.tools.checkstyle.checks.blocks;import java.lang.annotation.ElementType;import java.lang.annotation.Target;import java.util.ArrayList;import java.util.List;class InputLeftCurlyAllInOneLine{
+    
+   
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyAnnotations.java
index a63b4f8d7..5b5f94ba5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyAnnotations.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyEnums.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyEnums.java
index 28c592a3f..5406cb528 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyEnums.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyEnums.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 public class InputLeftCurlyEnums {
     enum Colors {RED,
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyLineBreakAfter.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyLineBreakAfter.java
index 9b8040d76..a25324491 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyLineBreakAfter.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyLineBreakAfter.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyMethod.java
index 57794df9d..bcfc7384f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyMethod.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 /**
  * Test case for correct use of braces.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyOther.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyOther.java
index 0b79b495b..42c51c7dd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputLeftCurlyOther.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputLeftCurlyOther.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 /**
  * Test case for correct use of braces.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNeedBracesCheckTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesCheckTest.java
index 93f34c0f3..6f0f40ec9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNeedBracesCheckTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesCheckTest.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 public class InputNeedBracesCheckTest
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurly.java
index b2b2d0d60..9b8562845 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurly.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 class InputRightCurly
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyAloneOrSingleline.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAloneOrSingleline.java
index 5988e11af..de27350d3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyAloneOrSingleline.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAloneOrSingleline.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 public class InputRightCurlyAloneOrSingleline {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAnnotations.java
index 72f3a5cf0..7802a0274 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAnnotations.java
@@ -1,6 +1,5 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-@TestClassAnnotation
 class InputRightCurlyAnnotations
 {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyEmptyAbstractMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyEmptyAbstractMethod.java
index 582f23257..c142bd0fb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyEmptyAbstractMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyEmptyAbstractMethod.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 abstract class CharSequenceReader{
     
     abstract void moveTo(double deltaX, double deltaY);
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyLineBreakBefore.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyLineBreakBefore.java
index 7ffa37d2d..15e953162 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyLineBreakBefore.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyLineBreakBefore.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyNameForOneLiners.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyNameForOneLiners.java
index c5e6da826..6f7ecc23f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputRightCurlyNameForOneLiners.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyNameForOneLiners.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 /**
  * Test case for RightCurly with option SAME to omit oneliners
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputScopeInnerInterfaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputScopeInnerInterfaces.java
new file mode 100644
index 000000000..ecabce5da
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputScopeInnerInterfaces.java
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.blocks;
+
+public class InputScopeInnerInterfaces
+{
+    private interface PrivateInterface
+    {
+    }
+
+    interface PackageInnerInterface
+    {
+    }
+
+    protected interface ProtectedInnerInterface
+    {
+    }
+
+    public interface PublicInnerInterface
+    {
+    }
+
+    private
+    class 
+    MyClass1 {
+    }
+
+    class 
+    MyClass2 {
+    }
+
+    private
+    interface
+    MyInterface1 {
+    }
+
+    interface
+    MyInterface2 {
+    }
+
+    protected
+    enum
+    MyEnum {
+    }
+    
+    private
+    @interface
+    MyAnnotation {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerInterfaces2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputScopeInnerInterfaces2.java
index fbef2f51c..2540fc540 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputScopeInnerInterfaces2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputScopeInnerInterfaces2.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 public class InputScopeInnerInterfaces2{
     // inner interfaces with different scopes
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java
new file mode 100644
index 000000000..94cda5d53
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java
@@ -0,0 +1,87 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.blocks;
+
+import java.io.*; // star import for instantiation tests
+import java.awt.Dimension; // explicit import for instantiation tests
+import java.awt.Color;
+
+/**
+ * Test case for detecting empty block statements.
+ * @author Lars Kühne
+ **/
+class InputSemantic
+{
+    static {
+        Boolean x = new Boolean(true);
+    }
+
+    {
+        Boolean x = new Boolean(true);
+        Boolean[] y = new Boolean[]{Boolean.TRUE, Boolean.FALSE};
+    }
+
+    Boolean getBoolean()
+    {
+        return new java.lang.Boolean(true);
+    }
+
+    void exHandlerTest()
+    {
+        try {
+        }
+        finally {
+        }
+        try {
+        // something
+        }
+        finally {
+            // something
+        }
+        try {
+            ; // something
+        }
+        finally {
+            ; // statement
+        }
+    }
+
+    /** test **/
+    private static final long IGNORE = 666l + 666L;
+
+    public class EqualsVsHashCode1
+    {
+        public boolean equals(int a)
+        {
+            return a == 1;
+        }
+    }
+
+    // empty instance initializer
+    {
+    }
+
+    private class InputBraces {
+        
+    }
+
+    synchronized void foo() {
+        synchronized (this) {} // not OK
+        synchronized (Class.class) { // OK
+            synchronized (new Object()) {
+                // not OK if checking statements
+            }
+        }
+    }
+    
+    
+    static {
+       
+    int a = 0;}
+    
+    static {
+        
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSemantic2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java
index e95753184..a85c38998 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSemantic2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.blocks;
 
 import java.io.*; // star import for instantiation tests
 import java.awt.Dimension; // explicit import for instantiation tests
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputCatchOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputCatchOnly.java
new file mode 100644
index 000000000..ac1a01a11
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputCatchOnly.java
@@ -0,0 +1,34 @@
+package com.puppycrawl.tools.checkstyle.checks.naming;
+
+/**
+ * Test case for skipping over catch names.
+ **/
+public class InputCatchOnly {
+    int foo() {
+        if (System.currentTimeMillis() > 1000)
+            return 1;
+
+        int test = 0;
+
+        try
+        {
+            return 1;
+        }
+        catch (Exception e)
+        {
+            return 0;
+        }
+    }
+
+    public InputCatchOnly()
+    {
+        return;
+    }
+    
+    class InnerFoo
+    {
+        public void fooInnerMethod ()
+        {
+        }
+    }
+}