Issue #2161: unify test input file names

36 files changed, 7 insertions, 38 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/Bug3553541.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/Bug3553541.java
deleted file mode 100644
index 18758d8f1..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/Bug3553541.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.puppycrawl.tools.checkstyle.grammars;
-
-import java.util.List;
-import java.util.ArrayList;
-
-// Demonstrates the bug #3553541
-class Bug3553541
-{
-    List<? super long[]> a;
-    {
-        a = new ArrayList<long[]>();
-    }
-    List<? super Integer[]> b;
-    {
-        b = new ArrayList<Integer[]>();
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/EofBug1667137.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/EofBug1667137.java
deleted file mode 100644
index 266895b14..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/EofBug1667137.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.puppycrawl.tools.checkstyle.grammars;
-
-// Demonstrates the bug #1667137
-class EofBug1667137 {
-
-    void checkstyleIsBroken() {
-        EofBug1667137 borkage = new EofBug1667137() {
-
-                <T extends EofBug1667137> T borked(T brokenness) {
-                    return brokenness;
-                }
-            };
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputLineCommentAtTheEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputLineCommentAtTheEndOfFile.java
new file mode 100644
index 000000000..f3fed923c
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputLineCommentAtTheEndOfFile.java
@@ -0,0 +1,5 @@
+package com.puppycrawl.tools.checkstyle.grammars;
+
+public class InputLineCommentAtTheEndOfFile
+{
+} // EOF on this line
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTestInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputMultiDimensionalArraysInGenerics.java
index 63a3db255..350c317da 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/MultiDimensionalArraysInGenericsTestInput.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputMultiDimensionalArraysInGenerics.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class MultiDimensionalArraysInGenericsTestInput {
+public class InputMultiDimensionalArraysInGenerics {
 
     @SuppressWarnings("unused")
     void withUpperBound(List<? extends int[][]> list) {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscape.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputUnicodeEscape.java
index 9b32a8ed6..748cfc9ed 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/UnicodeEscape.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/InputUnicodeEscape.java
@@ -3,7 +3,7 @@ package com.puppycrawl.tools.checkstyle.grammars;
 /**
  * Input for unicode escapes.
  */
-public class UnicodeEscape
+public class InputUnicodeEscape
 {
     char a = '\u005cr';
     char b = '\u005cn';
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFile.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFile.java
deleted file mode 100644
index 87697ea69..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/LineCommentAtTheEndOfFile.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.puppycrawl.tools.checkstyle.grammars;
-
-public class LineCommentAtTheEndOfFile
-{
-} // EOF on this line
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/LeadingAsterisks.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/InputLeadingAsterisks.txt
index 070f5a220..070f5a220 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/LeadingAsterisks.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/InputLeadingAsterisks.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/AttributeValueWithoutQuotes.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputAttributeValueWithoutQuotes.txt
index 4cecd2ae1..4cecd2ae1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/AttributeValueWithoutQuotes.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputAttributeValueWithoutQuotes.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/ClosedOtherTag.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputClosedOtherTag.txt
index c9f4d7af8..c9f4d7af8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/ClosedOtherTag.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputClosedOtherTag.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/Comments.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputComments.txt
index 350b64871..350b64871 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/Comments.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputComments.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/HtmlTagsInParagraph.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputHtmlTagsInParagraph.txt
index 156abc21c..156abc21c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/HtmlTagsInParagraph.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputHtmlTagsInParagraph.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/ListWithUnclosedItemInUnclosedParagraph.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputListWithUnclosedItemInUnclosedParagraph.txt
index 7d2a71ade..7d2a71ade 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/ListWithUnclosedItemInUnclosedParagraph.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputListWithUnclosedItemInUnclosedParagraph.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/MixedCaseOfHtmlTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputMixedCaseOfHtmlTags.txt
index 98f2a3fcc..98f2a3fcc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/MixedCaseOfHtmlTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputMixedCaseOfHtmlTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/NegativeNumberInAttribute.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputNegativeNumberInAttribute.txt
index f41c5aee9..f41c5aee9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/NegativeNumberInAttribute.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputNegativeNumberInAttribute.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/OneSimpleHtmlTag.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputOneSimpleHtmlTag.txt
index 1ea96c766..1ea96c766 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/OneSimpleHtmlTag.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputOneSimpleHtmlTag.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/UnclosedAndClosedParagraphs.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputUnclosedAndClosedParagraphs.txt
index d2534841d..d2534841d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/UnclosedAndClosedParagraphs.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputUnclosedAndClosedParagraphs.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/UnclosedParagraphFollowedByJavadocTag.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputUnclosedParagraphFollowedByJavadocTag.txt
index 00b892c0e..00b892c0e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/UnclosedParagraphFollowedByJavadocTag.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/htmlTags/InputUnclosedParagraphFollowedByJavadocTag.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AllJavadocInlineTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAllJavadocInlineTags.txt
index 2701428d2..2701428d2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AllJavadocInlineTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAllJavadocInlineTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AllStandardJavadocTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAllStandardJavadocTags.txt
index ef5bd4a39..ef5bd4a39 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AllStandardJavadocTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAllStandardJavadocTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AsteriskInJavadocInlineTag.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAsteriskInJavadocInlineTag.txt
index 7ec113185..7ec113185 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AsteriskInJavadocInlineTag.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAsteriskInJavadocInlineTag.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AsteriskInLiteral.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAsteriskInLiteral.txt
index 03385c221..03385c221 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AsteriskInLiteral.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAsteriskInLiteral.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AuthorWithMailto.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAuthorWithMailto.txt
index ddbc81bb3..ddbc81bb3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/AuthorWithMailto.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputAuthorWithMailto.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/CustomJavadocTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputCustomJavadocTags.txt
index 2a507b316..2a507b316 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/CustomJavadocTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputCustomJavadocTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/DocRootInheritDoc.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputDocRootInheritDoc.txt
index 3f0dd01e7..3f0dd01e7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/DocRootInheritDoc.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputDocRootInheritDoc.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/DollarInLink.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputDollarInLink.txt
index 622f30cb9..622f30cb9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/DollarInLink.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputDollarInLink.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/FewWhiteSpacesAsSeparator.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputFewWhiteSpacesAsSeparator.txt
index eda5ad21f..eda5ad21f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/FewWhiteSpacesAsSeparator.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputFewWhiteSpacesAsSeparator.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InnerBracesInCodeTag.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputInnerBracesInCodeTag.txt
index ab0f6f399..ab0f6f399 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InnerBracesInCodeTag.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputInnerBracesInCodeTag.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/JavadocTagDescriptionWithInlineTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputJavadocTagDescriptionWithInlineTags.txt
index 0d828be43..0d828be43 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/JavadocTagDescriptionWithInlineTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputJavadocTagDescriptionWithInlineTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/LinkInlineTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputLinkInlineTags.txt
index 71e2aa4c1..71e2aa4c1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/LinkInlineTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputLinkInlineTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/NewlineAndAsteriskInParameters.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputNewlineAndAsteriskInParameters.txt
index 00c49ae2e..00c49ae2e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/NewlineAndAsteriskInParameters.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputNewlineAndAsteriskInParameters.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/ParamWithGeneric.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputParamWithGeneric.txt
index 6a40c99a9..6a40c99a9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/ParamWithGeneric.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputParamWithGeneric.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/SeeReferenceWithFewNestedClasses.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSeeReferenceWithFewNestedClasses.txt
index 0939ca51a..0939ca51a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/SeeReferenceWithFewNestedClasses.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSeeReferenceWithFewNestedClasses.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/Serial.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSerial.txt
index 3302fea61..3302fea61 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/Serial.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSerial.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/Since.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSince.txt
index 25096fc78..25096fc78 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/Since.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputSince.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/TextBeforeJavadocTags.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputTextBeforeJavadocTags.txt
index 7b8c66e00..7b8c66e00 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/TextBeforeJavadocTags.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputTextBeforeJavadocTags.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/TwoLinkTagsInRow.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputTwoLinkTagsInRow.txt
index 8de68299b..8de68299b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/TwoLinkTagsInRow.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/javadoc/javadocTags/InputTwoLinkTagsInRow.txt