From 5d9f7028d78ae69dd2d21da82e581c4498abec03 Mon Sep 17 00:00:00 2001 From: rnveach Date: Thu, 15 Oct 2015 21:56:17 -0400 Subject: [PATCH] Issue #2161: unify test input locations for annotation package --- .../checks/OuterTypeFilenameCheckTest.java | 3 +- .../annotation/PackageAnnotationTest.java | 19 ++++++- .../annotation/SuppressWarningsCheckTest.java | 55 ++++++++++--------- .../InputPackageAnnotationCheckTest2.java | 2 +- .../checks/annotation/package-info.java | 3 + .../tools/checkstyle/checks/package-info.java | 3 + .../InputAnnotationLocationCheckTest3.java | 12 ---- .../checkstyle/annotation/package-info.java | 3 - .../InputPackageAnnotationCheckTest.java | 2 +- .../InputSuppressWarningsHolder.java | 36 ++++++++++++ .../annotation/SuppressWarningsCompact.java | 2 +- .../annotation/SuppressWarningsConstants.java | 2 +- .../annotation/SuppressWarningsExpanded.java | 2 +- .../annotation/SuppressWarningsSingle.java | 2 +- .../annotation/SuppressWarningsValuePair.java | 2 +- 15 files changed, 97 insertions(+), 51 deletions(-) rename src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/InputPackageAnnotationCheckTest2.java (52%) create mode 100644 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java create mode 100644 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/package-info.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputAnnotationLocationCheckTest3.java delete mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/annotation/package-info.java rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/InputPackageAnnotationCheckTest.java (52%) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputSuppressWarningsHolder.java rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/SuppressWarningsCompact.java (97%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/SuppressWarningsConstants.java (87%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/SuppressWarningsExpanded.java (97%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/SuppressWarningsSingle.java (97%) rename src/test/resources/com/puppycrawl/tools/checkstyle/{ => checks}/annotation/SuppressWarningsValuePair.java (83%) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java index 1d3fd91c7..5ab0d0d8f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java @@ -109,6 +109,7 @@ public class OuterTypeFilenameCheckTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "package-info.java"), expected); + verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/tools/" + + "checkstyle/checks/package-info.java").getCanonicalPath(), expected); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java index 69e427274..5b5571e79 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java @@ -20,6 +20,7 @@ package com.puppycrawl.tools.checkstyle.checks.annotation; import java.io.File; +import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.junit.Assert; @@ -30,6 +31,18 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class PackageAnnotationTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "annotation" + File.separator + filename); + } + + @Override + protected String getNonCompilablePath(String filename) throws IOException { + return super.getNonCompilablePath("checks" + File.separator + + "annotation" + File.separator + filename); + } + /** * This tests a package annotation that is in the package-info.java file. */ @@ -39,7 +52,7 @@ public class PackageAnnotationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "package-info.java"), expected); + verify(checkConfig, getNonCompilablePath("package-info.java"), expected); } @Test @@ -56,7 +69,7 @@ public class PackageAnnotationTest extends BaseCheckTestSupport { final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator + "InputPackageAnnotationCheckTest.java"), expected); + verify(checkConfig, getPath("InputPackageAnnotationCheckTest.java"), expected); } @Test @@ -67,6 +80,6 @@ public class PackageAnnotationTest extends BaseCheckTestSupport { "0: Package annotations must be in the package-info.java info.", }; - verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest2.java").getCanonicalPath(), expected); + verify(checkConfig, getNonCompilablePath("InputPackageAnnotationCheckTest2.java"), expected); } } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java index 6e998c555..8eeab6f1a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java @@ -22,6 +22,7 @@ package com.puppycrawl.tools.checkstyle.checks.annotation; import static com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck.MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED; import java.io.File; +import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.junit.Test; @@ -30,6 +31,12 @@ import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; public class SuppressWarningsCheckTest extends BaseCheckTestSupport { + @Override + protected String getPath(String filename) throws IOException { + return super.getPath("checks" + File.separator + + "annotation" + File.separator + filename); + } + /** * Tests SuppressWarnings with default regex. */ @@ -49,7 +56,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:106: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, " "), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -91,7 +98,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:115: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -115,7 +122,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:47: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -137,7 +144,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:47: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -170,7 +177,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:115: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -200,7 +207,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:115: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -242,7 +249,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:115: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsSingle.java"), expected); + verify(checkConfig, getPath("SuppressWarningsSingle.java"), expected); } /** @@ -271,7 +278,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:194: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, " "), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -332,7 +339,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:202: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -359,7 +366,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:135: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } @@ -379,7 +386,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "64:62: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -421,7 +428,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:202: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -457,7 +464,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:202: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -518,7 +525,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:202: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsCompact.java"), expected); + verify(checkConfig, getPath("SuppressWarningsCompact.java"), expected); } /** @@ -545,7 +552,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:200: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, " "), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -603,7 +610,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -631,7 +638,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:141: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -650,7 +657,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "64:68: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unchecked"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -688,7 +695,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:208: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -725,7 +732,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:208: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } /** @@ -782,7 +789,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { "82:208: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, "unused"), }; - verify(checkConfig, getPath("annotation" + File.separator + "SuppressWarningsExpanded.java"), expected); + verify(checkConfig, getPath("SuppressWarningsExpanded.java"), expected); } @Test @@ -791,8 +798,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator - + "SuppressWarningsConstants.java"), expected); + verify(checkConfig, getPath("SuppressWarningsConstants.java"), expected); } @Test @@ -801,8 +807,7 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport { String[] expected = ArrayUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("annotation" + File.separator - + "SuppressWarningsValuePair.java"), expected); + verify(checkConfig, getPath("SuppressWarningsValuePair.java"), expected); } @Test diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest2.java similarity index 52% rename from src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest2.java rename to src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest2.java index f25593159..7047d7729 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest2.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest2.java @@ -1,5 +1,5 @@ @Deprecated -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; public class InputPackageAnnotationCheckTest2 { diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java new file mode 100644 index 000000000..dcc02837e --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/package-info.java @@ -0,0 +1,3 @@ +@Deprecated +package com.puppycrawl.tools.checkstyle.checks.annotation; + diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/package-info.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/package-info.java new file mode 100644 index 000000000..391a1a43a --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/package-info.java @@ -0,0 +1,3 @@ +@Deprecated +package com.puppycrawl.tools.checkstyle.checks; + diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputAnnotationLocationCheckTest3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputAnnotationLocationCheckTest3.java deleted file mode 100644 index 105317c8d..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputAnnotationLocationCheckTest3.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.puppycrawl.tools.checkstyle.annotation; - -public class InputAnnotationLocationCheckTest3 { - - @interface MyAnnotation1 { - - String value(); - - } -// @MyAnnotation1 - -} \ No newline at end of file diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/package-info.java deleted file mode 100644 index 0badc420c..000000000 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@Deprecated -package com.puppycrawl.tools.checkstyle.annotation; - diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest.java similarity index 52% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest.java index 0d78fef16..66caa924a 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputPackageAnnotationCheckTest.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; @Deprecated public class InputPackageAnnotationCheckTest { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputSuppressWarningsHolder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputSuppressWarningsHolder.java new file mode 100644 index 000000000..c3280cd73 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputSuppressWarningsHolder.java @@ -0,0 +1,36 @@ +package com.puppycrawl.tools.checkstyle.checks.annotation; + +public class InputSuppressWarningsHolder { + static final String UNUSED = "unused"; + + @SuppressWarnings(UNUSED) + int a; + @SuppressWarnings(InputSuppressWarningsHolder.UNUSED) + int b; + @SuppressWarnings(com.puppycrawl.tools.checkstyle.checks.annotation.InputSuppressWarningsHolder.UNUSED) + int c; + @SuppressWarnings(value = UNUSED) + int d; + @SuppressWarnings(value = InputSuppressWarningsHolder.UNUSED) + int e; + @SuppressWarnings(value = com.puppycrawl.tools.checkstyle.checks.annotation.InputSuppressWarningsHolder.UNUSED) + int f; + @SuppressWarnings((1 != 1) ? "" : "unused") + int g; + @SuppressWarnings("un" + "used") + int h; + @SuppressWarnings((String) "unused") + int i; + @SuppressWarnings({}) + int j; + @SuppressWarnings({UNUSED}) + int k; + @SuppressWarnings({"unused", true ? "unused" : ""}) + int l; +} + +class CustomSuppressWarnings { + @SuppressWarnings + private @interface SuppressWarnings { + } +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsCompact.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCompact.java similarity index 97% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsCompact.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCompact.java index 5baad2951..9acff8c69 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsCompact.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCompact.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; import java.lang.annotation.Documented; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsConstants.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsConstants.java similarity index 87% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsConstants.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsConstants.java index 50adf4c7f..6c960bd52 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsConstants.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsConstants.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; import java.util.List; import java.util.ArrayList; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsExpanded.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsExpanded.java similarity index 97% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsExpanded.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsExpanded.java index cd6682fa0..dd5bf34f3 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsExpanded.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsExpanded.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; import java.lang.annotation.Documented; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsSingle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsSingle.java similarity index 97% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsSingle.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsSingle.java index e9740af88..f2ed060bb 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsSingle.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsSingle.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; import java.lang.annotation.Documented; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsValuePair.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsValuePair.java similarity index 83% rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsValuePair.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsValuePair.java index dc6165f4d..3478d3502 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SuppressWarningsValuePair.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsValuePair.java @@ -1,4 +1,4 @@ -package com.puppycrawl.tools.checkstyle.annotation; +package com.puppycrawl.tools.checkstyle.checks.annotation; import java.util.ArrayList; import java.util.List;