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

9 files changed, 35 insertions, 29 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
index 7e5ea4d2f..e4cc8f9df 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheckTest.java
@@ -36,13 +36,17 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "coding" + File.separator + filename);
+                + "coding" + File.separator
+                + "packagedeclaration" + File.separator
+                + filename);
     }
 
     @Override
     protected String getNonCompilablePath(String filename) throws IOException {
         return super.getNonCompilablePath("checks" + File.separator
-                + "coding" + File.separator + filename);
+                + "coding" + File.separator
+                + "packagedeclaration" + File.separator
+                + filename);
     }
 
     @Test
@@ -62,7 +66,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
 
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputPackageDeclaration.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationPlain.java"), expected);
     }
 
     @Test
@@ -73,7 +77,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "1: " + getCheckMessage(MSG_KEY_MISSING),
         };
 
-        verify(checkConfig, getPath("InputWithCommentOnly.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationWithCommentOnly.java"), expected);
     }
 
     @Test
@@ -84,7 +88,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "1: " + getCheckMessage(MSG_KEY_MISMATCH),
         };
 
-        verify(checkConfig, getPath("InputPackageDiffDirectory.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationDiffDirectory.java"), expected);
     }
 
     @Test
@@ -95,7 +99,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "1: " + getCheckMessage(MSG_KEY_MISMATCH),
         };
 
-        verify(checkConfig, getPath("InputPackageDiffDirectoryAtParent.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationDiffDirectoryAtParent.java"), expected);
     }
 
     @Test
@@ -106,7 +110,8 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
             "1: " + getCheckMessage(MSG_KEY_MISMATCH),
         };
 
-        verify(checkConfig, getPath("InputPackageDiffDirectoryAtSubpackage.java"), expected);
+        verify(checkConfig,
+                getPath("InputPackageDeclarationDiffDirectoryAtSubpackage.java"), expected);
     }
 
     @Test
@@ -115,7 +120,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("matchDirectoryStructure", "false");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputPackageDiffDirectory.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationDiffDirectory.java"), expected);
     }
 
     @Test
@@ -124,7 +129,7 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("matchDirectoryStructure", "false");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputPackageDiffDirectoryAtParent.java"), expected);
+        verify(checkConfig, getPath("InputPackageDeclarationDiffDirectoryAtParent.java"), expected);
     }
 
     @Test
@@ -133,7 +138,8 @@ public class PackageDeclarationCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("matchDirectoryStructure", "false");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputPackageDiffDirectoryAtSubpackage.java"), expected);
+        verify(checkConfig,
+                getPath("InputPackageDeclarationDiffDirectoryAtSubpackage.java"), expected);
     }
 
     @Test
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputNoPackage.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputNoPackage.java
index 4fd3b562e..4fd3b562e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputNoPackage.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputNoPackage.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtParent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtParent.java
deleted file mode 100644
index 46ca11eb6..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtParent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks;
-
-public class InputPackageDiffDirectoryAtParent {
-    public String value;
-
-    private void get(){
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtSubpackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtSubpackage.java
deleted file mode 100644
index 72275aaf1..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectoryAtSubpackage.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.coding.subpackage;
-
-public class InputPackageDiffDirectoryAtSubpackage {
-    public String value;
-
-    private void get(){
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectory.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory.java
index ffe12ed01..2c1c799b7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDiffDirectory.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectory.java
@@ -1,6 +1,6 @@
 package com.testing.packagediffdirectory;
 
-public class InputPackageDiffDirectory {
+public class InputPackageDeclarationDiffDirectory {
     public String value;
 
     private void get(){
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDeclaration.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent.java
index 552f05a49..d24baebec 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputPackageDeclaration.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtParent.java
@@ -1,8 +1,8 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-class InputPackageDeclaration {
+public class InputPackageDeclarationDiffDirectoryAtParent {
     public String value;
-    
+
     private void get(){
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage.java
new file mode 100644
index 000000000..f89307fba
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationDiffDirectoryAtSubpackage.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.coding.packagedeclaration.subpackage;
+
+public class InputPackageDeclarationDiffDirectoryAtSubpackage {
+    public String value;
+
+    private void get(){
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationPlain.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationPlain.java
new file mode 100644
index 000000000..21bfd916b
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationPlain.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.coding.packagedeclaration;
+
+class InputPackageDeclarationPlain {
+    public String value;
+    
+    private void get(){
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputWithCommentOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationWithCommentOnly.java
index 06842070a..06842070a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputWithCommentOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/packagedeclaration/InputPackageDeclarationWithCommentOnly.java