diff options
author | Danny van Bruggen <hexagonaal@gmail.com> | 2018-01-29 20:53:04 +0100 |
---|---|---|
committer | Danny van Bruggen <hexagonaal@gmail.com> | 2018-01-29 20:53:04 +0100 |
commit | 1c2f5c6b653cc7dc72681cfd4b46eb5e33df01de (patch) | |
tree | 0c9b1a2444a277fc49cd5325038e1c02ac0276b0 /javaparser-testing | |
parent | a3d8a24c8c2becb0790b0c7cfca03171c39c2f4b (diff) | |
download | javaparser-1c2f5c6b653cc7dc72681cfd4b46eb5e33df01de.tar.gz |
Redo Javadoc formatting
Diffstat (limited to 'javaparser-testing')
3 files changed, 20 insertions, 10 deletions
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java b/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java index 9458ec37e..8cd0ede01 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java @@ -130,20 +130,19 @@ public class JavadocParserTest { " * Add a field to this and automatically add the import of the type if needed\n" + " *\n" + " * @param typeClass the type of the field\n" + - " * continued in a second line\n" + + " * continued in a second line\n" + " * @param name the name of the field\n" + " * @param modifiers the modifiers like {@link Modifier#PUBLIC}\n" + " * @return the {@link FieldDeclaration} created\n" + " "; Javadoc res = JavadocParser.parse(text); assertEquals(new Javadoc(JavadocDescription.parseText("Add a field to this and automatically add the import of the type if needed")) - .addBlockTag(JavadocBlockTag.createParamBlockTag("typeClass", "the type of the field continued in a second line")) - .addBlockTag(JavadocBlockTag.createParamBlockTag("name", "the name of the field")) - .addBlockTag(JavadocBlockTag.createParamBlockTag("modifiers", "the modifiers like {@link Modifier#PUBLIC}")) - .addBlockTag(new JavadocBlockTag(JavadocBlockTag.Type.RETURN, "the {@link FieldDeclaration} created")), res); + .addBlockTag(JavadocBlockTag.createParamBlockTag("typeClass", "the type of the field\n continued in a second line")) + .addBlockTag(JavadocBlockTag.createParamBlockTag("name", "the name of the field")) + .addBlockTag(JavadocBlockTag.createParamBlockTag("modifiers", "the modifiers like {@link Modifier#PUBLIC}")) + .addBlockTag(new JavadocBlockTag(JavadocBlockTag.Type.RETURN, "the {@link FieldDeclaration} created")), res); } - @Test public void startsWithAsteriskEmpty() { assertEquals(-1, JavadocParser.startsWithAsterisk("")); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java index dd8738ab0..2360d0ce0 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java @@ -178,13 +178,13 @@ public class PrettyPrintVisitorTest { @Test public void multilineJavadocGetsFormatted() { CompilationUnit cu = new CompilationUnit(); - cu.addClass("X").addMethod("abc").setJavadocComment("line1\n line2 *\n * line3"); + cu.addClass("X").addMethod("abc").setJavadocComment(" line1\n line2 *\n * line3"); assertEqualsNoEol("public class X {\n" + "\n" + " /**\n" + " * line1\n" + - " * line2 *\n" + + " * line2 *\n" + " * line3\n" + " */\n" + " void abc() {\n" + @@ -209,7 +209,7 @@ public class PrettyPrintVisitorTest { @Test public void multilineJavadocWithLotsOfEmptyLinesGetsFormattedNeatly() { CompilationUnit cu = new CompilationUnit(); - cu.addClass("X").addMethod("abc").setJavadocComment("\n\n\nab\n\n\ncd\n\n\n"); + cu.addClass("X").addMethod("abc").setJavadocComment("\n\n\n ab\n\n\n cd\n\n\n"); assertEqualsNoEol("public class X {\n" + "\n" + @@ -226,7 +226,7 @@ public class PrettyPrintVisitorTest { @Test public void singlelineJavadocGetsFormatted() { CompilationUnit cu = new CompilationUnit(); - cu.addClass("X").addMethod("abc").setJavadocComment("line1"); + cu.addClass("X").addMethod("abc").setJavadocComment(" line1"); assertEqualsNoEol("public class X {\n" + "\n" + diff --git a/javaparser-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java index ad31ed523..21ecf4cc2 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java @@ -78,4 +78,15 @@ public class UtilsTest { String result = Utils.normalizeEolInTextBlock("\r\n \r \n", "Q"); assertEquals("Q Q Q", result); } + + @Test + public void testTrimTrailingSpaces() { + assertEquals("abc", trimTrailingSpaces("abc")); + assertEquals(" abc", trimTrailingSpaces(" abc")); + assertEquals("abc", trimTrailingSpaces("abc ")); + assertEquals(" abc", trimTrailingSpaces(" abc ")); + assertEquals("abc", trimTrailingSpaces("abc\t\0")); + assertEquals("", trimTrailingSpaces(" ")); + assertEquals("", trimTrailingSpaces("")); + } } |