Remove obnoxious methods again, add JavadocDescription.getElements()

2 files changed, 15 insertions, 15 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 34dfe0840..b68eaea8d 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java
@@ -103,8 +103,8 @@ public class JavadocParserTest {
 
 
         assertEquals(underTest, JavadocParser.parse(expectedText));
-        assertEquals(1, underTest.getBlockTagCount());
-        assertEquals("unofficial", underTest.getBlockTag(0).getTagName());
+        assertEquals(1, underTest.getBlockTags().size());
+        assertEquals("unofficial", underTest.getBlockTags().get(0).getTagName());
     }
 
     @Test
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java b/javaparser-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java
index dadfcfc37..08b526ebe 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java
@@ -74,8 +74,8 @@ public class JavadocTest {
     @Test
     public void descriptionAndBlockTagsAreRetrievable() {
         Javadoc javadoc = JavaParser.parseJavadoc("first line\nsecond line\n\n@param node a node\n@return result the result");
-        assertEquals(javadoc.getDescription().toText(), "first line\nsecond line");
-        assertEquals(2, javadoc.getBlockTagCount());
+        assertEquals("first line\nsecond line", javadoc.getDescription().toText());
+        assertEquals(2, javadoc.getBlockTags().size());
     }
 
     @Test
@@ -101,38 +101,38 @@ public class JavadocTest {
                 " * \n" +
                 " * @param <T>\n";
         Javadoc javadoc = JavaParser.parseJavadoc(comment);
-        assertEquals(2, javadoc.getBlockTagCount());
+        assertEquals(2, javadoc.getBlockTags().size());
     }
 
     @Test
     public void blockTagModificationWorks() {
         Javadoc javadoc = new Javadoc(new JavadocDescription());
 
-        assertEquals(0, javadoc.getBlockTagCount());
+        assertEquals(0, javadoc.getBlockTags().size());
         JavadocBlockTag blockTag = new JavadocBlockTag(JavadocBlockTag.Type.RETURN, "a value");
         javadoc.addBlockTag(blockTag);
 
-        assertEquals(1, javadoc.getBlockTagCount());
-        assertEquals(blockTag, javadoc.getBlockTag(0));
+        assertEquals(1, javadoc.getBlockTags().size());
+        assertEquals(blockTag, javadoc.getBlockTags().get(0));
 
-        assertEquals(blockTag, javadoc.removeBlockTag(0));
-        assertEquals(1, javadoc.getBlockTagCount());
+        assertEquals(blockTag, javadoc.getBlockTags().remove(0));
+        assertEquals(0, javadoc.getBlockTags().size());
     }
 
     @Test
     public void descriptionModificationWorks() {
         JavadocDescription description = new JavadocDescription();
 
-        assertEquals(0, description.getElementCount());
+        assertEquals(0, description.getElements().size());
 
         JavadocDescriptionElement inlineTag = new JavadocInlineTag("inheritDoc", JavadocInlineTag.Type.INHERIT_DOC, "");
         assertTrue(description.addElement(inlineTag));
 
-        assertEquals(1, description.getElementCount());
-        assertEquals(inlineTag, description.getElement(0));
+        assertEquals(1, description.getElements().size());
+        assertEquals(inlineTag, description.getElements().get(0));
 
-        assertEquals(inlineTag, description.removeElement(0));
-        assertEquals(0, description.getElementCount());
+        assertEquals(inlineTag, description.getElements().remove(0));
+        assertEquals(0, description.getElements().size());
     }
 
 }