Issue #2161: unify test input locations for whitespace package

19 files changed, 28 insertions, 32 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/Gh47.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/Gh47.java
index eb59bc06b..6c352f46e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/Gh47.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/Gh47.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import java.util.List;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheck.java
index 7dc3321cc..fc45cd6b3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheck.java
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheckHeader.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckHeader.java
index a2e49bbe9..469247e78 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheckHeader.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckHeader.java
@@ -16,6 +16,6 @@
 // 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.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 class InputEmptyLineSeparatorCheckHeader {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java
index b6a6614d4..8f9841132 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 
 import java.util.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorFormerException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorFormerException.java
new file mode 100644
index 000000000..00ec36991
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorFormerException.java
@@ -0,0 +1,6 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
+
+public class InputEmptyLineSeparatorFormerException
+{
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java
index 0f8b93aa7..f2c36055a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 public class InputEmptyLineSeparatorMultipleFieldsInClass
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java
index 68b830401..61ca18f0a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;import java.util.List;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;import java.util.List;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputForWhitespace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputForWhitespace.java
index ace4c73ad..f788bf1fb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputForWhitespace.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputForWhitespace.java
@@ -2,7 +2,7 @@
 // Test case file for FOR_ITERATION and whitespace.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 class InputForWhitespace
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceCheck.java
index 4386feea5..398f0252a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceCheck.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceInnerClassCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClassCheck.java
index 584410bc8..12e2b0f14 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceInnerClassCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClassCheck.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import java.util.List;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputMethodParamPad.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodParamPad.java
index 7b9f9804d..47e7cb8a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputMethodParamPad.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodParamPad.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 import java.util.Vector;
 /** Test input for MethodDefPadCheck */
 public class InputMethodParamPad
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOpWrap.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputOpWrap.java
index 6b0216b65..ae1183a93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOpWrap.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputOpWrap.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 /**
  * Test case for detecting operator wrapping.
@@ -49,17 +49,13 @@ class InputOpWrap
     }
 }
 
-class badCase<T extends Foo &
+class badCase2<T extends Foo &
     Bar> {
 }
 
 class goodCase<T extends Foo & Bar> {
 }
 
-interface Bar {
-	
-}
-
 class Switch {
     public void test(int i, int j) {
         switch(j) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputPrePreviousLineEmptiness.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputPrePreviousLineEmptiness.java
new file mode 100644
index 000000000..1a1aef1eb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputPrePreviousLineEmptiness.java
@@ -0,0 +1,6 @@
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
+
+public class InputPrePreviousLineEmptiness {
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputSeparatorWrap.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputSeparatorWrap.java
index 2a5594a31..a0f2d4011 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputSeparatorWrap.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputSeparatorWrap.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 public class InputSeparatorWrap<T extends Foo 
                     & Bar> { 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputWhitespaceAround.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputWhitespaceAround.java
index a645e55d3..0de832df9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputWhitespaceAround.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputWhitespaceAround.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 @SuppressWarnings({"this", "that"})
 public class InputWhitespaceAround
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/NoLineWrapBadInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapBadInput.java
index bc2c675db..807edd6a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/NoLineWrapBadInput.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapBadInput.java
@@ -1,5 +1,5 @@
 package com.puppycrawl.tools.
-    checkstyle.whitespace;
+    checkstyle.checks.whitespace;
 
 import com.google.common.annotations.Beta;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/NoLineWrapGoodInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapGoodInput.java
index 361a2edd5..2273b62d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/NoLineWrapGoodInput.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/NoLineWrapGoodInput.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
 import com.google.common.annotations.Beta;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorFormerException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorFormerException.java
deleted file mode 100644
index f6d8f3798..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorFormerException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.puppycrawl.tools.checkstyle.whitespace;
-
-public class InputEmptyLineSeparatorFormerException
-{
-
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputPrePreviousLineEmptiness.java b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputPrePreviousLineEmptiness.java
deleted file mode 100644
index c0536f37d..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputPrePreviousLineEmptiness.java
+++ /dev/null
@@ -1,6 +0,0 @@
-
-package com.puppycrawl.tools.checkstyle.whitespace;
-
-public class InputPrePreviousLineEmptiness {
-
-}