Issue #2161: unify test input locations for checks package

34 files changed, 41 insertions, 46 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineCrAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineCrAtEndOfFile.java
deleted file mode 100644
index 5a03987e5..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineCrAtEndOfFile.java
+++ /dev/null
@@ -1 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
// Test case file for checkstyle.
// Created: 2015
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle;

/**
 * Test case for detection of an existing CR newline at EOF, using the 
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineCrAtEndOfFile
{
}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder4.java
deleted file mode 100644
index eb6c69da5..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder4.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.puppycrawl.tools.checkstyle;
-
-public class InputSuppressWarningsHolder4 {
-
-    @com.puppycrawl.tools.checkstyle.CustomAnnotation()
-    int a;
-    
-}
-@interface CustomAnnotation {
-}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/Input15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/Input15Extensions.java
index 37184115f..8ff22d7c2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/Input15Extensions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/Input15Extensions.java
@@ -1,5 +1,5 @@
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 @interface MyAnnotation1 {
     String name();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputArrayTypeStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputArrayTypeStyle.java
index 547759117..546afdaf2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputArrayTypeStyle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputArrayTypeStyle.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 /**
  * Test case for ArrayTypeStyle (Java vs C)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharactersCheck.java
index 10b5f69bd..8e35c520a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharactersCheck.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyFile.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputEmptyFile.txt
index e69de29bb..e69de29bb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyFile.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputEmptyFile.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputEmptyStatement.java
index 008325051..dd57a65a2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputEmptyStatement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputEmptyStatement.java
@@ -1,10 +1,5 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
-/**
- * Input class for testing EmptyStatementCheck
- * @author Rick Giles
- * @version 5-May-2003
- */
 public class InputEmptyStatement
 {
    public InputEmptyStatement()
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputFinalParameters.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputFinalParameters.java
index fc0202404..4314dfde0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputFinalParameters.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputFinalParameters.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputFinalParametersPrimitiveTypes.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputFinalParametersPrimitiveTypes.java
index 0afd2f6f9..2d44c98c8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputFinalParametersPrimitiveTypes.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputFinalParametersPrimitiveTypes.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputFinalParametersPrimitiveTypes
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java
new file mode 100644
index 000000000..1305a0c00
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrAtEndOfFile.java
@@ -0,0 +1 @@
+////////////////////////////////////////////////////////////////////////////////
// Test case file for checkstyle.
// Created: 2015
////////////////////////////////////////////////////////////////////////////////
package com.puppycrawl.tools.checkstyle.checks;

/**
 * Test case for detection of an existing CR newline at EOF, using the 
 * NewlineAtEndOfFileCheck.
 * @author Martin Steiger
 **/
public interface InputNewlineCrAtEndOfFile
{
}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineCrlfAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrlfAtEndOfFile.java
index bd394bba5..8cdfa10c7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineCrlfAtEndOfFile.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineCrlfAtEndOfFile.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 /**
  * Test case for detection of an existing CRLF newline at EOF, using the 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineLfAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineLfAtEndOfFile.java
index 315c78fe7..08ec9c937 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNewlineLfAtEndOfFile.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNewlineLfAtEndOfFile.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2015
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 /**
  * Test case for detection of an existing LF newline at EOF, using the 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNoNewlineAtEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNoNewlineAtEndOfFile.java
index cad99308b..218e61727 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputNoNewlineAtEndOfFile.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputNoNewlineAtEndOfFile.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 /**
  * Test case for detection of missing newlines at EOF, using the
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck1.java
index b0bdd1fe5..ebab957e9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck1.java
@@ -1,5 +1,5 @@
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputOuterTypeFilenameCheck1 {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck2.java
index fc73cae6d..cffd1d3d9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck2.java
@@ -1,5 +1,5 @@
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputOuterTypeFilenameCheck2 {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck3.java
index 1304d82c9..54748e589 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck3.java
@@ -1,5 +1,5 @@
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 class InputOuterTypeFilenameCheck3 {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck5.java
index 54c96afa8..6a5324e5c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputOuterTypeFilenameCheck5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck5.java
@@ -1,5 +1,5 @@
 // someexamples of 1.5 extensions
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
  class InputOuterTypeFilenameCheckWrongName2 {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSemantic.java
index 5f1dd5de2..978963767 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSemantic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSemantic.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 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/InputSimple.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSimple.java
index 94201c2c9..fc137db48 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSimple.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSimple.java
@@ -3,7 +3,7 @@
 // Created: Feb-2001
 // Ignore error
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 import java.io.*;
 /**
  * Contains simple mistakes:
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder.java
index b3cb13f67..5bbbc4951 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputSuppressWarningsHolder {
     static final String UNUSED = "unused";
@@ -7,13 +7,13 @@ public class InputSuppressWarningsHolder {
     int a;
     @SuppressWarnings(InputSuppressWarningsHolder.UNUSED)
     int b;
-    @SuppressWarnings(com.puppycrawl.tools.checkstyle.InputSuppressWarningsHolder.UNUSED)
+    @SuppressWarnings(com.puppycrawl.tools.checkstyle.checks.InputSuppressWarningsHolder.UNUSED)
     int c;
     @SuppressWarnings(value = UNUSED)
     int d;
     @SuppressWarnings(value = InputSuppressWarningsHolder.UNUSED)
     int e;
-    @SuppressWarnings(value = com.puppycrawl.tools.checkstyle.InputSuppressWarningsHolder.UNUSED)
+    @SuppressWarnings(value = com.puppycrawl.tools.checkstyle.checks.InputSuppressWarningsHolder.UNUSED)
     int f;
     @SuppressWarnings((1 != 1) ? "" : "unused")
     int g;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder2.java
index b293ba302..77b02579b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputSuppressWarningsHolder2
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder3.java
index 793d183d5..6e30fd2fe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputSuppressWarningsHolder3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder3.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputSuppressWarningsHolder3 {
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder4.java
new file mode 100644
index 000000000..3535730c2
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputSuppressWarningsHolder4.java
@@ -0,0 +1,10 @@
+package com.puppycrawl.tools.checkstyle.checks;
+
+public class InputSuppressWarningsHolder4 {
+
+    @com.puppycrawl.tools.checkstyle.checks.CustomAnnotation()
+    int a;
+    
+}
+@interface CustomAnnotation {
+}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTrailingComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputTrailingComment.java
index 45c181294..d6cdeb1fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputTrailingComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputTrailingComment.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 public class InputTrailingComment {
     int i; // don't use trailing comments :)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain.java
index 73044d75d..646a1a211 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 /**
  * Test case for UncommentedMainCheck
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain2.java
index dff167c4d..831fb4a12 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain2.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 
 public class InputUncommentedMain2
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain3.java
index f7b4773e9..70378c175 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain3.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 class oneMoreClass {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain4.java
index 49764c0b4..9f8dbe070 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUncommentedMain4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUncommentedMain4.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2003
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle;
+package com.puppycrawl.tools.checkstyle.checks;
 
 class InputUncommentedMainTest4
 {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUniquePropertiesCheck.properties b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniquePropertiesCheck.properties
index c65722e1e..c65722e1e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputUniquePropertiesCheck.properties
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniquePropertiesCheck.properties
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 dae791118..6011add9a 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
@@ -39,7 +39,7 @@ import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.CheckerTest;
 import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.Input15Extensions;
+import com.puppycrawl.tools.checkstyle.checks.Input15Extensions;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
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 3c9248d33..d918678f2 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
@@ -41,7 +41,7 @@ import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.CheckerTest;
 import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.Input15Extensions;
+import com.puppycrawl.tools.checkstyle.checks.Input15Extensions;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
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 748fb9ae3..a047b22ac 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
@@ -39,7 +39,7 @@ import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.CheckerTest;
 import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.Input15Extensions;
+import com.puppycrawl.tools.checkstyle.checks.Input15Extensions;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
index a62d5795e..9ed2ed82e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
@@ -39,7 +39,7 @@ import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.CheckerTest;
 import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.Input15Extensions;
+import com.puppycrawl.tools.checkstyle.checks.Input15Extensions;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
index dc372606b..1fbdd2677 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
@@ -38,7 +38,7 @@ import com.puppycrawl.tools.checkstyle.Checker;
 import com.puppycrawl.tools.checkstyle.CheckerTest;
 import com.puppycrawl.tools.checkstyle.BaseFileSetCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.Definitions;
-import com.puppycrawl.tools.checkstyle.Input15Extensions;
+import com.puppycrawl.tools.checkstyle.checks.Input15Extensions;
 import com.puppycrawl.tools.checkstyle.ConfigurationLoaderTest;
 import com.puppycrawl.tools.checkstyle.PackageNamesLoader;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;