Issue #3891: reorganized astprinter package inputs

32 files changed, 59 insertions, 57 deletions

diff --git a/config/checkstyle_non_main_files_suppressions.xml b/config/checkstyle_non_main_files_suppressions.xml
index e2497d2a0..19cf1f7bd 100644
--- a/config/checkstyle_non_main_files_suppressions.xml
+++ b/config/checkstyle_non_main_files_suppressions.xml
@@ -11,7 +11,7 @@
 
     <!-- Intentional no new line at the end. -->
      <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]grammars[\\/]comments[\\/]InputFullOfSinglelineComments\.java"/>
-     <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]astprinter[\\/]InputFullOfSinglelineComments\.java"/>
+     <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]asttreestringprinter[\\/]InputAstTreeStringPrinterFullOfSinglelineComments\.java"/>
 
     <!-- Grammar specific input file, should have exact structure to reproduce the case. -->
      <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]grammars[\\/]InputEmbeddedNullChar\.java"/>
@@ -24,7 +24,7 @@
     <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]grammars[\\/]InputRegressionEmptyAst\.txt"/>
 
     <!-- File with CR line separators used for testing -->
-    <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]astprinter[\\/]InputFullOfBlockCommentsCR\.java"/>
+    <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]asttreestringprinter[\\/]InputAstTreeStringPrinterFullOfBlockCommentsCR\.java"/>
 
     <!-- For the testing purposes -->
     <suppress checks="NewlineAtEndOfFile" files="[\\/]test[\\/].*[\\/]checks[\\/]misc[\\/]uniqueproperties[\\/]InputUniquePropertiesWithDuplicates\.properties"/>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
index c33fc7cdd..c90447bad 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinterTest.java
@@ -37,7 +37,7 @@ public class AstTreeStringPrinterTest extends AbstractTreeTestSupport {
 
     @Override
     protected String getPackageLocation() {
-        return "com/puppycrawl/tools/checkstyle/astprinter";
+        return "com/puppycrawl/tools/checkstyle/asttreestringprinter";
     }
 
     @Test
@@ -64,7 +64,7 @@ public class AstTreeStringPrinterTest extends AbstractTreeTestSupport {
 
     @Test
     public void testParseFile() throws Exception {
-        verifyAst(getPath("expectedInputAstTreeStringPrinter.txt"),
+        verifyAst(getPath("ExpectedAstTreeStringPrinter.txt"),
                 getPath("InputAstTreeStringPrinterComments.java"),
                 AstTreeStringPrinter.PrintOptions.WITHOUT_COMMENTS);
     }
@@ -77,62 +77,62 @@ public class AstTreeStringPrinterTest extends AbstractTreeTestSupport {
         final String actual = AstTreeStringPrinter.printAst(text,
                 AstTreeStringPrinter.PrintOptions.WITHOUT_COMMENTS);
         final String expected = new String(Files.readAllBytes(Paths.get(
-                getPath("expectedInputAstTreeStringPrinter.txt"))), StandardCharsets.UTF_8);
+                getPath("ExpectedAstTreeStringPrinter.txt"))), StandardCharsets.UTF_8);
 
         Assert.assertEquals("Print AST output is invalid", expected, actual);
     }
 
     @Test
     public void testParseFileWithComments() throws Exception {
-        verifyAst(getPath("expectedInputAstTreeStringPrinterComments.txt"),
+        verifyAst(getPath("ExpectedAstTreeStringPrinterComments.txt"),
                 getPath("InputAstTreeStringPrinterComments.java"),
                 AstTreeStringPrinter.PrintOptions.WITH_COMMENTS);
     }
 
     @Test
     public void testParseFileWithJavadoc1() throws Exception {
-        verifyJavaAndJavadocAst(getPath("expectedInputAstTreeStringPrinterJavadoc.txt"),
+        verifyJavaAndJavadocAst(getPath("ExpectedAstTreeStringPrinterJavadoc.txt"),
                 getPath("InputAstTreeStringPrinterJavadoc.java"));
     }
 
     @Test
     public void testParseFileWithJavadoc2() throws Exception {
-        verifyJavaAndJavadocAst(getPath("expectedInputAstTreeStringPrinterJavaAndJavadoc.txt"),
+        verifyJavaAndJavadocAst(getPath("ExpectedAstTreeStringPrinterJavaAndJavadoc.txt"),
                 getPath("InputAstTreeStringPrinterJavaAndJavadoc.java"));
     }
 
     @Test
     public void testParseFileWithJavadoc3() throws Exception {
         verifyJavaAndJavadocAst(
-                getPath("expectedInputAstTreeStringPrinterAttributesAndMethodsJavadoc.txt"),
+                getPath("ExpectedAstTreeStringPrinterAttributesAndMethodsJavadoc.txt"),
                 getPath("InputAstTreeStringPrinterAttributesAndMethodsJavadoc.java")
         );
     }
 
     @Test
     public void testJavadocPosition() throws Exception {
-        verifyJavaAndJavadocAst(getPath("expectedJavadocPosition.txt"),
-                getPath("InputJavadocPosition.java"));
+        verifyJavaAndJavadocAst(getPath("ExpectedAstTreeStringPrinterJavadocPosition.txt"),
+                getPath("InputAstTreeStringPrinterJavadocPosition.java"));
     }
 
     @Test
     public void testAstTreeBlockComments() throws Exception {
-        verifyAst(getPath("InputFullOfBlockCommentsAst.txt"),
-                getPath("InputFullOfBlockComments.java"),
+        verifyAst(getPath("ExpectedAstTreeStringPrinterFullOfBlockComments.txt"),
+                getPath("InputAstTreeStringPrinterFullOfBlockComments.java"),
                 AstTreeStringPrinter.PrintOptions.WITH_COMMENTS);
     }
 
     @Test
     public void testAstTreeBlockCommentsCarriageReturn() throws Exception {
-        verifyAst(getPath("InputFullOfBlockCommentsAstCR.txt"),
-                getPath("InputFullOfBlockCommentsCR.java"),
+        verifyAst(getPath("ExpectedAstTreeStringPrinterFullOfBlockCommentsCR.txt"),
+                getPath("InputAstTreeStringPrinterFullOfBlockCommentsCR.java"),
                 AstTreeStringPrinter.PrintOptions.WITH_COMMENTS);
     }
 
     @Test
     public void testAstTreeSingleLineComments() throws Exception {
-        verifyAst(getPath("InputFullOfSinglelineCommentsAst.txt"),
-                getPath("InputFullOfSinglelineComments.java"),
+        verifyAst(getPath("ExpectedAstTreeStringPrinterFullOfSinglelineComments.txt"),
+                getPath("InputAstTreeStringPrinterFullOfSinglelineComments.java"),
                 AstTreeStringPrinter.PrintOptions.WITH_COMMENTS);
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
index ee63939ce..db681e3c5 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinterTest.java
@@ -47,7 +47,7 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
 
     @Override
     protected String getPackageLocation() {
-        return "com/puppycrawl/tools/checkstyle/astprinter";
+        return "com/puppycrawl/tools/checkstyle/detailnodetreestringprinter";
     }
 
     @Test
@@ -57,15 +57,15 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
 
     @Test
     public void testParseFile() throws Exception {
-        verifyJavadocTree(getPath("expectedInputJavadocComment.txt"),
-                getPath("InputJavadocComment.javadoc"));
+        verifyJavadocTree(getPath("ExpectedDetailNodeTreeStringPrinterJavadocComment.txt"),
+                getPath("InputDetailNodeTreeStringPrinterJavadocComment.javadoc"));
     }
 
     @Test
     public void testParseFileWithError() throws Exception {
         try {
             DetailNodeTreeStringPrinter.printFileAst(
-                    new File(getPath("InputJavadocWithError.javadoc")));
+                    new File(getPath("InputDetailNodeTreeStringPrinterJavadocWithError.javadoc")));
             Assert.fail("Javadoc parser didn't fail on missing end tag");
         }
         catch (IllegalArgumentException ex) {
@@ -103,8 +103,9 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
 
     @Test
     public void testNoUnnecessaryTextinJavadocAst() throws Exception {
-        verifyJavadocTree(getPath("expectedNoUnnecessaryTextInJavadocAst.txt"),
-                getPath("InputNoUnnecessaryTextInJavadocAst.javadoc"));
+        verifyJavadocTree(
+                getPath("ExpectedDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.txt"),
+                getPath("InputDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.javadoc"));
     }
 
     @Test
@@ -162,8 +163,9 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
     @Test
     public void testUnescapedJavaCodeWithGenericsInJavadoc() throws Exception {
         try {
-            DetailNodeTreeStringPrinter.printFileAst(new File(getPath(
-                    "InputUnescapedJavaCodeWithGenericsInJavadoc.javadoc")));
+            DetailNodeTreeStringPrinter.printFileAst(new File(
+                    getPath("InputDetailNodeTreeStringPrinter"
+                            + "UnescapedJavaCodeWithGenericsInJavadoc.javadoc")));
         }
         catch (IllegalArgumentException ex) {
             final String expected = (String) GET_PARSE_ERROR_MESSAGE.invoke(null,
@@ -177,7 +179,7 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
     public void testNoViableAltException() throws Exception {
         try {
             DetailNodeTreeStringPrinter.printFileAst(new File(getPath(
-                    "InputNoViableAltException.javadoc")));
+                    "InputDetailNodeTreeStringPrinterNoViableAltException.javadoc")));
         }
         catch (IllegalArgumentException ex) {
             final String expected = (String) GET_PARSE_ERROR_MESSAGE.invoke(null,
@@ -192,7 +194,7 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
     public void testHtmlTagCloseBeforeTagOpen() throws Exception {
         try {
             DetailNodeTreeStringPrinter.printFileAst(new File(getPath(
-                    "InputHtmlTagCloseBeforeTagOpen.javadoc"
+                    "InputDetailNodeTreeStringPrinterHtmlTagCloseBeforeTagOpen.javadoc"
             )));
         }
         catch (IllegalArgumentException ex) {
@@ -208,7 +210,7 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
     public void testWrongHtmlTagOrder() throws Exception {
         try {
             DetailNodeTreeStringPrinter.printFileAst(new File(getPath(
-                    "InputWrongHtmlTagOrder.javadoc"
+                    "InputDetailNodeTreeStringPrinterWrongHtmlTagOrder.javadoc"
             )));
         }
         catch (IllegalArgumentException ex) {
@@ -223,7 +225,7 @@ public class DetailNodeTreeStringPrinterTest extends AbstractTreeTestSupport {
     public void testOmittedStartTagForHtmlElement() throws Exception {
         try {
             DetailNodeTreeStringPrinter.printFileAst(new File(getPath(
-                    "InputOmittedStartTagForHtmlElement.javadoc"
+                    "InputDetailNodeTreeStringPrinterOmittedStartTagForHtmlElement.javadoc"
             )));
         }
         catch (IllegalArgumentException ex) {
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinter.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinter.java
index a235d18ef..a235d18ef 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinter.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinter.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsCR.java b/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsCR.java
deleted file mode 100644
index 8cb32c5dd..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsCR.java
+++ /dev/null
@@ -1 +0,0 @@
-package/*2*/com.puppycrawl.tools.checkstyle.astprinter;
/*13*/
public/*15*/class/*16*/InputFullOfBlockCommentsCR/*49*/{/*
21
*/}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinter.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinter.txt
index 97b757a46..97b757a46 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinter.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinter.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterAttributesAndMethodsJavadoc.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterAttributesAndMethodsJavadoc.txt
index d40bab43f..d40bab43f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterAttributesAndMethodsJavadoc.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterAttributesAndMethodsJavadoc.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterComments.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterComments.txt
index 2fd3700c6..2fd3700c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterComments.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterComments.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfBlockComments.txt
index 86c046eaf..0b560d449 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsAst.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfBlockComments.txt
@@ -65,17 +65,17 @@ CLASS_DEF -> CLASS_DEF [3:6]
 |--BLOCK_COMMENT_BEGIN -> /* [3:25]
 |   |--COMMENT_CONTENT -> 16 [3:27]
 |   `--BLOCK_COMMENT_END -> */ [3:28]
-|--IDENT -> InputFullOfBlockComments [3:31]
-`--OBJBLOCK -> OBJBLOCK [3:62]
-    |--BLOCK_COMMENT_BEGIN -> /* [3:56]
-    |   |--COMMENT_CONTENT -> 49 [3:58]
-    |   `--BLOCK_COMMENT_END -> */ [3:59]
-    |--LCURLY -> { [3:62]
+|--IDENT -> InputAstTreeStringPrinterFullOfBlockComments [3:31]
+`--OBJBLOCK -> OBJBLOCK [3:82]
+    |--BLOCK_COMMENT_BEGIN -> /* [3:76]
+    |   |--COMMENT_CONTENT -> 49 [3:78]
+    |   `--BLOCK_COMMENT_END -> */ [3:79]
+    |--LCURLY -> { [3:82]
     |--METHOD_DEF -> METHOD_DEF [5:7]
     |   |--MODIFIERS -> MODIFIERS [5:7]
-    |   |   |--BLOCK_COMMENT_BEGIN -> /* [3:63]
-    |   |   |   |--COMMENT_CONTENT -> 17 [3:65]
-    |   |   |   `--BLOCK_COMMENT_END -> */ [3:66]
+    |   |   |--BLOCK_COMMENT_BEGIN -> /* [3:83]
+    |   |   |   |--COMMENT_CONTENT -> 17 [3:85]
+    |   |   |   `--BLOCK_COMMENT_END -> */ [3:86]
     |   |   |--BLOCK_COMMENT_BEGIN -> /* [4:1]
     |   |   |   |--COMMENT_CONTENT -> 18 [4:3]
     |   |   |   `--BLOCK_COMMENT_END -> */ [4:4]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsAstCR.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfBlockCommentsCR.txt
index f6730054d..556352d03 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockCommentsAstCR.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfBlockCommentsCR.txt
@@ -26,13 +26,13 @@ CLASS_DEF -> CLASS_DEF [3:0]
 |--BLOCK_COMMENT_BEGIN -> /* [3:17]
 |   |--COMMENT_CONTENT -> 16 [3:19]
 |   `--BLOCK_COMMENT_END -> */ [3:20]
-|--IDENT -> InputFullOfBlockCommentsCR [3:23]
-`--OBJBLOCK -> OBJBLOCK [3:55]
-    |--BLOCK_COMMENT_BEGIN -> /* [3:49]
-    |   |--COMMENT_CONTENT -> 49 [3:51]
-    |   `--BLOCK_COMMENT_END -> */ [3:52]
-    |--LCURLY -> { [3:55]
-    |--BLOCK_COMMENT_BEGIN -> /* [3:56]
-    |   |--COMMENT_CONTENT -> \r21\r [3:58]
+|--IDENT -> InputAstTreeStringPrinterFullOfBlockCommentsCR [3:23]
+`--OBJBLOCK -> OBJBLOCK [3:75]
+    |--BLOCK_COMMENT_BEGIN -> /* [3:69]
+    |   |--COMMENT_CONTENT -> 49 [3:71]
+    |   `--BLOCK_COMMENT_END -> */ [3:72]
+    |--LCURLY -> { [3:75]
+    |--BLOCK_COMMENT_BEGIN -> /* [3:76]
+    |   |--COMMENT_CONTENT -> \r21\r [3:78]
     |   `--BLOCK_COMMENT_END -> */ [5:0]
     `--RCURLY -> } [5:2]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfSinglelineCommentsAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfSinglelineComments.txt
index 7ed1d56a8..401a93b7b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfSinglelineCommentsAst.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterFullOfSinglelineComments.txt
@@ -48,10 +48,10 @@ CLASS_DEF -> CLASS_DEF [16:0]
 |--LITERAL_CLASS -> class [17:0]
 |--SINGLE_LINE_COMMENT -> // [17:5]
 |   `--COMMENT_CONTENT -> 16\n [17:7]
-|--IDENT -> InputFullOfSinglelineComments [18:0]
+|--IDENT -> InputAstTreeStringPrinterFullOfSinglelineComments [18:0]
 `--OBJBLOCK -> OBJBLOCK [19:0]
-    |--SINGLE_LINE_COMMENT -> // [18:29]
-    |   `--COMMENT_CONTENT -> 17\n [18:31]
+    |--SINGLE_LINE_COMMENT -> // [18:49]
+    |   `--COMMENT_CONTENT -> 17\n [18:51]
     |--LCURLY -> { [19:0]
     |--METHOD_DEF -> METHOD_DEF [20:0]
     |   |--MODIFIERS -> MODIFIERS [20:0]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterJavaAndJavadoc.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavaAndJavadoc.txt
index e7cff0b8b..e7cff0b8b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterJavaAndJavadoc.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavaAndJavadoc.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterJavadoc.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavadoc.txt
index 04a95a117..04a95a117 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputAstTreeStringPrinterJavadoc.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavadoc.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedJavadocPosition.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavadocPosition.txt
index 2d860420d..ce7235550 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedJavadocPosition.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/ExpectedAstTreeStringPrinterJavadocPosition.txt
@@ -2,9 +2,9 @@ CLASS_DEF -> CLASS_DEF [1:0]
 |--MODIFIERS -> MODIFIERS [1:0]
 |   `--LITERAL_PUBLIC -> public [1:0]
 |--LITERAL_CLASS -> class [1:7]
-|--IDENT -> InputJavadocPosition [1:13]
-`--OBJBLOCK -> OBJBLOCK [1:34]
-    |--LCURLY -> { [1:34]
+|--IDENT -> InputAstTreeStringPrinterJavadocPosition [1:13]
+`--OBJBLOCK -> OBJBLOCK [1:54]
+    |--LCURLY -> { [1:54]
     |--METHOD_DEF -> METHOD_DEF [2:4]
     |   |--MODIFIERS -> MODIFIERS [2:4]
     |   |--TYPE -> TYPE [2:4]
@@ -15,7 +15,7 @@ CLASS_DEF -> CLASS_DEF [1:0]
     |   |--RPAREN -> ) [2:16]
     |   `--SLIST -> { [2:18]
     |       |--BLOCK_COMMENT_BEGIN -> /* [3:1]
-    |       |   |--COMMENT_CONTENT -> *\r\n\tThis is a method\r\n\t@return void\r\n\t<html\r\n\t [3:3]
+    |       |   |--COMMENT_CONTENT -> *\n\tThis is a method\n\t@return void\n\t<html\n\t [3:3]
     |       |   `--BLOCK_COMMENT_END -> */ [7:1]
     |       `--RCURLY -> } [8:4]
     `--RCURLY -> } [9:0]
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterAttributesAndMethodsJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterAttributesAndMethodsJavadoc.java
index d9176ba36..d9176ba36 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterAttributesAndMethodsJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterAttributesAndMethodsJavadoc.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterComments.java
index ba202ddee..ba202ddee 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterComments.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfBlockComments.java
index 649260862..7b594b77c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfBlockComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfBlockComments.java
@@ -1,6 +1,6 @@
 /*0*//*1*/package/*2*/ com/*3*/./*4*/puppycrawl/*5*/./*6*/tools/*7*/./*8*/checkstyle/*9*/./*10*/astprinter/*11*/;/*12*/
 /*13*/
-/*14*/public/*15*/ class /*16*/InputFullOfBlockComments /*49*/{/*17*/
+/*14*/public/*15*/ class /*16*/InputAstTreeStringPrinterFullOfBlockComments /*49*/{/*17*/
 	/*18*/
 	/*19*/public/*20*/ static/*
 21
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfBlockCommentsCR.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfBlockCommentsCR.java
new file mode 100644
index 000000000..912ebcea1
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfBlockCommentsCR.java
@@ -0,0 +1 @@
+package/*2*/com.puppycrawl.tools.checkstyle.astprinter;
/*13*/
public/*15*/class/*16*/InputAstTreeStringPrinterFullOfBlockCommentsCR/*49*/{/*
21
*/}
\ No newline at end of file
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfSinglelineComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfSinglelineComments.java
index 6709c7f40..e37aec624 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputFullOfSinglelineComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterFullOfSinglelineComments.java
@@ -15,7 +15,7 @@ astprinter//10
 //14
 public//15
 class//16
-InputFullOfSinglelineComments//17
+InputAstTreeStringPrinterFullOfSinglelineComments//17
 {//18
 public//19
 static//20
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterJavaAndJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavaAndJavadoc.java
index 28c6e65aa..28c6e65aa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterJavaAndJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavaAndJavadoc.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterJavadoc.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavadoc.java
index 901b155d8..901b155d8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputAstTreeStringPrinterJavadoc.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavadoc.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocPosition.java b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavadocPosition.java
index 47c8cffac..a69cc11a4 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocPosition.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/asttreestringprinter/InputAstTreeStringPrinterJavadocPosition.java
@@ -1,4 +1,4 @@
-public class InputJavadocPosition {
+public class InputAstTreeStringPrinterJavadocPosition {
     void method() {
 	/**
 	This is a method
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputJavadocComment.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/ExpectedDetailNodeTreeStringPrinterJavadocComment.txt
index c4c9c5ac7..c4c9c5ac7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedInputJavadocComment.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/ExpectedDetailNodeTreeStringPrinterJavadocComment.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedNoUnnecessaryTextInJavadocAst.txt b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/ExpectedDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.txt
index 460327c84..460327c84 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/expectedNoUnnecessaryTextInJavadocAst.txt
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/ExpectedDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.txt
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputHtmlTagCloseBeforeTagOpen.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterHtmlTagCloseBeforeTagOpen.javadoc
index 70e190be8..70e190be8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputHtmlTagCloseBeforeTagOpen.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterHtmlTagCloseBeforeTagOpen.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocComment.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterJavadocComment.javadoc
index 0f8616750..0f8616750 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocComment.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterJavadocComment.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocWithError.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterJavadocWithError.javadoc
index f5319130c..f5319130c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputJavadocWithError.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterJavadocWithError.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputNoUnnecessaryTextInJavadocAst.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.javadoc
index 9fc3c1fb1..9fc3c1fb1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputNoUnnecessaryTextInJavadocAst.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterNoUnnecessaryTextInJavadocAst.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputNoViableAltException.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterNoViableAltException.javadoc
index 624cb929d..624cb929d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputNoViableAltException.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterNoViableAltException.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputOmittedStartTagForHtmlElement.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterOmittedStartTagForHtmlElement.javadoc
index aa984faef..aa984faef 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputOmittedStartTagForHtmlElement.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterOmittedStartTagForHtmlElement.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputUnescapedJavaCodeWithGenericsInJavadoc.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterUnescapedJavaCodeWithGenericsInJavadoc.javadoc
index f786d83d6..f786d83d6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputUnescapedJavaCodeWithGenericsInJavadoc.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterUnescapedJavaCodeWithGenericsInJavadoc.javadoc
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputWrongHtmlTagOrder.javadoc b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterWrongHtmlTagOrder.javadoc
index 781ea678f..781ea678f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/astprinter/InputWrongHtmlTagOrder.javadoc
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/detailnodetreestringprinter/InputDetailNodeTreeStringPrinterWrongHtmlTagOrder.javadoc