diff options
Diffstat (limited to 'javaparser-testing/src/test/java/com/github/javaparser')
5 files changed, 34 insertions, 35 deletions
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java index 02bf58b7d..9a87a7367 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java @@ -2,78 +2,78 @@ package com.github.javaparser.ast.body; import org.junit.Test; -import static com.github.javaparser.JavaParser.parseClassBodyDeclaration; +import static com.github.javaparser.JavaParser.parseBodyDeclaration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; public class MethodDeclarationTest { @Test public void annotationsAllowedAfterGenericsAndBeforeReturnType() { - parseClassBodyDeclaration("public <T> @Abc String method() {return null;}"); + parseBodyDeclaration("public <T> @Abc String method() {return null;}"); } @Test public void annotationsAllowedBeforeGenerics() { - parseClassBodyDeclaration("public @Abc <T> String method() {return null;}"); + parseBodyDeclaration("public @Abc <T> String method() {return null;}"); } @Test public void explicitReceiverParameters1() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("void InnerInner(@mypackage.Anno Source.@mypackage.Anno Inner Source.Inner.this) { }"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void InnerInner(@mypackage.Anno Source.@mypackage.Anno Inner Source.Inner.this) { }"); assertEquals("Source.Inner.this", method.getParameter(0).getNameAsString()); } @Test public void explicitReceiverParameters2() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("void x(A this) { }"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void x(A this) { }"); assertEquals("this", method.getParameter(0).getNameAsString()); } @Test public void signaturesEqual() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("int x(String z);"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(String z);"); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesEqualWhenGenericsDiffer() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("void x(List<Long> a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("void x(List<Integer> a) { }"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(List<Long> a) { }"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("void x(List<Integer> a) { }"); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesEqualWhenAnnotationsDiffer() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("void x(@A @B List a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("void x(@C List a) { }"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(@A @B List a) { }"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("void x(@C List a) { }"); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentName() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("int y(String z);"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int y(String z);"); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentTypes() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("int x(int z);"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(int z);"); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentVarargs() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("int x(int z);"); - MethodDeclaration method2 = (MethodDeclaration) parseClassBodyDeclaration("int x(int... z);"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("int x(int z);"); + MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(int... z);"); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signatureToString() { - MethodDeclaration method1 = (MethodDeclaration) parseClassBodyDeclaration("int x(int z, String q);"); + MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("int x(int z, String q);"); assertEquals("x(int, String)", method1.getSignature().toString()); } } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java index 3edcee9e5..0241d4bcf 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; public class ArrayTypeTest { @Test public void getFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); + FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariable(0).getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); @@ -84,7 +84,7 @@ public class ArrayTypeTest { @Test public void getMethodDeclarationWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseClassBodyDeclaration("@C int @A[] a() @B[] {};"); + MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("@C int @A[] a() @B[] {};"); ArrayType arrayType1 = (ArrayType) methodDeclaration.getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); @@ -99,7 +99,7 @@ public class ArrayTypeTest { @Test public void getParameterWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseClassBodyDeclaration("void a(@C int @A[] a @B[]) {};"); + MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("void a(@C int @A[] a @B[]) {};"); Parameter parameter = methodDeclaration.getParameter(0); @@ -127,7 +127,7 @@ public class ArrayTypeTest { @Test public void setFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("int[][] a[][];"); + FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("int[][] a[][];"); fieldDeclaration.getVariable(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a;", fieldDeclaration.toString()); @@ -135,7 +135,7 @@ public class ArrayTypeTest { @Test public void setMethodDeclarationWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("int[][] a()[][] {}"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("int[][] a()[][] {}"); method.setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a() {" + EOL + "}", method.toString()); @@ -143,7 +143,7 @@ public class ArrayTypeTest { @Test public void setParameterWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("void a(int[][] a[][]) {};"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void a(int[][] a[][]) {};"); method.getParameter(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("void a(Blob[][] a) {" + EOL + "}", method.toString()); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/type/TypeConstructionTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/type/TypeConstructionTest.java index 9fb6cc2a4..7a75d9043 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/type/TypeConstructionTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/type/TypeConstructionTest.java @@ -26,7 +26,6 @@ import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.Parameter; import com.github.javaparser.ast.expr.ArrayCreationExpr; import com.github.javaparser.ast.expr.MarkerAnnotationExpr; -import com.github.javaparser.ast.expr.Name; import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.stmt.ExpressionStmt; import org.assertj.core.api.Assertions; @@ -40,7 +39,7 @@ import static org.junit.Assert.assertEquals; public class TypeConstructionTest { @Test public void getFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); + FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariable(0).getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); @@ -83,7 +82,7 @@ public class TypeConstructionTest { @Test public void getMethodDeclarationWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseClassBodyDeclaration("@C int @A[] a() @B[] {};"); + MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("@C int @A[] a() @B[] {};"); ArrayType arrayType1 = (ArrayType) methodDeclaration.getType(); ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); @@ -98,7 +97,7 @@ public class TypeConstructionTest { @Test public void getParameterWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseClassBodyDeclaration("void a(@C int @A[] a @B[]) {};"); + MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("void a(@C int @A[] a @B[]) {};"); Parameter parameter = methodDeclaration.getParameter(0); @@ -126,7 +125,7 @@ public class TypeConstructionTest { @Test public void setFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseClassBodyDeclaration("int[][] a[][];"); + FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("int[][] a[][];"); fieldDeclaration.getVariable(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a;", fieldDeclaration.toString()); @@ -134,7 +133,7 @@ public class TypeConstructionTest { @Test public void setMethodDeclarationWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("int[][] a()[][] {}"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("int[][] a()[][] {}"); method.setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a() {" + EOL + "}", method.toString()); @@ -142,7 +141,7 @@ public class TypeConstructionTest { @Test public void setParameterWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseClassBodyDeclaration("void a(int[][] a[][]) {};"); + MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void a(int[][] a[][]) {};"); method.getParameter(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("void a(Blob[][] a) {" + EOL + "}", method.toString()); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java index 6e5136a5d..6492687a8 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java @@ -101,7 +101,7 @@ public class ModifierVisitorTest { @Test public void fieldDeclarationCantSurviveWithoutVariables() { - final BodyDeclaration<?> bodyDeclaration = JavaParser.parseClassBodyDeclaration("int x=1;"); + final BodyDeclaration<?> bodyDeclaration = JavaParser.parseBodyDeclaration("int x=1;"); final Visitable result = bodyDeclaration.accept(new ModifierVisitor<Void>() { public Visitable visit(VariableDeclarator x, Void arg) { @@ -114,7 +114,7 @@ public class ModifierVisitorTest { @Test public void variableDeclarationCantSurviveWithoutVariables() { - final BodyDeclaration<?> bodyDeclaration = JavaParser.parseClassBodyDeclaration("void x() {int x=1;}"); + final BodyDeclaration<?> bodyDeclaration = JavaParser.parseBodyDeclaration("void x() {int x=1;}"); final Visitable result = bodyDeclaration.accept(new ModifierVisitor<Void>() { public Visitable visit(VariableDeclarator x, Void arg) { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java index 29d300fe8..34ab59585 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java @@ -92,12 +92,12 @@ public class PrettyPrintingSteps { @When("the class body declaration is parsed by the Java parser") public void whenTheClassBodyDeclarationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseClassBodyDeclaration(sourceUnderTest); + resultNode = JavaParser.parseBodyDeclaration(sourceUnderTest); } @When("the interface body declaration is parsed by the Java parser") public void whenTheInterfaceBodyDeclarationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseInterfaceBodyDeclaration(sourceUnderTest); + resultNode = JavaParser.parseBodyDeclaration(sourceUnderTest); } @When("the class is visited by an empty ModifierVisitorAdapter") |