Issue #2161: unify test input locations for import package

16 files changed, 12 insertions, 50 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java
index 089db74ea..dae791118 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java
@@ -4,7 +4,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import com.puppycrawl.tools.checkstyle.imports.*;
+import com.puppycrawl.tools.checkstyle.checks.imports.*;
 
 import java.io.*;
 import java.lang.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java
index c2a5feed3..3c9248d33 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java
@@ -4,7 +4,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import com.puppycrawl.tools.checkstyle.imports.*;
+import com.puppycrawl.tools.checkstyle.checks.imports.*;
 
 import java.io.*;
 import java.lang.*;
@@ -26,8 +26,8 @@ import static javax.swing.WindowConstants.*;
 import static javax.swing.WindowConstants.*;
 import static java.io.File.createTempFile;
 import static java.io.File.pathSeparator;
-import static com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass;
-import static com.puppycrawl.tools.checkstyle.imports.InputAvoidStaticImportNestedClass.InnerClass.one;
+import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass;
+import static com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one;
 
 import java.awt.Component;
 import java.awt.Graphics2D;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputAvoidStaticImportNestedClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportNestedClass.java
index 8e9cbabf0..a9f112b8d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputAvoidStaticImportNestedClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportNestedClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 public class InputAvoidStaticImportNestedClass{
     public static Integer zero=0;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
index 92a185f6f..748fb9ae3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
@@ -4,7 +4,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import com.puppycrawl.tools.checkstyle.imports.*;
+import com.puppycrawl.tools.checkstyle.checks.imports.*;
 
 import java.io.*;
 import java.lang.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportControl.java
index addb2438d..248323395 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportControl.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.awt.Image;
 import javax.swing.border.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_MODIFIED_FOR_UT.dtd b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd
index c31a239fc..c31a239fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_MODIFIED_FOR_UT.dtd
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_WithNewElement.xml
index 8451e1c49..d024a08f8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_WithNewElement.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_WithNewElement.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE import-control PUBLIC
     "-//Puppy Crawl//DTD Import Control 1.UT//EN"
-    "src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_MODIFIED_FOR_UT.dtd">
+    "src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_MODIFIED_FOR_UT.dtd">
 
 <import-control pkg="com">
   <allow class="some.class"/>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_broken.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_broken.xml
index 02f9b152d..02f9b152d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_broken.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_broken.xml
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_complete.xml
index 3bdfcad3e..3bdfcad3e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_complete.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_complete.xml
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml
index 422652aba..0330a95ab 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one-re.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one-re.xml
@@ -3,7 +3,7 @@
     "-//Puppy Crawl//DTD Import Control 1.1//EN"
     "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
 
-<import-control pkg="com.puppycrawl.tools.checkstyle">
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks">
   <allow class="java\.awt.Image" regex="true"/>
   <allow class="java..*.Button.ABORT" regex="true"/>
   <allow class="java.(io|lui).File" local-only="true" regex="true"/>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml
index c3f322364..56284c1eb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_one.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_one.xml
@@ -3,7 +3,7 @@
     "-//Puppy Crawl//DTD Import Control 1.0//EN"
     "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
 
-<import-control pkg="com.puppycrawl.tools.checkstyle">
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks">
   <allow class="java.awt.Image"/>
   <allow class="java.awt.Button.ABORT"/>
   <allow class="java.io.File" local-only="true"/>
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two-re.xml
index 1ffe4b004..9105f05f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two-re.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two-re.xml
@@ -3,7 +3,7 @@
     "-//Puppy Crawl//DTD Import Control 1.1//EN"
     "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
 
-<import-control pkg="com.puppycrawl.tools.checkstyle">
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks">
   <allow class="java\.awt\.Image" regex="true"/>
   <allow class="java\..*\.File" local-only="true" regex="true"/>
   <subpackage name="imports">
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two.xml
index a8293c7ec..1e589b5bb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_two.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_two.xml
@@ -3,7 +3,7 @@
     "-//Puppy Crawl//DTD Import Control 1.0//EN"
     "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
 
-<import-control pkg="com.puppycrawl.tools.checkstyle">
+<import-control pkg="com.puppycrawl.tools.checkstyle.checks">
   <allow class="java.awt.Image"/>
   <allow class="java.io.File" local-only="true"/>
   <subpackage name="imports">
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_wrong.xml b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_wrong.xml
index 76cac8c77..76cac8c77 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/import-control_wrong.xml
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/import-control_wrong.xml
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java
deleted file mode 100644
index 1363138a9..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder3.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.puppycrawl.tools.checkstyle.imports;
-
-import static java.io.File.createTempFile;
-import static java.awt.Button.ABORT;
-import static javax.swing.WindowConstants.*;
-
-import com.puppycrawl.tools.*;
-import java.util.StringTokenizer;
-import java.util.*;
-import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.*;
-
-import com.puppycrawl.tools.*;
-import com.*;
-
-import com.google.common.*;
-import org.junit.*;
-
-public class InputCustomImportOrder3 {
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java
deleted file mode 100644
index 508a8706b..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderTemp.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.puppycrawl.tools.checkstyle.imports;
-
-import com.google.common.annotations.VisibleForTesting;
-
-import java.io.Closeable;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class InputCustomImportOrderTemp {
-}