diff options
32 files changed, 175 insertions, 98 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java b/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java index 1003ea2b3..68a3d7e99 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ParseResult.java @@ -61,6 +61,13 @@ public class ParseResult<T> { } /** + * @return the <code>i</code>'th encountered parsing problem. May throw <code>IndexOutOfBoundsException</code>. + */ + public Problem getProblem(int i) { + return getProblems().get(i); + } + + /** * @return the complete list of tokens that were parsed, or empty if parsing failed completely. */ public Optional<List<Token>> getTokens() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java index ecd6aa657..1b8f03db3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java @@ -117,6 +117,10 @@ public final class CompilationUnit extends Node { return imports; } + public ImportDeclaration getImport(int i) { + return getImports().get(i); + } + /** * Retrieves the package declaration of this compilation unit.<br> * If this compilation unit has no package declaration (default package), @@ -143,6 +147,16 @@ public final class CompilationUnit extends Node { } /** + * Convenience method that wraps <code>getTypes()</code>.<br> + * If <code>i</code> is out of bounds, throws <code>IndexOutOfBoundsException.</code> + * @param i + * the index of the type declaration to retrieve + */ + public TypeDeclaration<?> getType(int i) { + return getTypes().get(i); + } + + /** * Sets the list of comments of this compilation unit. * * @param comments diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java index 94aba9964..5fd83a60b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java @@ -103,6 +103,10 @@ public final class EnumDeclaration extends TypeDeclaration<EnumDeclaration> impl return entries; } + public EnumConstantDeclaration getEntry(int i) { + return getEntries().get(i); + } + @Override public NodeList<ClassOrInterfaceType> getImplements() { return implementsList; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java index 9551d4162..0e8a81212 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java @@ -194,7 +194,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im throw new IllegalStateException( "You can use this only when the field is attached to a class or an enum"); - VariableDeclarator variable = getVariables().get(0); + VariableDeclarator variable = getVariable(0); String fieldName = variable.getId().getNameAsString(); String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length()); final MethodDeclaration getter; @@ -226,7 +226,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im throw new IllegalStateException( "You can use this only when the field is attached to a class or an enum"); - VariableDeclarator variable = getVariables().get(0); + VariableDeclarator variable = getVariable(0); String fieldName = variable.getId().getNameAsString(); String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length()); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java index 16f8023a3..0d37344bf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java @@ -68,7 +68,7 @@ public class LambdaExpr extends Expression implements return parameters; } - @Override + @Override public LambdaExpr setParameters(NodeList<Parameter> parameters) { notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters); this.parameters = assertNotNull(parameters); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java index aa7a474df..6f42dd48d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java @@ -38,6 +38,10 @@ import static com.github.javaparser.ast.expr.Name.*; public interface NodeWithAnnotations<N extends Node> { NodeList<AnnotationExpr> getAnnotations(); + default AnnotationExpr getAnnotation(int i) { + return getAnnotations().get(i); + } + N setAnnotations(NodeList<AnnotationExpr> annotations); /** diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java index 26662cab9..1c7467ff7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java @@ -10,6 +10,10 @@ public interface NodeWithArguments<N extends Node> { NodeList<Expression> getArgs(); + default Expression getArg(int i) { + return getArgs().get(i); + } + default N addArgument(String arg) { addArgument(new NameExpr(arg)); return (N) this; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java index c1a33923a..dd18c98d1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java @@ -7,6 +7,10 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; public interface NodeWithExtends<N extends Node> {
NodeList<ClassOrInterfaceType> getExtends();
+ default ClassOrInterfaceType getExtends(int i) {
+ return getExtends().get(i);
+ }
+
N setExtends(NodeList<ClassOrInterfaceType> extendsList);
/**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java index 1522a8b25..3135a372f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java @@ -7,6 +7,10 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; public interface NodeWithImplements<N extends Node> {
NodeList<ClassOrInterfaceType> getImplements();
+ default ClassOrInterfaceType getImplements(int i) {
+ return getImplements().get(i);
+ }
+
N setImplements(NodeList<ClassOrInterfaceType> implementsList);
/**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java index 187098b3e..3a0505f11 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java @@ -27,6 +27,10 @@ import static java.util.stream.Collectors.*; public interface NodeWithMembers<N extends Node> {
NodeList<BodyDeclaration<?>> getMembers();
+ default BodyDeclaration<?> getMember(int i) {
+ return getMembers().get(i);
+ }
+
N setMembers(NodeList<BodyDeclaration<?>> members);
/**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java index 2ee44ef5c..a631f0b67 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java @@ -10,6 +10,10 @@ import com.github.javaparser.ast.type.Type; public interface NodeWithParameters<N extends Node> {
NodeList<Parameter> getParameters();
+ default Parameter getParameter(int i) {
+ return getParameters().get(i);
+ }
+
N setParameters(NodeList<Parameter> parameters);
default N addParameter(Type type, String name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java index 9e1f40b36..429954f0b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java @@ -11,6 +11,10 @@ import com.github.javaparser.ast.stmt.Statement; public interface NodeWithStatements<N extends Node> {
NodeList<Statement> getStmts();
+ default Statement getStmt(int i) {
+ return getStmts().get(i);
+ }
+
N setStmts(final NodeList<Statement> stmts);
@SuppressWarnings("unchecked")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java index 7c6d0be1d..a285ab502 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java @@ -10,6 +10,10 @@ public interface NodeWithThrowable<N extends Node> { NodeList<ReferenceType<?>> getThrows();
+ default ReferenceType getThrow(int i) {
+ return getThrows().get(i);
+ }
+
/**
* Adds this type to the throws clause
*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java index 31acc823b..358cd32df 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java @@ -15,6 +15,10 @@ import com.github.javaparser.ast.type.TypeParameter; public interface NodeWithTypeParameters<N extends Node> { NodeList<TypeParameter> getTypeParameters(); + default TypeParameter getTypeParameter(int i) { + return getTypeParameters().get(i); + } + N setTypeParameters(NodeList<TypeParameter> typeParameters); default boolean isGeneric() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java index 40bf7aec7..464472ed9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java @@ -31,5 +31,9 @@ import com.github.javaparser.ast.body.VariableDeclarator; public interface NodeWithVariables<N extends Node> { NodeList<VariableDeclarator> getVariables(); + default VariableDeclarator getVariable(int i) { + return getVariables().get(i); + } + N setVariables(NodeList<VariableDeclarator> variables); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java index ad0cc77f2..6a8923599 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java @@ -80,6 +80,10 @@ public final class ExplicitConstructorInvocationStmt extends Statement implement return args; } + public Expression getArg(int i) { + return getArgs().get(i); + } + public Optional<Expression> getExpr() { return Optional.ofNullable(expr); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java index 9aa25296b..53aaa72ce 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java @@ -70,6 +70,10 @@ public final class SwitchStmt extends Statement { return entries; } + public SwitchEntryStmt getEntry(int i) { + return getEntries().get(i); + } + public Expression getSelector() { return selector; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java index 53d334f5e..fb5e819b2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java @@ -45,6 +45,10 @@ public abstract class Type<T extends Type> extends Node { return annotations; } + public AnnotationExpr getAnnotation(int i) { + return getAnnotations().get(i); + } + public T setAnnotations(NodeList<AnnotationExpr> annotations) { notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations); this.annotations = assertNotNull(annotations); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/CommentParsingSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/CommentParsingSteps.java index 4f2d21522..48eb5b5b5 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/CommentParsingSteps.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/CommentParsingSteps.java @@ -249,39 +249,39 @@ public class CommentParsingSteps { @Then("class $position is not commented") public void thenClassIsNotCommented(int position) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(position - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(position - 1); assertThat(classUnderTest.getComment(), is(nullValue())); } @Then("class $position is commented \"$expectedContent\"") public void thenClassIsCommented(int position, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(position - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(position - 1); assertThat(classUnderTest.getComment().getContent(), is(expectedContent)); } @Then("class $position has $expectedCount total contained comments") public void thenClassHasTotalContainedComments(int position, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(position - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(position - 1); assertThat(classUnderTest.getAllContainedComments().size(), is(expectedCount)); } @Then("class $position has $expectedCount orphan comment") @Alias("class $position has $expectedCount orphan comments") public void thenClassHasOrphanComments(int position, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(position - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(position - 1); assertThat(classUnderTest.getOrphanComments().size(), is(expectedCount)); } @Then("class $classPosition orphan comment $commentPosition is \"$expectedContent\"") public void thenClassOrphanCommentIs(int classPosition, int commentPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); Comment commentUnderTest = classUnderTest.getOrphanComments().get(commentPosition -1 ); assertThat(commentUnderTest.getContent(), is(equalToIgnoringWhiteSpace(expectedContent))); } @Then("method $methodPosition in class $classPosition is commented \"$expectedContent\"") public void thenMethodInClassIsCommented(int methodPosition, int classPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getComment().getContent(), equalToIgnoringWhiteSpace(expectedContent)); @@ -289,7 +289,7 @@ public class CommentParsingSteps { @Then("method $methodPosition in class $classPosition has $expectedCount total contained comments") public void thenMethodInClassHasTotalContainedComments(int methodPosition, int classPosition, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getAllContainedComments().size(), is(expectedCount)); @@ -297,7 +297,7 @@ public class CommentParsingSteps { @Then("comment $commentPosition in method $methodPosition in class $classPosition is \"$expectedContent\"") public void thenCommentInMethodInClassIs(int commentPosition, int methodPosition, int classPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); Comment commentUnderTest = methodUnderTest.getAllContainedComments().get(commentPosition - 1); @@ -306,7 +306,7 @@ public class CommentParsingSteps { @Then("method $methodPosition in class $classPosition has $expectedCount orphan comments") public void thenMethodInClassHasOrphanComments(int methodPosition, int classPosition, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getOrphanComments().size(), is(expectedCount)); @@ -314,7 +314,7 @@ public class CommentParsingSteps { @Then("block statement in method $methodPosition in class $classPosition has $expectedCount total contained comments") public void thenBlockStatementInMethodInClassHasTotalContainedComments(int methodPosition, int classPosition, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); @@ -323,7 +323,7 @@ public class CommentParsingSteps { @Then("block statement in method $methodPosition in class $classPosition has $expectedCount orphan comments") public void thenBlockStatementInMethodInClassHasOrphanComments(int methodPosition, int classPosition, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); @@ -332,7 +332,7 @@ public class CommentParsingSteps { @Then("block statement in method $methodPosition in class $classPosition orphan comment $commentPosition is \"$expectedContent\"") public void thenBlockStatementInMethodInClassIs(int methodPosition, int classPosition, int commentPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition -1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); @@ -342,7 +342,7 @@ public class CommentParsingSteps { @Then("type of method $methodPosition in class $classPosition is commented \"$expectedContent\"") public void thenTypeOfMethodInClassIsCommented(int methodPosition, int classPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition -1, MethodDeclaration.class); Comment commentUnderTest = methodUnderTest.getType().getComment(); @@ -351,7 +351,7 @@ public class CommentParsingSteps { @Then("field $fieldPosition in class $classPosition contains $expectedCount comments") public void thenFieldInClassContainsComments(int fieldPosition, int classPosition, int expectedCount) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); assertThat(fieldUnderTest.getAllContainedComments().size(), is(expectedCount)); @@ -359,7 +359,7 @@ public class CommentParsingSteps { @Then("field $fieldPosition in class $classPosition is not commented") public void thenFieldInClassIsNotCommented(int fieldPosition, int classPosition) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); assertThat(fieldUnderTest.getComment(), is(nullValue())); @@ -367,7 +367,7 @@ public class CommentParsingSteps { @Then("field $fieldPosition in class $classPosition is commented \"$expectedContent\"") public void thenFieldInClassIsCommented(int fieldPosition, int classPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); Comment commentUnderTest = fieldUnderTest.getComment(); @@ -376,10 +376,10 @@ public class CommentParsingSteps { @Then("variable $variablePosition value of field $fieldPosition in class $classPosition is commented \"$expectedContent\"") public void thenVariableValueOfFieldInClassIsCommented(int variablePosition, int fieldPosition, int classPosition, String expectedContent) { - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); - VariableDeclarator variableUnderTest = fieldUnderTest.getVariables().get(variablePosition - 1); + VariableDeclarator variableUnderTest = fieldUnderTest.getVariable(variablePosition - 1); Expression valueUnderTest = variableUnderTest.getInit().orElse(null); Comment commentUnderTest = valueUnderTest.getComment(); assertThat(commentUnderTest.getContent(), is(expectedContent)); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ManipulationSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ManipulationSteps.java index ad2f1395d..e5946ae0a 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ManipulationSteps.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ManipulationSteps.java @@ -145,7 +145,7 @@ public class ManipulationSteps { @When("a public static method called \"$methodName\" returning void is added to class $position in the compilation unit") public void whenAStaticMethodCalledReturningIsAddedToClassInTheCompilationUnit(String methodName, int position) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - TypeDeclaration<?> type = compilationUnit.getTypes().get(position -1); + TypeDeclaration<?> type = compilationUnit.getType(position -1); EnumSet<Modifier> modifiers = EnumSet.of(Modifier.PUBLIC); MethodDeclaration method = new MethodDeclaration(modifiers, new VoidType(), methodName); modifiers.add(Modifier.STATIC); @@ -230,7 +230,7 @@ public class ManipulationSteps { @Then("Statement $position in BlockStmt toString is \"$expectedContent\"") public void thenTheBlockStmtContentIs(int position, String expectedContent) { - Statement statementUnderTest = blockStmt.getStmts().get(position-1); + Statement statementUnderTest = blockStmt.getStmt(position-1); assertThat(statementUnderTest.toString(), is(expectedContent)); } @@ -271,7 +271,7 @@ public class ManipulationSteps { public void thenMethodInClassParameterIsTypeIntCalled(int methodPosition, int classPosition, int parameterPosition, String expectedName) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); MethodDeclaration method = getMethodByPositionAndClassPosition(compilationUnit, methodPosition, classPosition); - Parameter parameter = method.getParameters().get(parameterPosition -1); + Parameter parameter = method.getParameter(parameterPosition -1); assertThat(parameter.getType(), is(INT_TYPE)); assertThat(parameter.getId().getNameAsString(), is(expectedName)); } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ParsingSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ParsingSteps.java index f65ff122b..9a4d6b669 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ParsingSteps.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/ParsingSteps.java @@ -114,32 +114,32 @@ public class ParsingSteps { @Then("constructor $constructorPosition in class $classPosition declaration as a String is \"$expectedString\"") public void thenTheConstructorDeclarationAsAStringIs(int constructorPosition, int classPosition, String expectedString) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getTypes().get(classPosition - 1); - ConstructorDeclaration constructor = (ConstructorDeclaration)clazz.getMembers().get(constructorPosition - 1); + ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getType(classPosition - 1); + ConstructorDeclaration constructor = (ConstructorDeclaration)clazz.getMember(constructorPosition - 1); assertThat(constructor.getDeclarationAsString(), is(expectedString)); } @Then("constructor $constructorPosition in class $classPosition declaration short form as a String is \"$expectedString\"") public void thenConstructorInClassDeclarationShortFormAsAStringIs(int constructorPosition, int classPosition, String expectedString) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getTypes().get(classPosition - 1); - ConstructorDeclaration constructor = (ConstructorDeclaration)clazz.getMembers().get(constructorPosition - 1); + ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getType(classPosition - 1); + ConstructorDeclaration constructor = (ConstructorDeclaration)clazz.getMember(constructorPosition - 1); assertThat(constructor.getDeclarationAsString(false,false), is(expectedString)); } @Then("method $methodPosition in class $classPosition declaration as a String is \"$expectedString\"") public void thenMethod1InClass1DeclarationAsAStringIs(int methodPosition, int classPosition, String expectedString) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getTypes().get(classPosition -1); - MethodDeclaration method = (MethodDeclaration)clazz.getMembers().get(methodPosition -1); + ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getType(classPosition -1); + MethodDeclaration method = (MethodDeclaration)clazz.getMember(methodPosition -1); assertThat(method.getDeclarationAsString(), is(expectedString)); } @Then("method $methodPosition in class $classPosition declaration as a String short form is \"$expectedString\"") public void thenMethodInClassDeclarationAsAStringShortFormIs(int methodPosition, int classPosition, String expectedString) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getTypes().get(classPosition - 1); - MethodDeclaration method = (MethodDeclaration)clazz.getMembers().get(methodPosition -1); + ClassOrInterfaceDeclaration clazz = (ClassOrInterfaceDeclaration)compilationUnit.getType(classPosition - 1); + MethodDeclaration method = (MethodDeclaration)clazz.getMember(methodPosition -1); assertThat(method.getDeclarationAsString(false, false), is(expectedString)); } @@ -147,10 +147,10 @@ public class ParsingSteps { public void thenFieldInClassContainsAnnotationValueIs(int fieldPosition, int classPosition, int annotationPosition, String expectedValue) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - TypeDeclaration<?> classUnderTest = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); - AnnotationExpr annotationUnderTest = fieldUnderTest.getAnnotations().get(annotationPosition - 1); + AnnotationExpr annotationUnderTest = fieldUnderTest.getAnnotation(annotationPosition - 1); assertThat(annotationUnderTest.getChildNodes().get(1).toString(), is(expectedValue)); } @@ -158,7 +158,7 @@ public class ParsingSteps { public void thenLambdaInClassIsCalled(int statementPosition, int methodPosition, int classPosition, String expectedName) { Statement statement = getStatementInMethodInClass(statementPosition, methodPosition, classPosition); VariableDeclarationExpr expression = (VariableDeclarationExpr) ((ExpressionStmt) statement).getExpression(); - VariableDeclarator variableDeclarator = expression.getVariables().get(0); + VariableDeclarator variableDeclarator = expression.getVariable(0); assertThat(variableDeclarator.getId().getNameAsString(), is(expectedName)); } @@ -174,9 +174,9 @@ public class ParsingSteps { String expectedBody) { ExpressionStmt statement = (ExpressionStmt) getStatementInMethodInClass(statementPosition, methodPosition, classPosition); VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) statement.getExpression(); - VariableDeclarator variableDeclarator = variableDeclarationExpr.getVariables().get(0); + VariableDeclarator variableDeclarator = variableDeclarationExpr.getVariable(0); MethodCallExpr methodCallExpr = (MethodCallExpr) variableDeclarator.getInit().orElse(null); - CastExpr castExpr = (CastExpr) methodCallExpr.getArgs().get(0); + CastExpr castExpr = (CastExpr) methodCallExpr.getArg(0); LambdaExpr lambdaExpr = (LambdaExpr) castExpr.getExpr(); assertThat(lambdaExpr.getBody().toString(), is(expectedBody)); } @@ -201,7 +201,7 @@ public class ParsingSteps { String expectedBody) { LambdaExpr lambdaExpr = getLambdaExprInStatementInMethodInClass(statementPosition, methodPosition, classPosition); BlockStmt blockStmt = (BlockStmt) lambdaExpr.getBody(); - Statement lambdaStmt = blockStmt.getStmts().get(0); + Statement lambdaStmt = blockStmt.getStmt(0); assertThat(lambdaStmt.toString(), is(expectedBody)); } @@ -215,7 +215,7 @@ public class ParsingSteps { @Then("lambda in statement $statementPosition in method $methodPosition in class $classPosition is parent of contained parameter") public void thenLambdaInStatementInMethodInClassIsParentOfContainedParameter(int statementPosition, int methodPosition, int classPosition) { LambdaExpr lambdaExpr = getLambdaExprInStatementInMethodInClass(statementPosition, methodPosition, classPosition); - Parameter parameter = lambdaExpr.getParameters().get(0); + Parameter parameter = lambdaExpr.getParameter(0); assertThat(parameter.getParentNode().get(), is(lambdaExpr)); } @@ -256,13 +256,13 @@ public class ParsingSteps { private Statement getStatementInMethodInClass(int statementPosition, int methodPosition, int classPosition) { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); MethodDeclaration method = getMethodByPositionAndClassPosition(compilationUnit, methodPosition, classPosition); - return method.getBody().get().getStmts().get(statementPosition - 1); + return method.getBody().get().getStmt(statementPosition - 1); } private LambdaExpr getLambdaExprInStatementInMethodInClass(int statementPosition, int methodPosition, int classPosition) { Statement statement = getStatementInMethodInClass(statementPosition, methodPosition, classPosition); VariableDeclarationExpr expression = (VariableDeclarationExpr) ((ExpressionStmt) statement).getExpression(); - VariableDeclarator variableDeclarator = expression.getVariables().get(0); + VariableDeclarator variableDeclarator = expression.getVariable(0); return (LambdaExpr) variableDeclarator.getInit().orElse(null); } @@ -344,9 +344,9 @@ public class ParsingSteps { @Then("the assignExpr produced doesn't have a null target") public void thenTheAssignExprProducedDoesntHaveANullTarget() { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); - ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) compilationUnit.getTypes().get(0); - ConstructorDeclaration ctor = (ConstructorDeclaration) classDeclaration.getMembers().get(1); - ExpressionStmt assignStmt = (ExpressionStmt) ctor.getBody().getStmts().get(0); + ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) compilationUnit.getType(0); + ConstructorDeclaration ctor = (ConstructorDeclaration) classDeclaration.getMember(1); + ExpressionStmt assignStmt = (ExpressionStmt) ctor.getBody().getStmt(0); AssignExpr assignExpr = (AssignExpr) assignStmt.getExpression(); assertNotNull(assignExpr.getTarget()); assertEquals(NameExpr.class, assignExpr.getTarget().getClass()); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/SharedSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/SharedSteps.java index 96d9a3046..a63ed786e 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/SharedSteps.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/SharedSteps.java @@ -149,14 +149,14 @@ public class SharedSteps { public static MethodDeclaration getMethodByPositionAndClassPosition(CompilationUnit compilationUnit, int methodPosition, int classPosition) { - TypeDeclaration<?> type = compilationUnit.getTypes().get(classPosition - 1); + TypeDeclaration<?> type = compilationUnit.getType(classPosition - 1); int memberCount = 0; int methodCount = 0; for (BodyDeclaration<?> bodyDeclaration : type.getMembers()) { if(bodyDeclaration instanceof MethodDeclaration){ if(methodCount == methodPosition -1) { - return (MethodDeclaration) type.getMembers().get(memberCount); + return (MethodDeclaration) type.getMember(memberCount); } methodCount++; } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/ParseResultTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/ParseResultTest.java index 8f3622883..5fa5f0e05 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/ParseResultTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/ParseResultTest.java @@ -34,7 +34,7 @@ public class ParseResultTest { assertThat(result.getResult().isPresent()).isFalse(); assertThat(result.getProblems().size()).isEqualTo(1); - Problem problem = result.getProblems().get(0); + Problem problem = result.getProblem(0); assertThat(problem.getMessage()).startsWith("Encountered unexpected token: \"{\" \"{\""); assertThat(result.getTokens().isPresent()).isFalse(); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/type/TypeConstructionTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/type/TypeConstructionTest.java index 90c8abdc7..d69abdcf2 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/type/TypeConstructionTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/ast/type/TypeConstructionTest.java @@ -26,7 +26,7 @@ public class TypeConstructionTest { public void getFieldDeclarationWithArrays() { FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); - ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariables().get(0).getType(); + ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariable(0).getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); @@ -46,7 +46,7 @@ public class TypeConstructionTest { ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); - ArrayType arrayType1 = (ArrayType) variableDeclarationExpr.getVariables().get(0).getType(); + ArrayType arrayType1 = (ArrayType) variableDeclarationExpr.getVariable(0).getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); @@ -78,7 +78,7 @@ public class TypeConstructionTest { public void getParameterWithArrays() { MethodDeclaration methodDeclaration = (MethodDeclaration) parseClassBodyDeclaration("void a(@C int @A[] a @B[]) {};"); - Parameter parameter = methodDeclaration.getParameters().get(0); + Parameter parameter = methodDeclaration.getParameter(0); ArrayType outerArrayType = (ArrayType) parameter.getType(); @@ -96,14 +96,14 @@ public class TypeConstructionTest { ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); - variableDeclarationExpr.getVariables().get(0).setType(arrayOf(arrayOf(PrimitiveType.INT_TYPE))); + variableDeclarationExpr.getVariable(0).setType(arrayOf(arrayOf(PrimitiveType.INT_TYPE))); assertEquals("@C int a[][];", variableDeclarationStatement.toString()); } @Test public void setFieldDeclarationWithArrays() { FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("int[][] a[][];"); - fieldDeclaration.getVariables().get(0).setType(arrayOf(arrayOf(new ClassOrInterfaceType("Blob")))); + fieldDeclaration.getVariable(0).setType(arrayOf(arrayOf(new ClassOrInterfaceType("Blob")))); assertEquals("Blob a[][];", fieldDeclaration.toString()); } @@ -119,7 +119,7 @@ public class TypeConstructionTest { @Test public void setParameterWithArrays() { MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("void a(int[][] a[][]) {};"); - method.getParameters().get(0).setType(arrayOf(arrayOf(new ClassOrInterfaceType("Blob")))); + method.getParameter(0).setType(arrayOf(arrayOf(new ClassOrInterfaceType("Blob")))); assertEquals("void a(Blob[][] a) {" + EOL + "}", method.toString()); } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/ClassOrInterfaceDeclarationBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/ClassOrInterfaceDeclarationBuildersTest.java index 780a2edc3..ac0891a72 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/ClassOrInterfaceDeclarationBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/ClassOrInterfaceDeclarationBuildersTest.java @@ -33,9 +33,9 @@ public class ClassOrInterfaceDeclarationBuildersTest { testClass.addExtends(List.class); assertEquals(1, cu.getImports().size()); assertEquals("import " + List.class.getName() + ";" + EOL, - cu.getImports().get(0).toString()); + cu.getImport(0).toString()); assertEquals(1, testClass.getExtends().size()); - assertEquals(List.class.getSimpleName(), testClass.getExtends().get(0).getNameAsString()); + assertEquals(List.class.getSimpleName(), testClass.getExtends(0).getNameAsString()); } @Test @@ -44,8 +44,8 @@ public class ClassOrInterfaceDeclarationBuildersTest { testClass.addImplements(Function.class); assertEquals(1, cu.getImports().size()); assertEquals("import " + Function.class.getName() + ";" + EOL, - cu.getImports().get(0).toString()); + cu.getImport(0).toString()); assertEquals(1, testClass.getImplements().size()); - assertEquals(Function.class.getSimpleName(), testClass.getImplements().get(0).getNameAsString()); + assertEquals(Function.class.getSimpleName(), testClass.getImplements(0).getNameAsString()); } }
\ No newline at end of file diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/CompilationUnitBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/CompilationUnitBuildersTest.java index 16afa2e47..63fdfe0ff 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/CompilationUnitBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/CompilationUnitBuildersTest.java @@ -39,17 +39,17 @@ public class CompilationUnitBuildersTest { assertEquals(2, cu.getImports().size()); cu.addImport("myImport"); assertEquals(3, cu.getImports().size()); - assertEquals("import " + Map.class.getName() + ";" + EOL, cu.getImports().get(0).toString()); - assertEquals("import " + List.class.getName() + ";" + EOL, cu.getImports().get(1).toString()); - assertEquals("import myImport;" + EOL, cu.getImports().get(2).toString()); + assertEquals("import " + Map.class.getName() + ";" + EOL, cu.getImport(0).toString()); + assertEquals("import " + List.class.getName() + ";" + EOL, cu.getImport(1).toString()); + assertEquals("import myImport;" + EOL, cu.getImport(2).toString()); } @Test public void testAddClass() { ClassOrInterfaceDeclaration myClassDeclaration = cu.addClass("testClass", Modifier.PRIVATE); assertEquals(1, cu.getTypes().size()); - assertEquals("testClass", cu.getTypes().get(0).getNameAsString()); - assertEquals(ClassOrInterfaceDeclaration.class, cu.getTypes().get(0).getClass()); + assertEquals("testClass", cu.getType(0).getNameAsString()); + assertEquals(ClassOrInterfaceDeclaration.class, cu.getType(0).getClass()); assertTrue(myClassDeclaration.isPrivate()); assertFalse(myClassDeclaration.isInterface()); } @@ -58,9 +58,9 @@ public class CompilationUnitBuildersTest { public void testAddInterface() { ClassOrInterfaceDeclaration myInterfaceDeclaration = cu.addInterface("testInterface"); assertEquals(1, cu.getTypes().size()); - assertEquals("testInterface", cu.getTypes().get(0).getNameAsString()); + assertEquals("testInterface", cu.getType(0).getNameAsString()); assertTrue(myInterfaceDeclaration.isPublic()); - assertEquals(ClassOrInterfaceDeclaration.class, cu.getTypes().get(0).getClass()); + assertEquals(ClassOrInterfaceDeclaration.class, cu.getType(0).getClass()); assertTrue(myInterfaceDeclaration.isInterface()); } @@ -68,18 +68,18 @@ public class CompilationUnitBuildersTest { public void testAddEnum() { EnumDeclaration myEnumDeclaration = cu.addEnum("test"); assertEquals(1, cu.getTypes().size()); - assertEquals("test", cu.getTypes().get(0).getNameAsString()); + assertEquals("test", cu.getType(0).getNameAsString()); assertTrue(myEnumDeclaration.isPublic()); - assertEquals(EnumDeclaration.class, cu.getTypes().get(0).getClass()); + assertEquals(EnumDeclaration.class, cu.getType(0).getClass()); } @Test public void testAddAnnotationDeclaration() { AnnotationDeclaration myAnnotationDeclaration = cu.addAnnotationDeclaration("test"); assertEquals(1, cu.getTypes().size()); - assertEquals("test", cu.getTypes().get(0).getNameAsString()); + assertEquals("test", cu.getType(0).getNameAsString()); assertTrue(myAnnotationDeclaration.isPublic()); - assertEquals(AnnotationDeclaration.class, cu.getTypes().get(0).getClass()); + assertEquals(AnnotationDeclaration.class, cu.getType(0).getClass()); } @Test diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/EnumDeclarationBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/EnumDeclarationBuildersTest.java index 1930789f6..131942255 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/EnumDeclarationBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/EnumDeclarationBuildersTest.java @@ -31,9 +31,9 @@ public class EnumDeclarationBuildersTest { testEnum.addImplements(Function.class); assertEquals(1, cu.getImports().size()); assertEquals("import " + Function.class.getName() + ";" + EOL, - cu.getImports().get(0).toString()); + cu.getImport(0).toString()); assertEquals(1, testEnum.getImplements().size()); - assertEquals(Function.class.getSimpleName(), testEnum.getImplements().get(0).getNameAsString()); + assertEquals(Function.class.getSimpleName(), testEnum.getImplements(0).getNameAsString()); } @Test @@ -41,6 +41,6 @@ public class EnumDeclarationBuildersTest { EnumDeclaration testEnum = cu.addEnum("test"); testEnum.addEnumConstant("MY_ENUM_CONSTANT"); assertEquals(1, testEnum.getEntries().size()); - assertEquals("MY_ENUM_CONSTANT", testEnum.getEntries().get(0).getNameAsString()); + assertEquals("MY_ENUM_CONSTANT", testEnum.getEntry(0).getNameAsString()); } }
\ No newline at end of file diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java index 2fcc6eff8..429514217 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java @@ -51,54 +51,54 @@ public class FieldDeclarationBuildersTest { public void testCreateGetterInAClass() { testClass.addPrivateField(int.class, "myField").createGetter(); assertEquals(2, testClass.getMembers().size()); - assertEquals(MethodDeclaration.class, testClass.getMembers().get(1).getClass()); + assertEquals(MethodDeclaration.class, testClass.getMember(1).getClass()); List<MethodDeclaration> methodsWithName = testClass.getMethodsByName("getMyField"); assertEquals(1, methodsWithName.size()); MethodDeclaration getter = methodsWithName.get(0); assertEquals("getMyField", getter.getNameAsString()); assertEquals("int", getter.getType().toString()); - assertEquals(ReturnStmt.class, getter.getBody().get().getStmts().get(0).getClass()); + assertEquals(ReturnStmt.class, getter.getBody().get().getStmt(0).getClass()); } @Test public void testCreateSetterInAClass() { testClass.addPrivateField(int.class, "myField").createSetter(); assertEquals(2, testClass.getMembers().size()); - assertEquals(MethodDeclaration.class, testClass.getMembers().get(1).getClass()); + assertEquals(MethodDeclaration.class, testClass.getMember(1).getClass()); List<MethodDeclaration> methodsWithName = testClass.getMethodsByName("setMyField"); assertEquals(1, methodsWithName.size()); MethodDeclaration setter = methodsWithName.get(0); assertEquals("setMyField", setter.getNameAsString()); - assertEquals("int", setter.getParameters().get(0).getType().toString()); - assertEquals(ExpressionStmt.class, setter.getBody().get().getStmts().get(0).getClass()); - assertEquals("this.myField = myField;", setter.getBody().get().getStmts().get(0).toString()); + assertEquals("int", setter.getParameter(0).getType().toString()); + assertEquals(ExpressionStmt.class, setter.getBody().get().getStmt(0).getClass()); + assertEquals("this.myField = myField;", setter.getBody().get().getStmt(0).toString()); } @Test public void testCreateGetterInEnum() { testEnum.addPrivateField(int.class, "myField").createGetter(); assertEquals(2, testEnum.getMembers().size()); - assertEquals(MethodDeclaration.class, testEnum.getMembers().get(1).getClass()); + assertEquals(MethodDeclaration.class, testEnum.getMember(1).getClass()); List<MethodDeclaration> methodsWithName = testEnum.getMethodsByName("getMyField"); assertEquals(1, methodsWithName.size()); MethodDeclaration getter = methodsWithName.get(0); assertEquals("getMyField", getter.getNameAsString()); assertEquals("int", getter.getType().toString()); - assertEquals(ReturnStmt.class, getter.getBody().get().getStmts().get(0).getClass()); + assertEquals(ReturnStmt.class, getter.getBody().get().getStmt(0).getClass()); } @Test public void testCreateSetterInEnum() { testEnum.addPrivateField(int.class, "myField").createSetter(); assertEquals(2, testEnum.getMembers().size()); - assertEquals(MethodDeclaration.class, testEnum.getMembers().get(1).getClass()); + assertEquals(MethodDeclaration.class, testEnum.getMember(1).getClass()); List<MethodDeclaration> methodsWithName = testEnum.getMethodsByName("setMyField"); assertEquals(1, methodsWithName.size()); MethodDeclaration setter = methodsWithName.get(0); assertEquals("setMyField", setter.getNameAsString()); - assertEquals("int", setter.getParameters().get(0).getType().toString()); - assertEquals(ExpressionStmt.class, setter.getBody().get().getStmts().get(0).getClass()); - assertEquals("this.myField = myField;", setter.getBody().get().getStmts().get(0).toString()); + assertEquals("int", setter.getParameter(0).getType().toString()); + assertEquals(ExpressionStmt.class, setter.getBody().get().getStmt(0).getClass()); + assertEquals("this.myField = myField;", setter.getBody().get().getStmt(0).toString()); } @Test(expected = IllegalStateException.class) diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java index 507d1297c..f4174832e 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java @@ -35,10 +35,10 @@ public class NodeWithAnnotationsBuildersTest { @Test public void testAddAnnotation() { NormalAnnotationExpr annotation = testClass.addAnnotation(hey.class); - assertEquals("import com.github.javaparser.junit.builders.NodeWithAnnotationsBuildersTest$hey;", cu.getImports().get(0).toString().trim()); + assertEquals("import com.github.javaparser.junit.builders.NodeWithAnnotationsBuildersTest$hey;", cu.getImport(0).toString().trim()); assertEquals(1, testClass.getAnnotations().size()); - assertEquals(annotation, testClass.getAnnotations().get(0)); - assertEquals(NormalAnnotationExpr.class, testClass.getAnnotations().get(0).getClass()); + assertEquals(annotation, testClass.getAnnotation(0)); + assertEquals(NormalAnnotationExpr.class, testClass.getAnnotation(0).getClass()); } @Test @@ -51,7 +51,7 @@ public class NodeWithAnnotationsBuildersTest { public void testAddSingleMemberAnnotation() { testClass.addSingleMemberAnnotation("test", "value"); assertEquals(1, testClass.getAnnotations().size()); - assertEquals("value", ((SingleMemberAnnotationExpr) testClass.getAnnotations().get(0)).getMemberValue().toString()); + assertEquals("value", ((SingleMemberAnnotationExpr) testClass.getAnnotation(0)).getMemberValue().toString()); } @Test diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithMembersBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithMembersBuildersTest.java index b893ce983..6642f557e 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithMembersBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithMembersBuildersTest.java @@ -39,15 +39,15 @@ public class NodeWithMembersBuildersTest { public void testAddField() { FieldDeclaration addField = classDeclaration.addField(int.class, "fieldName", Modifier.PRIVATE); assertEquals(1, classDeclaration.getMembers().size()); - assertEquals(addField, classDeclaration.getMembers().get(0)); - assertEquals("fieldName", addField.getVariables().get(0).getId().getNameAsString()); + assertEquals(addField, classDeclaration.getMember(0)); + assertEquals("fieldName", addField.getVariable(0).getId().getNameAsString()); } @Test public void testAddMethod() { MethodDeclaration addMethod = classDeclaration.addMethod("foo", Modifier.PUBLIC); assertEquals(1, classDeclaration.getMembers().size()); - assertEquals(addMethod, classDeclaration.getMembers().get(0)); + assertEquals(addMethod, classDeclaration.getMember(0)); assertEquals("foo", addMethod.getNameAsString()); } @@ -55,7 +55,7 @@ public class NodeWithMembersBuildersTest { public void testAddCtor() { ConstructorDeclaration addCtor = classDeclaration.addCtor(Modifier.PUBLIC); assertEquals(1, classDeclaration.getMembers().size()); - assertEquals(addCtor, classDeclaration.getMembers().get(0)); + assertEquals(addCtor, classDeclaration.getMember(0)); assertEquals(classDeclaration.getName(), addCtor.getName()); } @@ -63,11 +63,11 @@ public class NodeWithMembersBuildersTest { public void testAddInitializers() { classDeclaration.addInitializer(); assertEquals(1, classDeclaration.getMembers().size()); - assertEquals(InitializerDeclaration.class, classDeclaration.getMembers().get(0).getClass()); + assertEquals(InitializerDeclaration.class, classDeclaration.getMember(0).getClass()); classDeclaration.addStaticInitializer(); assertEquals(2, classDeclaration.getMembers().size()); - assertEquals(InitializerDeclaration.class, classDeclaration.getMembers().get(0).getClass()); + assertEquals(InitializerDeclaration.class, classDeclaration.getMember(0).getClass()); } @Test diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithParametersBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithParametersBuildersTest.java index 5ca158aee..c5c5f4702 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithParametersBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithParametersBuildersTest.java @@ -33,11 +33,11 @@ public class NodeWithParametersBuildersTest { addMethod.addParameter(int.class, "yay"); Parameter myNewParam = addMethod.addAndGetParameter(List.class, "myList"); assertEquals(1, cu.getImports().size()); - assertEquals("import " + List.class.getName() + ";" + EOL, cu.getImports().get(0).toString()); + assertEquals("import " + List.class.getName() + ";" + EOL, cu.getImport(0).toString()); assertEquals(2, addMethod.getParameters().size()); - assertEquals("yay", addMethod.getParameters().get(0).getNameAsString()); - assertEquals("List", addMethod.getParameters().get(1).getType().toString()); - assertEquals(myNewParam, addMethod.getParameters().get(1)); + assertEquals("yay", addMethod.getParameter(0).getNameAsString()); + assertEquals("List", addMethod.getParameter(1).getType().toString()); + assertEquals(myNewParam, addMethod.getParameter(1)); } @Test diff --git a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithThrowableBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithThrowableBuildersTest.java index 6869badb4..ca2f61638 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithThrowableBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/junit/builders/NodeWithThrowableBuildersTest.java @@ -33,6 +33,6 @@ public class NodeWithThrowableBuildersTest { assertEquals(true, addMethod.isThrows(IllegalStateException.class)); addMethod.addThrows(new ClassOrInterfaceType("Test")); assertEquals(2, addMethod.getThrows().size()); - assertEquals("Test", addMethod.getThrows().get(1).toString()); + assertEquals("Test", addMethod.getThrow(1).toString()); } }
\ No newline at end of file |