diff options
Diffstat (limited to 'javaparser-testing')
35 files changed, 196 insertions, 446 deletions
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/JavaParserTest.java b/javaparser-testing/src/test/java/com/github/javaparser/JavaParserTest.java index 4292ae89c..96b4ac9f3 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/JavaParserTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/JavaParserTest.java @@ -52,7 +52,7 @@ public class JavaParserTest { public void rangeOfAnnotationMemberDeclarationIsCorrect() { String code = "@interface AD { String foo(); }"; CompilationUnit cu = JavaParser.parse(code); - AnnotationMemberDeclaration memberDeclaration = (AnnotationMemberDeclaration) cu.getAnnotationDeclarationByName("AD").get().getMember(0); + AnnotationMemberDeclaration memberDeclaration = cu.getAnnotationDeclarationByName("AD").get().getMember(0).asAnnotationMemberDeclaration(); assertEquals(true, memberDeclaration.getRange().isPresent()); assertEquals(new Range(new Position(1, 17), new Position(1, 29)), memberDeclaration.getRange().get()); } @@ -61,7 +61,7 @@ public class JavaParserTest { public void rangeOfAnnotationMemberDeclarationWithArrayTypeIsCorrect() { String code = "@interface AD { String[] foo(); }"; CompilationUnit cu = JavaParser.parse(code); - AnnotationMemberDeclaration memberDeclaration = (AnnotationMemberDeclaration) cu.getAnnotationDeclarationByName("AD").get().getMember(0); + AnnotationMemberDeclaration memberDeclaration = cu.getAnnotationDeclarationByName("AD").get().getMember(0).asAnnotationMemberDeclaration(); assertEquals(true, memberDeclaration.getRange().isPresent()); assertEquals(new Range(new Position(1, 17), new Position(1, 31)), memberDeclaration.getRange().get()); } @@ -110,15 +110,15 @@ public class JavaParserTest { public void parseIntersectionType() { String code = "(Runnable & Serializable) (() -> {})"; Expression expression = JavaParser.parseExpression(code); - Type type = ((CastExpr)expression).getType(); + Type type = expression.asCastExpr().getType(); assertTrue(type instanceof IntersectionType); - IntersectionType intersectionType = (IntersectionType)type; + IntersectionType intersectionType = type.asIntersectionType(); assertEquals(2, intersectionType.getElements().size()); assertTrue(intersectionType.getElements().get(0) instanceof ClassOrInterfaceType); - assertEquals("Runnable", ((ClassOrInterfaceType)intersectionType.getElements().get(0)).getNameAsString()); + assertEquals("Runnable", intersectionType.getElements().get(0).asClassOrInterfaceType().getNameAsString()); assertTrue(intersectionType.getElements().get(1) instanceof ClassOrInterfaceType); - assertEquals("Serializable", ((ClassOrInterfaceType)intersectionType.getElements().get(1)).getNameAsString()); + assertEquals("Serializable", intersectionType.getElements().get(1).asClassOrInterfaceType().getNameAsString()); } @Test @@ -128,9 +128,9 @@ public class JavaParserTest { + " return (Comparator<Map.Entry<K, V>> & Serializable)(c1, c2) -> c1.getKey().compareTo(c2.getKey()); " + EOL + "}}"; CompilationUnit cu = JavaParser.parse(code); - MethodDeclaration methodDeclaration = (MethodDeclaration)cu.getClassByName("A").get().getMember(0); - ReturnStmt returnStmt = (ReturnStmt)methodDeclaration.getBody().get().getStatement(0); - CastExpr castExpr = (CastExpr)returnStmt.getExpression().get(); + MethodDeclaration methodDeclaration = cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); + ReturnStmt returnStmt = methodDeclaration.getBody().get().getStatement(0).asReturnStmt(); + CastExpr castExpr = returnStmt.getExpression().get().asCastExpr(); Type type = castExpr.getType(); assertEquals(range(3, 13, 3, 54), type.getRange().get()); } @@ -142,9 +142,9 @@ public class JavaParserTest { + " return (Comparator<Map.Entry<K, V>> & Serializable)(c1, c2) -> c1.getKey().compareTo(c2.getKey()); " + EOL + "}}"; CompilationUnit cu = JavaParser.parse(code); - MethodDeclaration methodDeclaration = (MethodDeclaration)cu.getClassByName("A").get().getMember(0); - ReturnStmt returnStmt = (ReturnStmt)methodDeclaration.getBody().get().getStatement(0); - CastExpr castExpr = (CastExpr)returnStmt.getExpression().get(); + MethodDeclaration methodDeclaration = cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); + ReturnStmt returnStmt = methodDeclaration.getBody().get().getStatement(0).asReturnStmt(); + CastExpr castExpr = returnStmt.getExpression().get().asCastExpr(); assertEquals(range(3, 12, 3, 101), castExpr.getRange().get()); } @@ -155,9 +155,9 @@ public class JavaParserTest { + " return (Comparator<Map.Entry<K, V>> )(c1, c2) -> c1.getKey().compareTo(c2.getKey()); " + EOL + "}}"; CompilationUnit cu = JavaParser.parse(code); - MethodDeclaration methodDeclaration = (MethodDeclaration)cu.getClassByName("A").get().getMember(0); - ReturnStmt returnStmt = (ReturnStmt)methodDeclaration.getBody().get().getStatement(0); - CastExpr castExpr = (CastExpr)returnStmt.getExpression().get(); + MethodDeclaration methodDeclaration = cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); + ReturnStmt returnStmt = methodDeclaration.getBody().get().getStatement(0).asReturnStmt(); + CastExpr castExpr = returnStmt.getExpression().get().asCastExpr(); assertEquals(range(3, 12, 3, 101), castExpr.getRange().get()); } @@ -168,10 +168,10 @@ public class JavaParserTest { + " return (Comparator<Map.Entry<K, V>> & Serializable)(c1, c2) -> c1.getKey().compareTo(c2.getKey()); " + EOL + "}}"; CompilationUnit cu = JavaParser.parse(code); - MethodDeclaration methodDeclaration = (MethodDeclaration)cu.getClassByName("A").get().getMember(0); - ReturnStmt returnStmt = (ReturnStmt)methodDeclaration.getBody().get().getStatement(0); - CastExpr castExpr = (CastExpr)returnStmt.getExpression().get(); - LambdaExpr lambdaExpr = (LambdaExpr)castExpr.getExpression(); + MethodDeclaration methodDeclaration = cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); + ReturnStmt returnStmt = methodDeclaration.getBody().get().getStatement(0).asReturnStmt(); + CastExpr castExpr = returnStmt.getExpression().get().asCastExpr(); + LambdaExpr lambdaExpr = castExpr.getExpression().asLambdaExpr(); assertEquals(range(3, 56, 3, 101), lambdaExpr.getRange().get()); assertEquals(GeneratedJavaParserConstants.LPAREN, lambdaExpr.getTokenRange().get().getBegin().getKind()); assertEquals(GeneratedJavaParserConstants.RPAREN, lambdaExpr.getTokenRange().get().getEnd().getKind()); @@ -184,10 +184,10 @@ public class JavaParserTest { + " return (Comparator<Map.Entry<K, V>> & Serializable)(c1, c2) -> c1.getKey().compareTo(c2.getKey()); " + EOL + "}}"; CompilationUnit cu = JavaParser.parse(code); - MethodDeclaration methodDeclaration = (MethodDeclaration)cu.getClassByName("A").get().getMember(0); - ReturnStmt returnStmt = (ReturnStmt)methodDeclaration.getBody().get().getStatement(0); - CastExpr castExpr = (CastExpr)returnStmt.getExpression().get(); - LambdaExpr lambdaExpr = (LambdaExpr)castExpr.getExpression(); + MethodDeclaration methodDeclaration = cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); + ReturnStmt returnStmt = methodDeclaration.getBody().get().getStatement(0).asReturnStmt(); + CastExpr castExpr = returnStmt.getExpression().get().asCastExpr(); + LambdaExpr lambdaExpr = castExpr.getExpression().asLambdaExpr(); Statement lambdaBody = lambdaExpr.getBody(); assertEquals(range(3, 68, 3, 101), lambdaBody.getRange().get()); } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ParseErrorRecoveryTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ParseErrorRecoveryTest.java index 335811573..b41c28bf4 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ParseErrorRecoveryTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ParseErrorRecoveryTest.java @@ -21,14 +21,14 @@ public class ParseErrorRecoveryTest { @Test public void bodystatementSemicolonRecovery() { - MethodDeclaration cu = (MethodDeclaration) parser.parse(ParseStart.CLASS_BODY, provider("int x(){X X X;}")).getResult().get(); + MethodDeclaration cu = parser.parse(ParseStart.CLASS_BODY, provider("int x(){X X X;}")).getResult().get().asMethodDeclaration(); Statement xxx = cu.getBody().get().getStatements().get(0); assertEquals(UNPARSABLE, xxx.getParsed()); } @Test public void bodystatementClosingBraceRecovery() { - MethodDeclaration cu = (MethodDeclaration) parser.parse(ParseStart.CLASS_BODY, provider("int x(){X X X}")).getResult().get(); + MethodDeclaration cu = parser.parse(ParseStart.CLASS_BODY, provider("int x(){X X X}")).getResult().get().asMethodDeclaration(); Statement xxx = cu.getBody().get(); assertEquals(UNPARSABLE, xxx.getParsed()); } @@ -36,7 +36,7 @@ public class ParseErrorRecoveryTest { @Test public void labeledStatementSemicolonRecovery() { CompilationUnit cu = parser.parse(ParseStart.COMPILATION_UNIT, provider("class X{int x(){aaa:X X X;}}")).getResult().get(); - LabeledStmt xxx = (LabeledStmt) cu.getClassByName("X").get().getMethods().get(0).getBody().get().getStatements().get(0); + LabeledStmt xxx = cu.getClassByName("X").get().getMethods().get(0).getBody().get().getStatements().get(0).asLabeledStmt(); assertEquals(UNPARSABLE, xxx.getStatement().getParsed()); } } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ProvidersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ProvidersTest.java index 98eb7830a..14b351af9 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ProvidersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ProvidersTest.java @@ -27,9 +27,7 @@ import org.junit.Test; import java.io.IOException; import java.nio.charset.Charset; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ProvidersTest { @@ -41,6 +39,7 @@ public class ProvidersTest { ParseResult<CompilationUnit> parse = parser.parse(ParseStart.COMPILATION_UNIT, provider); assertTrue(parse.isSuccessful()); } + @Test public void testResourceProviderWithWrongEncoding() throws IOException { Provider provider = Providers.resourceProvider("com/github/javaparser/TestFileIso88591.java"); @@ -49,6 +48,7 @@ public class ProvidersTest { ParseResult<CompilationUnit> parse = parser.parse(ParseStart.COMPILATION_UNIT, provider); assertFalse(parse.isSuccessful()); } + @Test public void testResourceProviderWithEncoding() throws IOException { Provider provider = Providers.resourceProvider( diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java index 926308bb9..063fae386 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclarationTest.java @@ -11,7 +11,7 @@ public class ClassOrInterfaceDeclarationTest { @Test public void staticNestedClass() { CompilationUnit cu = JavaParser.parse("class X{static class Y{}}"); - ClassOrInterfaceDeclaration y = (ClassOrInterfaceDeclaration) cu.getClassByName("X").get().getMembers().get(0); + ClassOrInterfaceDeclaration y = cu.getClassByName("X").get().getMembers().get(0).asClassOrInterfaceDeclaration(); assertFalse(y.isInnerClass()); assertTrue(y.isNestedType()); @@ -21,7 +21,7 @@ public class ClassOrInterfaceDeclarationTest { @Test public void nestedInterface() { CompilationUnit cu = JavaParser.parse("class X{interface Y{}}"); - ClassOrInterfaceDeclaration y = (ClassOrInterfaceDeclaration) cu.getClassByName("X").get().getMembers().get(0); + ClassOrInterfaceDeclaration y = cu.getClassByName("X").get().getMembers().get(0).asClassOrInterfaceDeclaration(); assertFalse(y.isInnerClass()); assertTrue(y.isNestedType()); @@ -31,7 +31,7 @@ public class ClassOrInterfaceDeclarationTest { @Test public void nonStaticNestedClass() { CompilationUnit cu = JavaParser.parse("class X{class Y{}}"); - ClassOrInterfaceDeclaration y = (ClassOrInterfaceDeclaration) cu.getClassByName("X").get().getMembers().get(0); + ClassOrInterfaceDeclaration y = cu.getClassByName("X").get().getMembers().get(0).asClassOrInterfaceDeclaration(); assertTrue(y.isInnerClass()); assertTrue(y.isNestedType()); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java index 0611ddd04..0e263a481 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java @@ -15,7 +15,7 @@ public class FieldDeclarationTest { "}"); BodyDeclaration<?> declaration = compilationUnit.getType(0).getMembers().get(0); - FieldDeclaration fieldDeclaration = (FieldDeclaration) declaration; + FieldDeclaration fieldDeclaration = declaration.asFieldDeclaration(); VariableDeclarator var1 = fieldDeclaration.getVariables().get(0); VariableDeclarator var2 = fieldDeclaration.getVariables().get(1); assertEquals(var1, var1.getType().getParentNode().get()); 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 9a87a7367..dcab1dbbc 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 @@ -19,61 +19,61 @@ public class MethodDeclarationTest { @Test public void explicitReceiverParameters1() { - MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void InnerInner(@mypackage.Anno Source.@mypackage.Anno Inner Source.Inner.this) { }"); + MethodDeclaration method = parseBodyDeclaration("void InnerInner(@mypackage.Anno Source.@mypackage.Anno Inner Source.Inner.this) { }").asMethodDeclaration(); assertEquals("Source.Inner.this", method.getParameter(0).getNameAsString()); } @Test public void explicitReceiverParameters2() { - MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void x(A this) { }"); + MethodDeclaration method = parseBodyDeclaration("void x(A this) { }").asMethodDeclaration(); assertEquals("this", method.getParameter(0).getNameAsString()); } @Test public void signaturesEqual() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(String z);"); + MethodDeclaration method1 = parseBodyDeclaration("void x(String a) { }").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("int x(String z);").asMethodDeclaration(); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesEqualWhenGenericsDiffer() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(List<Long> a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("void x(List<Integer> a) { }"); + MethodDeclaration method1 = parseBodyDeclaration("void x(List<Long> a) { }").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("void x(List<Integer> a) { }").asMethodDeclaration(); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesEqualWhenAnnotationsDiffer() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(@A @B List a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("void x(@C List a) { }"); + MethodDeclaration method1 = parseBodyDeclaration("void x(@A @B List a) { }").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("void x(@C List a) { }").asMethodDeclaration(); assertEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentName() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int y(String z);"); + MethodDeclaration method1 = parseBodyDeclaration("void x(String a) { }").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("int y(String z);").asMethodDeclaration(); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentTypes() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("void x(String a) { }"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(int z);"); + MethodDeclaration method1 = parseBodyDeclaration("void x(String a) { }").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("int x(int z);").asMethodDeclaration(); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signaturesDifferentVarargs() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("int x(int z);"); - MethodDeclaration method2 = (MethodDeclaration) parseBodyDeclaration("int x(int... z);"); + MethodDeclaration method1 = parseBodyDeclaration("int x(int z);").asMethodDeclaration(); + MethodDeclaration method2 = parseBodyDeclaration("int x(int... z);").asMethodDeclaration(); assertNotEquals(method1.getSignature(), method2.getSignature()); } @Test public void signatureToString() { - MethodDeclaration method1 = (MethodDeclaration) parseBodyDeclaration("int x(int z, String q);"); + MethodDeclaration method1 = parseBodyDeclaration("int x(int z, String q);").asMethodDeclaration(); assertEquals("x(int, String)", method1.getSignature().toString()); } } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/LiteralStringValueExprTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/LiteralStringValueExprTest.java index 1a1b94c44..1b9dfef1a 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/LiteralStringValueExprTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/expr/LiteralStringValueExprTest.java @@ -24,6 +24,7 @@ import com.github.javaparser.JavaParser; import org.assertj.core.data.Percentage; import org.junit.Test; +import static com.github.javaparser.JavaParser.*; import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("OctalInteger") @@ -73,13 +74,13 @@ public class LiteralStringValueExprTest { @Test public void lowerAndUpperBoundIntegersAreConverted() { - IntegerLiteralExpr dec = JavaParser.parseExpression("2147483647"); - IntegerLiteralExpr posOct = JavaParser.parseExpression("0177_7777_7777"); - IntegerLiteralExpr negOct = JavaParser.parseExpression("0377_7777_7777"); - IntegerLiteralExpr posHex = JavaParser.parseExpression("0x7fff_ffff"); - IntegerLiteralExpr negHex = JavaParser.parseExpression("0xffff_ffff"); - IntegerLiteralExpr posBin = JavaParser.parseExpression("0b0111_1111_1111_1111_1111_1111_1111_1111"); - IntegerLiteralExpr negBin = JavaParser.parseExpression("0b1000_0000_0000_0000_0000_0000_0000_0000"); + IntegerLiteralExpr dec = parseExpression("2147483647"); + IntegerLiteralExpr posOct = parseExpression("0177_7777_7777"); + IntegerLiteralExpr negOct = parseExpression("0377_7777_7777"); + IntegerLiteralExpr posHex = parseExpression("0x7fff_ffff"); + IntegerLiteralExpr negHex = parseExpression("0xffff_ffff"); + IntegerLiteralExpr posBin = parseExpression("0b0111_1111_1111_1111_1111_1111_1111_1111"); + IntegerLiteralExpr negBin = parseExpression("0b1000_0000_0000_0000_0000_0000_0000_0000"); assertThat(dec.asInt()).isEqualTo(2147483647); assertThat(posOct.asInt()).isEqualTo(2147483647); // 0177_7777_7777 @@ -92,13 +93,13 @@ public class LiteralStringValueExprTest { @Test public void lowerAndUpperBoundLongsAreConverted() { - LongLiteralExpr dec = JavaParser.parseExpression("9223372036854775807L"); - LongLiteralExpr posOct = JavaParser.parseExpression("07_7777_7777_7777_7777_7777L"); - LongLiteralExpr negOct = JavaParser.parseExpression("010_0000_0000_0000_0000_0000L"); - LongLiteralExpr posHex = JavaParser.parseExpression("0x7fff_ffff_ffff_ffffL"); - LongLiteralExpr negHex = JavaParser.parseExpression("0xffff_ffff_ffff_ffffL"); - LongLiteralExpr posBin = JavaParser.parseExpression("0b0111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111L"); - LongLiteralExpr negBin = JavaParser.parseExpression("0b1000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000L"); + LongLiteralExpr dec = parseExpression("9223372036854775807L"); + LongLiteralExpr posOct = parseExpression("07_7777_7777_7777_7777_7777L"); + LongLiteralExpr negOct = parseExpression("010_0000_0000_0000_0000_0000L"); + LongLiteralExpr posHex = parseExpression("0x7fff_ffff_ffff_ffffL"); + LongLiteralExpr negHex = parseExpression("0xffff_ffff_ffff_ffffL"); + LongLiteralExpr posBin = parseExpression("0b0111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111_1111L"); + LongLiteralExpr negBin = parseExpression("0b1000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000_0000L"); assertThat(dec.asLong()).isEqualTo(9223372036854775807L); assertThat(posOct.asLong()).isEqualTo(9223372036854775807L); // 07_7777_7777_7777_7777_7777L @@ -111,16 +112,16 @@ public class LiteralStringValueExprTest { @Test public void charLiteralsAreConverted() { - CharLiteralExpr a = JavaParser.parseExpression("'a'"); - CharLiteralExpr percent = JavaParser.parseExpression("'%'"); - CharLiteralExpr tab = JavaParser.parseExpression("'\\t'"); - CharLiteralExpr newLine = JavaParser.parseExpression("'\\n'"); - CharLiteralExpr slash = JavaParser.parseExpression("'\\\\'"); - CharLiteralExpr quote = JavaParser.parseExpression("'\\''"); - CharLiteralExpr omega = JavaParser.parseExpression("'\\u03a9'"); - CharLiteralExpr unicode = JavaParser.parseExpression("'\\uFFFF'"); - CharLiteralExpr ascii = JavaParser.parseExpression("'\\177'"); - CharLiteralExpr trademark = JavaParser.parseExpression("'™'"); + CharLiteralExpr a = parseExpression("'a'"); + CharLiteralExpr percent = parseExpression("'%'"); + CharLiteralExpr tab = parseExpression("'\\t'"); + CharLiteralExpr newLine = parseExpression("'\\n'"); + CharLiteralExpr slash = parseExpression("'\\\\'"); + CharLiteralExpr quote = parseExpression("'\\''"); + CharLiteralExpr omega = parseExpression("'\\u03a9'"); + CharLiteralExpr unicode = parseExpression("'\\uFFFF'"); + CharLiteralExpr ascii = parseExpression("'\\177'"); + CharLiteralExpr trademark = parseExpression("'™'"); assertThat(a.asChar()).isEqualTo('a'); assertThat(percent.asChar()).isEqualTo('%'); @@ -136,12 +137,12 @@ public class LiteralStringValueExprTest { @Test public void lowerAndUpperBoundDoublesAreConverted() { - DoubleLiteralExpr posFloat = JavaParser.parseExpression("3.4028235e38f"); - DoubleLiteralExpr negFloat = JavaParser.parseExpression("1.40e-45f"); - DoubleLiteralExpr posDouble = JavaParser.parseExpression("1.7976931348623157e308"); - DoubleLiteralExpr negDouble = JavaParser.parseExpression("4.9e-324"); - DoubleLiteralExpr posHexFloat = JavaParser.parseExpression("0x1.fffffffffffffp1023"); - DoubleLiteralExpr negHexFloat = JavaParser.parseExpression("0x0.0000000000001P-1022"); + DoubleLiteralExpr posFloat = parseExpression("3.4028235e38f"); + DoubleLiteralExpr negFloat = parseExpression("1.40e-45f"); + DoubleLiteralExpr posDouble = parseExpression("1.7976931348623157e308"); + DoubleLiteralExpr negDouble = parseExpression("4.9e-324"); + DoubleLiteralExpr posHexFloat = parseExpression("0x1.fffffffffffffp1023"); + DoubleLiteralExpr negHexFloat = parseExpression("0x0.0000000000001P-1022"); assertThat(posFloat.asDouble()).isCloseTo(3.4028235e38f, Percentage.withPercentage(1)); assertThat(negFloat.asDouble()).isCloseTo(1.40e-45f, Percentage.withPercentage(1)); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithVariablesTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithVariablesTest.java index f179a6c73..b736333c1 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithVariablesTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithVariablesTest.java @@ -26,67 +26,68 @@ import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.type.PrimitiveType; import org.junit.Test; +import static com.github.javaparser.JavaParser.*; import static org.junit.Assert.assertEquals; public class NodeWithVariablesTest { @Test public void getCommonTypeWorksForNormalVariables() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a,b"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a,b"); assertEquals(PrimitiveType.intType(), declaration.getCommonType()); } @Test public void getCommonTypeWorksForArrayTypes() { - JavaParser.parseVariableDeclarationExpr("int a[],b[]").getCommonType(); + parseVariableDeclarationExpr("int a[],b[]").getCommonType(); } @Test(expected = AssertionError.class) public void getCommonTypeFailsOnArrayDifferences() { - JavaParser.parseVariableDeclarationExpr("int a[],b[][]").getCommonType(); + parseVariableDeclarationExpr("int a[],b[][]").getCommonType(); } @Test(expected = AssertionError.class) public void getCommonTypeFailsOnDodgySetterUsage() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a,b"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a,b"); declaration.getVariable(1).setType(String.class); declaration.getCommonType(); } @Test(expected = AssertionError.class) public void getCommonTypeFailsOnInvalidEmptyVariableList() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a"); declaration.getVariables().clear(); declaration.getCommonType(); } @Test public void getElementTypeWorksForNormalVariables() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a,b"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a,b"); assertEquals(PrimitiveType.intType(), declaration.getElementType()); } @Test public void getElementTypeWorksForArrayTypes() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a[],b[]"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a[],b[]"); assertEquals(PrimitiveType.intType(), declaration.getElementType()); } @Test public void getElementTypeIsOkayWithArrayDifferences() { - JavaParser.parseVariableDeclarationExpr("int a[],b[][]").getElementType(); + parseVariableDeclarationExpr("int a[],b[][]").getElementType(); } @Test(expected = AssertionError.class) public void getElementTypeFailsOnDodgySetterUsage() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a,b"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a,b"); declaration.getVariable(1).setType(String.class); declaration.getElementType(); } @Test(expected = AssertionError.class) public void getElementTypeFailsOnInvalidEmptyVariableList() { - VariableDeclarationExpr declaration = JavaParser.parseVariableDeclarationExpr("int a"); + VariableDeclarationExpr declaration = parseVariableDeclarationExpr("int a"); declaration.getVariables().clear(); declaration.getElementType(); } 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 db6d753ad..3fdee8e43 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 @@ -42,13 +42,13 @@ import static org.junit.Assert.assertEquals; public class ArrayTypeTest { @Test public void getFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); + FieldDeclaration fieldDeclaration = parseBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];").asFieldDeclaration(); - ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariable(0).getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); - ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); - ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); - PrimitiveType elementType = (PrimitiveType) arrayType4.getComponentType(); + ArrayType arrayType1 = fieldDeclaration.getVariable(0).getType().asArrayType(); + ArrayType arrayType2 = arrayType1.getComponentType().asArrayType(); + ArrayType arrayType3 = arrayType2.getComponentType().asArrayType(); + ArrayType arrayType4 = arrayType3.getComponentType().asArrayType(); + PrimitiveType elementType = arrayType4.getComponentType().asPrimitiveType(); assertThat(arrayType1.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); assertThat(arrayType2.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); @@ -63,14 +63,14 @@ public class ArrayTypeTest { @Test public void getVariableDeclarationWithArrays() { - ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); - VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); + ExpressionStmt variableDeclarationStatement = parseStatement("@C int @A[] @B[] a @X[] @Y[];").asExpressionStmt(); + VariableDeclarationExpr variableDeclarationExpr = variableDeclarationStatement.getExpression().asVariableDeclarationExpr(); - ArrayType arrayType1 = (ArrayType) variableDeclarationExpr.getVariable(0).getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); - ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); - ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); - PrimitiveType elementType = (PrimitiveType) arrayType4.getComponentType(); + ArrayType arrayType1 = variableDeclarationExpr.getVariable(0).getType().asArrayType(); + ArrayType arrayType2 = arrayType1.getComponentType().asArrayType(); + ArrayType arrayType3 = arrayType2.getComponentType().asArrayType(); + ArrayType arrayType4 = arrayType3.getComponentType().asArrayType(); + PrimitiveType elementType = arrayType4.getComponentType().asPrimitiveType(); assertThat(arrayType1.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); assertThat(arrayType2.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); @@ -85,10 +85,10 @@ public class ArrayTypeTest { @Test public void getMethodDeclarationWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("@C int @A[] a() @B[] {}"); + MethodDeclaration methodDeclaration = parseBodyDeclaration("@C int @A[] a() @B[] {}").asMethodDeclaration(); - ArrayType arrayType1 = (ArrayType) methodDeclaration.getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); + ArrayType arrayType1 = methodDeclaration.getType().asArrayType(); + ArrayType arrayType2 = arrayType1.getComponentType().asArrayType(); Type elementType = arrayType2.getComponentType(); assertThat(elementType).isInstanceOf(PrimitiveType.class); @@ -101,14 +101,14 @@ public class ArrayTypeTest { @Test public void getParameterWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("void a(@C int @A[] a @B[]) {}"); + MethodDeclaration methodDeclaration = parseBodyDeclaration("void a(@C int @A[] a @B[]) {}").asMethodDeclaration(); Parameter parameter = methodDeclaration.getParameter(0); - ArrayType outerArrayType = (ArrayType) parameter.getType(); + ArrayType outerArrayType = parameter.getType().asArrayType(); - ArrayType innerArrayType = (ArrayType) outerArrayType.getComponentType(); - PrimitiveType elementType = (PrimitiveType) innerArrayType.getComponentType(); + ArrayType innerArrayType = outerArrayType.getComponentType().asArrayType(); + PrimitiveType elementType = innerArrayType.getComponentType().asPrimitiveType(); assertThat(elementType).isInstanceOf(PrimitiveType.class); assertThat(outerArrayType.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); @@ -120,8 +120,8 @@ public class ArrayTypeTest { @Test public void setVariableDeclarationWithArrays() { - ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); - VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); + ExpressionStmt variableDeclarationStatement = parseStatement("@C int @A[] @B[] a @X[] @Y[];").asExpressionStmt(); + VariableDeclarationExpr variableDeclarationExpr = variableDeclarationStatement.getExpression().asVariableDeclarationExpr(); variableDeclarationExpr.getVariable(0).setType(new ArrayType(new ArrayType(PrimitiveType.intType()))); assertEquals("@C int[][] a;", variableDeclarationStatement.toString()); @@ -129,7 +129,7 @@ public class ArrayTypeTest { @Test public void setFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("int[][] a[][];"); + FieldDeclaration fieldDeclaration = parseBodyDeclaration("int[][] a[][];").asFieldDeclaration(); fieldDeclaration.getVariable(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a;", fieldDeclaration.toString()); @@ -137,7 +137,7 @@ public class ArrayTypeTest { @Test public void setMethodDeclarationWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("int[][] a()[][] {}"); + MethodDeclaration method = parseBodyDeclaration("int[][] a()[][] {}").asMethodDeclaration(); method.setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("Blob[][] a() {" + EOL + "}", method.toString()); @@ -145,11 +145,11 @@ public class ArrayTypeTest { @Test public void fieldDeclarationWithArraysHasCorrectOrigins() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("int[] a[];"); + FieldDeclaration fieldDeclaration = parseBodyDeclaration("int[] a[];").asFieldDeclaration(); Type outerType = fieldDeclaration.getVariables().get(0).getType(); - assertEquals(ArrayType.Origin.TYPE, ((ArrayType)outerType).getOrigin()); - assertEquals(ArrayType.Origin.NAME, ((ArrayType) ((ArrayType) outerType).getComponentType()).getOrigin()); + assertEquals(ArrayType.Origin.TYPE, outerType.asArrayType().getOrigin()); + assertEquals(ArrayType.Origin.NAME, outerType.asArrayType().getComponentType().asArrayType().getOrigin()); } @Test @@ -157,13 +157,13 @@ public class ArrayTypeTest { MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("int[] a()[] {}"); Type outerType = method.getType(); - assertEquals(ArrayType.Origin.TYPE, ((ArrayType)outerType).getOrigin()); - assertEquals(ArrayType.Origin.NAME, ((ArrayType) ((ArrayType) outerType).getComponentType()).getOrigin()); + assertEquals(ArrayType.Origin.TYPE, outerType.asArrayType().getOrigin()); + assertEquals(ArrayType.Origin.NAME, outerType.asArrayType().getComponentType().asArrayType().getOrigin()); } @Test public void setParameterWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("void a(int[][] a[][]) {}"); + MethodDeclaration method = parseBodyDeclaration("void a(int[][] a[][]) {}").asMethodDeclaration(); method.getParameter(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); assertEquals("void a(Blob[][] a) {" + EOL + "}", method.toString()); @@ -172,7 +172,7 @@ public class ArrayTypeTest { @Test public void getArrayCreationType() { ArrayCreationExpr expr = parseExpression("new int[]"); - ArrayType outerType = (ArrayType) expr.createdType(); + ArrayType outerType = expr.createdType().asArrayType(); Type innerType = outerType.getComponentType(); assertThat(innerType).isEqualTo(expr.getElementType()); } 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 deleted file mode 100644 index 32739b200..000000000 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/type/TypeConstructionTest.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (C) 2007-2010 Júlio Vilmar Gesser. - * Copyright (C) 2011, 2013-2016 The JavaParser Team. - * - * This file is part of JavaParser. - * - * JavaParser can be used either under the terms of - * a) the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * b) the terms of the Apache License - * - * You should have received a copy of both licenses in LICENCE.LGPL and - * LICENCE.APACHE. Please refer to those files for details. - * - * JavaParser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - */ - -package com.github.javaparser.ast.type; - -import com.github.javaparser.ast.body.FieldDeclaration; -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.VariableDeclarationExpr; -import com.github.javaparser.ast.stmt.ExpressionStmt; -import org.assertj.core.api.Assertions; -import org.junit.Test; - -import static com.github.javaparser.JavaParser.*; -import static com.github.javaparser.utils.Utils.EOL; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - -public class TypeConstructionTest { - @Test - public void getFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("@C int @A[] @B[] a @X[] @Y[];"); - - ArrayType arrayType1 = (ArrayType) fieldDeclaration.getVariable(0).getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); - ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); - ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); - PrimitiveType elementType = (PrimitiveType) arrayType4.getComponentType(); - - assertThat(arrayType1.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); - assertThat(arrayType2.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); - assertThat(arrayType3.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("X"))); - assertThat(arrayType4.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("Y"))); - - assertThat(elementType.getType()).isEqualTo(PrimitiveType.Primitive.INT); - assertThat(fieldDeclaration.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("C"))); - - assertThat(arrayType1.getParentNode().get().getParentNode().get()).isSameAs(fieldDeclaration); - } - - @Test - public void getVariableDeclarationWithArrays() { - ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); - VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); - - ArrayType arrayType1 = (ArrayType) variableDeclarationExpr.getVariable(0).getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); - ArrayType arrayType3 = (ArrayType) arrayType2.getComponentType(); - ArrayType arrayType4 = (ArrayType) arrayType3.getComponentType(); - PrimitiveType elementType = (PrimitiveType) arrayType4.getComponentType(); - - assertThat(arrayType1.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); - assertThat(arrayType2.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); - assertThat(arrayType3.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("X"))); - assertThat(arrayType4.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("Y"))); - - assertThat(elementType.getType()).isEqualTo(PrimitiveType.Primitive.INT); - assertThat(variableDeclarationExpr.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("C"))); - - assertThat(arrayType1.getParentNode().get().getParentNode().get()).isSameAs(variableDeclarationExpr); - } - - @Test - public void getMethodDeclarationWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("@C int @A[] a() @B[] {}"); - - ArrayType arrayType1 = (ArrayType) methodDeclaration.getType(); - ArrayType arrayType2 = (ArrayType) arrayType1.getComponentType(); - Assertions.assertThat(arrayType2.getComponentType()).isInstanceOf(PrimitiveType.class); - - assertThat(arrayType1.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); - assertThat(arrayType2.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); - assertThat(methodDeclaration.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("C"))); - - assertThat(methodDeclaration.getType().getParentNode().get()).isSameAs(methodDeclaration); - } - - @Test - public void getParameterWithArrays() { - MethodDeclaration methodDeclaration = (MethodDeclaration) parseBodyDeclaration("void a(@C int @A[] a @B[]) {}"); - - Parameter parameter = methodDeclaration.getParameter(0); - - ArrayType outerArrayType = (ArrayType) parameter.getType(); - - ArrayType innerArrayType = (ArrayType) outerArrayType.getComponentType(); - PrimitiveType elementType = (PrimitiveType) innerArrayType.getComponentType(); - - assertThat(elementType).isInstanceOf(PrimitiveType.class); - assertThat(outerArrayType.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("A"))); - assertThat(innerArrayType.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("B"))); - assertThat(parameter.getAnnotations()).containsExactly(new MarkerAnnotationExpr(parseName("C"))); - - assertThat(parameter.getType().getParentNode().get()).isSameAs(parameter); - } - - @Test - public void setVariableDeclarationWithArrays() { - ExpressionStmt variableDeclarationStatement = (ExpressionStmt) parseStatement("@C int @A[] @B[] a @X[] @Y[];"); - VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) variableDeclarationStatement.getExpression(); - - variableDeclarationExpr.getVariable(0).setType(new ArrayType(new ArrayType(PrimitiveType.intType()))); - assertEquals("@C int[][] a;", variableDeclarationStatement.toString()); - } - - @Test - public void setFieldDeclarationWithArrays() { - FieldDeclaration fieldDeclaration = (FieldDeclaration) parseBodyDeclaration("int[][] a[][];"); - fieldDeclaration.getVariable(0).setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); - - assertEquals("Blob[][] a;", fieldDeclaration.toString()); - } - - @Test - public void setMethodDeclarationWithArrays() { - MethodDeclaration method = (MethodDeclaration) parseBodyDeclaration("int[][] a()[][] {}"); - method.setType(new ArrayType(new ArrayType(parseClassOrInterfaceType("Blob")))); - - assertEquals("Blob[][] a() {" + EOL + "}", method.toString()); - } - - @Test - public void setParameterWithArrays() { - 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()); - } - - @Test - public void getArrayCreationType() { - ArrayCreationExpr expr = parseExpression("new int[]"); - ArrayType outerType = (ArrayType) expr.createdType(); - Type innerType = outerType.getComponentType(); - assertThat(innerType).isEqualTo(expr.getElementType()); - } -} 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 d9880b6c1..3257c4342 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 @@ -282,7 +282,7 @@ public class CommentParsingSteps { @Then("method $methodPosition in class $classPosition is commented \"$expectedContent\"") public void thenMethodInClassIsCommented(int methodPosition, int classPosition, String expectedContent) { TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getComment().get().getContent(), equalToIgnoringWhiteSpace(expectedContent)); } @@ -290,7 +290,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getAllContainedComments().size(), is(expectedCount)); } @@ -298,7 +298,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); Comment commentUnderTest = methodUnderTest.getAllContainedComments().get(commentPosition - 1); assertThat(commentUnderTest.getContent(), is(equalToIgnoringWhiteSpace(expectedContent))); @@ -307,7 +307,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); assertThat(methodUnderTest.getOrphanComments().size(), is(expectedCount)); } @@ -315,7 +315,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); assertThat(blockStmtUnderTest.getAllContainedComments().size(), is(expectedCount)); @@ -324,7 +324,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); assertThat(blockStmtUnderTest.getOrphanComments().size(), is(expectedCount)); @@ -333,7 +333,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); BlockStmt blockStmtUnderTest = methodUnderTest.getBody().orElse(null); Comment commentUnderTest = blockStmtUnderTest.getOrphanComments().get(commentPosition - 1); @@ -343,7 +343,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.getType(classPosition - 1); - MethodDeclaration methodUnderTest = (MethodDeclaration) getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, + MethodDeclaration methodUnderTest = getMemberByTypeAndPosition(classUnderTest, methodPosition - 1, MethodDeclaration.class); Comment commentUnderTest = methodUnderTest.getType().getComment().get(); assertThat(commentUnderTest.getContent(), is(equalToIgnoringWhiteSpace(expectedContent))); @@ -352,7 +352,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.getType(classPosition - 1); - FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, + FieldDeclaration fieldUnderTest = getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); assertThat(fieldUnderTest.getAllContainedComments().size(), is(expectedCount)); } @@ -360,7 +360,7 @@ public class CommentParsingSteps { @Then("field $fieldPosition in class $classPosition is not commented") public void thenFieldInClassIsNotCommented(int fieldPosition, int classPosition) { TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); - FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, + FieldDeclaration fieldUnderTest = getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); assertEquals(false, fieldUnderTest.getComment().isPresent()); } @@ -368,7 +368,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.getType(classPosition - 1); - FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, + FieldDeclaration fieldUnderTest = getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); Comment commentUnderTest = fieldUnderTest.getComment().get(); assertThat(commentUnderTest.getContent(), is(equalToIgnoringWhiteSpace(expectedContent))); @@ -377,7 +377,7 @@ 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.getType(classPosition - 1); - FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, + FieldDeclaration fieldUnderTest = getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); VariableDeclarator variableUnderTest = fieldUnderTest.getVariable(variablePosition - 1); Expression valueUnderTest = variableUnderTest.getInitializer().orElse(null); 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 b75fedc73..f499c842d 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 @@ -128,7 +128,7 @@ public class ParsingSteps { CompilationUnit compilationUnit = (CompilationUnit) state.get("cu1"); TypeDeclaration<?> classUnderTest = compilationUnit.getType(classPosition - 1); - FieldDeclaration fieldUnderTest = (FieldDeclaration) getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, + FieldDeclaration fieldUnderTest = getMemberByTypeAndPosition(classUnderTest, fieldPosition - 1, FieldDeclaration.class); AnnotationExpr annotationUnderTest = fieldUnderTest.getAnnotation(annotationPosition - 1); assertThat(annotationUnderTest.getChildNodes().get(1).toString(), is(expectedValue)); @@ -152,19 +152,19 @@ public class ParsingSteps { @Then("lambda in method call in statement $statementPosition in method $methodPosition in class $classPosition body is \"$expectedBody\"") public void thenLambdaInMethodCallInStatementInMethodInClassBody(int statementPosition, int methodPosition, int classPosition, String expectedBody) { - ExpressionStmt statement = (ExpressionStmt) getStatementInMethodInClass(statementPosition, methodPosition, classPosition); - VariableDeclarationExpr variableDeclarationExpr = (VariableDeclarationExpr) statement.getExpression(); + ExpressionStmt statement = getStatementInMethodInClass(statementPosition, methodPosition, classPosition).asExpressionStmt(); + VariableDeclarationExpr variableDeclarationExpr = statement.getExpression().asVariableDeclarationExpr(); VariableDeclarator variableDeclarator = variableDeclarationExpr.getVariable(0); MethodCallExpr methodCallExpr = (MethodCallExpr) variableDeclarator.getInitializer().orElse(null); - CastExpr castExpr = (CastExpr) methodCallExpr.getArgument(0); - LambdaExpr lambdaExpr = (LambdaExpr) castExpr.getExpression(); + CastExpr castExpr = methodCallExpr.getArgument(0).asCastExpr(); + LambdaExpr lambdaExpr = castExpr.getExpression().asLambdaExpr(); assertThat(lambdaExpr.getBody().toString(), is(expectedBody)); } @Then("lambda in statement $statementPosition in method $methodPosition in class $classPosition block statement is null") public void thenLambdaInStatementInMethodInClassBlockStatementIsNull(int statementPosition, int methodPosition, int classPosition) { LambdaExpr lambdaExpr = getLambdaExprInStatementInMethodInClass(statementPosition, methodPosition, classPosition); - BlockStmt blockStmt = (BlockStmt) lambdaExpr.getBody(); + BlockStmt blockStmt = lambdaExpr.getBody().asBlockStmt(); assertEquals(true, blockStmt.getStatements().isEmpty()); } @@ -180,7 +180,7 @@ public class ParsingSteps { public void thenLambdaInStatementInMethodInClassBlockStatement(int statementPosition, int methodPosition, int classPosition, String expectedBody) { LambdaExpr lambdaExpr = getLambdaExprInStatementInMethodInClass(statementPosition, methodPosition, classPosition); - BlockStmt blockStmt = (BlockStmt) lambdaExpr.getBody(); + BlockStmt blockStmt = lambdaExpr.getBody().asBlockStmt(); Statement lambdaStmt = blockStmt.getStatement(0); assertThat(lambdaStmt.toString(), is(expectedBody)); } @@ -202,7 +202,7 @@ public class ParsingSteps { @Then("method reference in statement $statementPosition in method $methodPosition in class $classPosition scope is $expectedName") public void thenMethodReferenceInStatementInMethodInClassIsScope(int statementPosition, int methodPosition, int classPosition, String expectedName) { - ExpressionStmt statementUnderTest = (ExpressionStmt) getStatementInMethodInClass(statementPosition, methodPosition, classPosition); + ExpressionStmt statementUnderTest = getStatementInMethodInClass(statementPosition, methodPosition, classPosition).asExpressionStmt(); assertEquals(1, statementUnderTest.getChildNodesByType(MethodReferenceExpr.class).size()); MethodReferenceExpr methodReferenceUnderTest = statementUnderTest.getChildNodesByType(MethodReferenceExpr.class).get(0); assertThat(methodReferenceUnderTest.getScope().toString(), is(expectedName)); @@ -241,7 +241,7 @@ public class ParsingSteps { private LambdaExpr getLambdaExprInStatementInMethodInClass(int statementPosition, int methodPosition, int classPosition) { Statement statement = getStatementInMethodInClass(statementPosition, methodPosition, classPosition); - VariableDeclarationExpr expression = (VariableDeclarationExpr) ((ExpressionStmt) statement).getExpression(); + VariableDeclarationExpr expression = ((ExpressionStmt) statement).getExpression().asVariableDeclarationExpr(); VariableDeclarator variableDeclarator = expression.getVariable(0); return (LambdaExpr) variableDeclarator.getInitializer().orElse(null); } @@ -264,8 +264,7 @@ public class ParsingSteps { @Then("ThenExpr in the conditional expression of the statement $statementPosition in method $methodPosition in class $classPosition is LambdaExpr") public void thenLambdaInConditionalExpressionInMethodInClassIsParentOfContainedParameter(int statementPosition, int methodPosition, int classPosition) { - Statement statement = getStatementInMethodInClass(statementPosition, methodPosition, classPosition); - ReturnStmt returnStmt = (ReturnStmt) statement; + ReturnStmt returnStmt = getStatementInMethodInClass(statementPosition, methodPosition, classPosition).asReturnStmt(); ConditionalExpr conditionalExpr = (ConditionalExpr) returnStmt.getExpression().orElse(null); assertThat(conditionalExpr.getElseExpr().getClass().getName(), is(LambdaExpr.class.getName())); } @@ -324,13 +323,13 @@ 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.getType(0); - ConstructorDeclaration ctor = (ConstructorDeclaration) classDeclaration.getMember(1); - ExpressionStmt assignStmt = (ExpressionStmt) ctor.getBody().getStatement(0); - AssignExpr assignExpr = (AssignExpr) assignStmt.getExpression(); + ClassOrInterfaceDeclaration classDeclaration = compilationUnit.getType(0).asClassOrInterfaceDeclaration(); + ConstructorDeclaration ctor = classDeclaration.getMember(1).asConstructorDeclaration(); + ExpressionStmt assignStmt = ctor.getBody().getStatement(0).asExpressionStmt(); + AssignExpr assignExpr = assignStmt.getExpression().asAssignExpr(); assertNotNull(assignExpr.getTarget()); assertEquals(NameExpr.class, assignExpr.getTarget().getClass()); - assertEquals(((NameExpr) assignExpr.getTarget()).getNameAsString(), "mString"); + assertEquals(assignExpr.getTarget().asNameExpr().getNameAsString(), "mString"); } private void setSelectedNodeFromCompilationUnit(Class<? extends Node> nodeType) { 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 34ab59585..b10302c49 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 @@ -36,6 +36,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; +import static com.github.javaparser.JavaParser.*; import static com.github.javaparser.utils.Utils.readerToString; import static org.junit.Assert.assertEquals; @@ -57,47 +58,47 @@ public class PrettyPrintingSteps { @When("the {class|compilation unit} is parsed by the Java parser") public void whenTheClassIsParsedByTheJavaParser() { - resultNode = JavaParser.parse(sourceUnderTest); + resultNode = parse(sourceUnderTest); } @When("the expression is parsed by the Java parser") public void whenTheExpressionIsParsedByTheJavaParser() { - resultNode = JavaParser.parseExpression(sourceUnderTest); + resultNode = parseExpression(sourceUnderTest); } @When("the block is parsed by the Java parser") public void whenTheBlockIsParsedByTheJavaParser() { - resultNode = JavaParser.parseBlock(sourceUnderTest); + resultNode = parseBlock(sourceUnderTest); } @When("the statement is parsed by the Java parser") public void whenTheStatementIsParsedByTheJavaParser() { - resultNode = JavaParser.parseStatement(sourceUnderTest); + resultNode = parseStatement(sourceUnderTest); } @When("the import is parsed by the Java parser") public void whenTheImportIsParsedByTheJavaParser() { - resultNode = JavaParser.parseImport(sourceUnderTest); + resultNode = parseImport(sourceUnderTest); } @When("the annotation is parsed by the Java parser") public void whenTheAnnotationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseAnnotation(sourceUnderTest); + resultNode = parseAnnotation(sourceUnderTest); } @When("the annotation body declaration is parsed by the Java parser") public void whenTheBodyDeclarationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseAnnotationBodyDeclaration(sourceUnderTest); + resultNode = parseAnnotationBodyDeclaration(sourceUnderTest); } @When("the class body declaration is parsed by the Java parser") public void whenTheClassBodyDeclarationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseBodyDeclaration(sourceUnderTest); + resultNode = parseBodyDeclaration(sourceUnderTest); } @When("the interface body declaration is parsed by the Java parser") public void whenTheInterfaceBodyDeclarationIsParsedByTheJavaParser() { - resultNode = JavaParser.parseBodyDeclaration(sourceUnderTest); + resultNode = parseBodyDeclaration(sourceUnderTest); } @When("the class is visited by an empty ModifierVisitorAdapter") 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 9b228d21b..53b7c4434 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 @@ -130,12 +130,12 @@ public class SharedSteps { assertThat(compilationUnit.toString(), CoreMatchers.is(equalToIgnoringWhiteSpace(classSrc))); } - public static BodyDeclaration<?> getMemberByTypeAndPosition(TypeDeclaration<?> typeDeclaration, int position, Class<? extends BodyDeclaration<?>> typeClass) { + public static <T extends BodyDeclaration<?>> T getMemberByTypeAndPosition(TypeDeclaration<?> typeDeclaration, int position, Class<T> typeClass) { int typeCount = 0; for (BodyDeclaration<?> declaration : typeDeclaration.getMembers()) { if (declaration.getClass().equals(typeClass)) { if (typeCount == position) { - return declaration; + return (T) declaration; } typeCount++; } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java index 1ba7c86b8..11ac7e957 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java @@ -40,17 +40,7 @@ import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.EnumDeclaration; public class CompilationUnitBuildersTest { - CompilationUnit cu; - - @Before - public void setup() { - cu = new CompilationUnit(); - } - - @After - public void teardown() { - cu = null; - } + private final CompilationUnit cu = new CompilationUnit(); @Test public void testAddImport() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/EnumDeclarationBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/EnumDeclarationBuildersTest.java index 83f441e33..048307d75 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/EnumDeclarationBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/EnumDeclarationBuildersTest.java @@ -33,17 +33,7 @@ import static com.github.javaparser.utils.Utils.EOL; import static org.junit.Assert.assertEquals; public class EnumDeclarationBuildersTest { - CompilationUnit cu; - - @Before - public void setup() { - cu = new CompilationUnit(); - } - - @After - public void teardown() { - cu = null; - } + private final CompilationUnit cu = new CompilationUnit(); @Test public void testAddImplements() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/FieldDeclarationBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/FieldDeclarationBuildersTest.java index 6fda4f510..7824addd1 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/FieldDeclarationBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/FieldDeclarationBuildersTest.java @@ -35,23 +35,9 @@ import static com.github.javaparser.ast.type.PrimitiveType.intType; import static org.junit.Assert.assertEquals; public class FieldDeclarationBuildersTest { - CompilationUnit cu; - private ClassOrInterfaceDeclaration testClass; - private EnumDeclaration testEnum; - - @Before - public void setup() { - cu = new CompilationUnit(); - testClass = cu.addClass("testClass"); - testEnum = cu.addEnum("testEnum"); - } - - @After - public void teardown() { - cu = null; - testClass = null; - testEnum = null; - } + private final CompilationUnit cu = new CompilationUnit(); + private ClassOrInterfaceDeclaration testClass = cu.addClass("testClass"); + private EnumDeclaration testEnum = cu.addEnum("testEnum"); @Test(expected = IllegalStateException.class) public void testOrphanFieldGetter() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithAnnotationsBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithAnnotationsBuildersTest.java index e9d3b1ac5..b72201631 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithAnnotationsBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithAnnotationsBuildersTest.java @@ -33,25 +33,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class NodeWithAnnotationsBuildersTest { - private CompilationUnit cu; - private ClassOrInterfaceDeclaration testClass; - - @Before - public void setup() { - cu = new CompilationUnit(); - testClass = cu.addClass("testClass"); - } + private CompilationUnit cu = new CompilationUnit(); + private ClassOrInterfaceDeclaration testClass = cu.addClass("testClass"); ; @interface hey { } - @After - public void teardown() { - cu = null; - testClass = null; - } - @Test public void testAddAnnotation() { NormalAnnotationExpr annotation = testClass.addAndGetAnnotation(hey.class); @@ -71,7 +59,7 @@ public class NodeWithAnnotationsBuildersTest { public void testAddSingleMemberAnnotation() { testClass.addSingleMemberAnnotation("test", "value"); assertEquals(1, testClass.getAnnotations().size()); - assertEquals("value", ((SingleMemberAnnotationExpr) testClass.getAnnotation(0)).getMemberValue().toString()); + assertEquals("value", testClass.getAnnotation(0).asSingleMemberAnnotationExpr().getMemberValue().toString()); } @Test diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java index e63f502d2..87d0a2553 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithParametersBuildersTest.java @@ -35,17 +35,7 @@ import static com.github.javaparser.utils.Utils.EOL; import static org.junit.Assert.assertEquals; public class NodeWithParametersBuildersTest { - CompilationUnit cu; - - @Before - public void setup() { - cu = new CompilationUnit(); - } - - @After - public void teardown() { - cu = null; - } + private final CompilationUnit cu = new CompilationUnit(); @Test public void testAddParameter() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithThrownExceptionsBuildersTest.java b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithThrownExceptionsBuildersTest.java index 5cf474b7b..79756065a 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithThrownExceptionsBuildersTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/builders/NodeWithThrownExceptionsBuildersTest.java @@ -33,17 +33,7 @@ import static com.github.javaparser.JavaParser.parseClassOrInterfaceType; import static org.junit.Assert.assertEquals; public class NodeWithThrownExceptionsBuildersTest { - CompilationUnit cu; - - @Before - public void setup() { - cu = new CompilationUnit(); - } - - @After - public void teardown() { - cu = null; - } + private final CompilationUnit cu = new CompilationUnit(); @Test public void testThrows() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/metamodel/JavaParserMetaModelTest.java b/javaparser-testing/src/test/java/com/github/javaparser/metamodel/JavaParserMetaModelTest.java deleted file mode 100644 index b8002791d..000000000 --- a/javaparser-testing/src/test/java/com/github/javaparser/metamodel/JavaParserMetaModelTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.javaparser.metamodel; - -import org.junit.Test; - -public class JavaParserMetaModelTest { - @Test - public void outputEverythingWithoutFailure() { - for (BaseNodeMetaModel classMetaModel : JavaParserMetaModel.getNodeMetaModels()) { - for (PropertyMetaModel propertyMetaModel : classMetaModel.getDeclaredPropertyMetaModels()) { - System.out.println(classMetaModel.getTypeNameGenerified() + "." + propertyMetaModel.getName()); - } - } - } -} diff --git a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java index cc6b0d7b9..619b27cff 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java @@ -73,22 +73,22 @@ public class ModuleDeclarationTest { new SingleMemberAnnotationExpr(new Name("Foo"), new IntegerLiteralExpr("2")), new MarkerAnnotationExpr(new Name("Bar"))); - ModuleRequiresStmt moduleRequiresStmt = (ModuleRequiresStmt) module.getModuleStmts().get(0); + ModuleRequiresStmt moduleRequiresStmt = module.getModuleStmts().get(0).asModuleRequiresStmt(); assertThat(moduleRequiresStmt.getNameAsString()).isEqualTo("A.B"); assertThat(moduleRequiresStmt.getModifiers()).isEmpty(); - ModuleExportsStmt moduleExportsStmt = (ModuleExportsStmt) module.getModuleStmts().get(5); + ModuleExportsStmt moduleExportsStmt = module.getModuleStmts().get(5).asModuleExportsStmt(); assertThat(moduleExportsStmt.getNameAsString()).isEqualTo("R.S"); assertThat(moduleExportsStmt.getModuleNames()).containsExactly(parseName("T1.U1"), parseName("T2.U2")); - ModuleOpensStmt moduleOpensStmt = (ModuleOpensStmt) module.getModuleStmts().get(7); + ModuleOpensStmt moduleOpensStmt = module.getModuleStmts().get(7).asModuleOpensStmt(); assertThat(moduleOpensStmt.getNameAsString()).isEqualTo("R.S"); assertThat(moduleOpensStmt.getModuleNames()).containsExactly(parseName("T1.U1"), parseName("T2.U2")); - ModuleUsesStmt moduleUsesStmt = (ModuleUsesStmt) module.getModuleStmts().get(8); + ModuleUsesStmt moduleUsesStmt = module.getModuleStmts().get(8).asModuleUsesStmt(); assertThat(moduleUsesStmt.getType().toString()).isEqualTo("V.W"); - ModuleProvidesStmt moduleProvidesStmt = (ModuleProvidesStmt) module.getModuleStmts().get(9); + ModuleProvidesStmt moduleProvidesStmt = module.getModuleStmts().get(9).asModuleProvidesStmt(); assertThat(moduleProvidesStmt.getType().toString()).isEqualTo("X.Y"); assertThat(moduleProvidesStmt.getWithTypes()).containsExactly( new ClassOrInterfaceType(parseClassOrInterfaceType("Z1"), "Z2"), diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java index a7ca65efb..108845772 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java @@ -37,11 +37,6 @@ public abstract class AbstractLexicalPreservingTest { protected CompilationUnit cu; protected Expression expression; - @Before - public void setup() { - cu = null; - } - protected void considerCode(String code) { cu = LexicalPreservingPrinter.setup(JavaParser.parse(code)); } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java index 00e778d71..93f0c9e61 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java @@ -183,7 +183,7 @@ public class LexicalPreservingPrinterTest extends AbstractLexicalPreservingTest considerCode(code); AnnotationDeclaration ad = cu.getAnnotationDeclarationByName("ClassPreamble").get(); - AnnotationMemberDeclaration md = (AnnotationMemberDeclaration)ad.getMember(0); + AnnotationMemberDeclaration md = (AnnotationMemberDeclaration)ad.getMember(0).asAnnotationMemberDeclaration(); Type type = md.getType(); NodeText nodeText = LexicalPreservingPrinter.getOrCreateNodeText(type); assertEquals(Arrays.asList("String", "[", "]"), @@ -194,7 +194,7 @@ public class LexicalPreservingPrinterTest extends AbstractLexicalPreservingTest public void checkNodeTextCreatedAnnotationMemberDeclarationWithComment() throws IOException { considerExample("AnnotationDeclaration_Example3_original"); - AnnotationMemberDeclaration md = (AnnotationMemberDeclaration)cu.getAnnotationDeclarationByName("ClassPreamble").get().getMember(5); + AnnotationMemberDeclaration md = (AnnotationMemberDeclaration)cu.getAnnotationDeclarationByName("ClassPreamble").get().getMember(5).asAnnotationMemberDeclaration(); NodeText nodeText = LexicalPreservingPrinter.getOrCreateNodeText(md); assertEquals(Arrays.asList("String[]", " ", "reviewers", "(", ")", ";"), nodeText.getElements().stream().map(TextElement::expand).collect(Collectors.toList())); @@ -204,7 +204,7 @@ public class LexicalPreservingPrinterTest extends AbstractLexicalPreservingTest public void checkNodeTextCreatedArrayCreationLevelWithoutExpression() throws IOException { considerExpression("new int[]"); - ArrayCreationExpr arrayCreationExpr = (ArrayCreationExpr)expression; + ArrayCreationExpr arrayCreationExpr = (ArrayCreationExpr)expression.asArrayCreationExpr(); ArrayCreationLevel arrayCreationLevel = arrayCreationExpr.getLevels().get(0); NodeText nodeText = LexicalPreservingPrinter.getOrCreateNodeText(arrayCreationLevel); assertEquals(Arrays.asList("[", "]"), @@ -215,7 +215,7 @@ public class LexicalPreservingPrinterTest extends AbstractLexicalPreservingTest public void checkNodeTextCreatedArrayCreationLevelWith() throws IOException { considerExpression("new int[123]"); - ArrayCreationExpr arrayCreationExpr = (ArrayCreationExpr)expression; + ArrayCreationExpr arrayCreationExpr = (ArrayCreationExpr)expression.asArrayCreationExpr(); ArrayCreationLevel arrayCreationLevel = arrayCreationExpr.getLevels().get(0); NodeText nodeText = LexicalPreservingPrinter.getOrCreateNodeText(arrayCreationLevel); assertEquals(Arrays.asList("[", "123", "]"), diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java index 74d49ac8a..ec89dd1ff 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java @@ -78,7 +78,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void example8() throws IOException { considerExample("Example8_original"); - FieldDeclaration fd = (FieldDeclaration) cu.getClassByName("A").get().getMember(0); + FieldDeclaration fd = (FieldDeclaration) cu.getClassByName("A").get().getMember(0).asFieldDeclaration(); fd.addVariable(new VariableDeclarator(PrimitiveType.intType(), "b")); assertTransformed("Example8", cu); } @@ -86,7 +86,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void example9() throws IOException { considerExample("Example9_original"); - FieldDeclaration fd = (FieldDeclaration) cu.getClassByName("A").get().getMember(0); + FieldDeclaration fd = (FieldDeclaration) cu.getClassByName("A").get().getMember(0).asFieldDeclaration(); fd.addVariable(new VariableDeclarator(new ArrayType(PrimitiveType.intType()), "b")); assertTransformed("Example9", cu); } @@ -101,7 +101,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void exampleParam1() throws IOException { considerExample("Example_param1_original"); - MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0); + MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); md.addParameter("int", "p1"); assertTransformed("Example_param1", cu); } @@ -109,7 +109,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void exampleParam2() throws IOException { considerExample("Example_param1_original"); - MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0); + MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); md.addParameter(new ArrayType(PrimitiveType.intType()), "p1"); md.addParameter("char", "p2"); assertTransformed("Example_param2", cu); @@ -118,7 +118,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void exampleParam3() throws IOException { considerExample("Example_param3_original"); - MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0); + MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); md.getParameters().remove(0); assertTransformed("Example_param3", cu); } @@ -126,7 +126,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void exampleParam4() throws IOException { considerExample("Example_param3_original"); - MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0); + MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); md.getParameters().remove(1); assertTransformed("Example_param4", cu); } @@ -134,7 +134,7 @@ public class TransformationsTest extends AbstractLexicalPreservingTest { @Test public void exampleParam5() throws IOException { considerExample("Example_param3_original"); - MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0); + MethodDeclaration md = (MethodDeclaration) cu.getClassByName("A").get().getMember(0).asMethodDeclaration(); md.setType(PrimitiveType.intType()); assertTransformed("Example_param5b", cu); md.getBody().get().getStatements().add(new ReturnStmt(new NameExpr("p1"))); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/ArrayCreationLevelTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/ArrayCreationLevelTransformationsTest.java index 5cba15dfa..93cff347e 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/ArrayCreationLevelTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/ArrayCreationLevelTransformationsTest.java @@ -40,7 +40,7 @@ public class ArrayCreationLevelTransformationsTest extends AbstractLexicalPreser protected ArrayCreationLevel consider(String code) { considerExpression("new int" + code); - ArrayCreationExpr arrayCreationExpr = (ArrayCreationExpr)expression; + ArrayCreationExpr arrayCreationExpr = expression.asArrayCreationExpr(); return arrayCreationExpr.getLevels().get(0); } diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java index 41904f8ad..02d01479c 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/AnnotationMemberDeclarationTransformationsTest.java @@ -44,7 +44,7 @@ public class AnnotationMemberDeclarationTransformationsTest extends AbstractLexi protected AnnotationMemberDeclaration consider(String code) { considerCode("@interface AD { " + code + " }"); - return (AnnotationMemberDeclaration)cu.getAnnotationDeclarationByName("AD").get().getMember(0); + return cu.getAnnotationDeclarationByName("AD").get().getMember(0).asAnnotationMemberDeclaration(); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java index 4551d2eef..2f07e334c 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ClassOrInterfaceDeclarationTransformationsTest.java @@ -44,7 +44,7 @@ public class ClassOrInterfaceDeclarationTransformationsTest extends AbstractLexi protected ClassOrInterfaceDeclaration consider(String code) { considerCode(code); - return (ClassOrInterfaceDeclaration)cu.getType(0); + return cu.getType(0).asClassOrInterfaceDeclaration(); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java index 856cf26d3..6889a70ef 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java @@ -40,7 +40,7 @@ public class ConstructorDeclarationTransformationsTest extends AbstractLexicalPr protected ConstructorDeclaration consider(String code) { considerCode("class A { " + code + " }"); - return (ConstructorDeclaration) cu.getType(0).getMembers().get(0); + return cu.getType(0).getMembers().get(0).asConstructorDeclaration(); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumConstantDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumConstantDeclarationTransformationsTest.java index d7413d3a2..dff71cc3c 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumConstantDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumConstantDeclarationTransformationsTest.java @@ -35,7 +35,7 @@ public class EnumConstantDeclarationTransformationsTest extends AbstractLexicalP protected EnumConstantDeclaration consider(String code) { considerCode("enum A { " + code + " }"); - return ((EnumDeclaration)cu.getType(0)).getEntries().get(0); + return cu.getType(0).asEnumDeclaration().getEntries().get(0); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java index 25b7af1e8..e2a8fa3df 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/EnumDeclarationTransformationsTest.java @@ -36,7 +36,7 @@ public class EnumDeclarationTransformationsTest extends AbstractLexicalPreservin protected EnumDeclaration consider(String code) { considerCode(code); - return (EnumDeclaration)cu.getType(0); + return cu.getType(0).asEnumDeclaration(); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java index 7d5b42a34..eda719080 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java @@ -36,7 +36,7 @@ public class FieldDeclarationTransformationsTest extends AbstractLexicalPreservi protected FieldDeclaration consider(String code) { considerCode("class A { " + code + " }"); - return (FieldDeclaration) cu.getType(0).getMembers().get(0); + return cu.getType(0).getMembers().get(0).asFieldDeclaration(); } // JavaDoc diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java index 0875daddf..738acb36d 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java @@ -34,7 +34,7 @@ public class InitializerDeclarationTransformationsTest extends AbstractLexicalPr protected InitializerDeclaration consider(String code) { considerCode("class A { " + code + " }"); - return (InitializerDeclaration) cu.getType(0).getMembers().get(0); + return cu.getType(0).getMembers().get(0).asInitializerDeclaration(); } // JavaDoc diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java index 21458eafb..1f94f3868 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java @@ -40,7 +40,7 @@ public class MethodDeclarationTransformationsTest extends AbstractLexicalPreserv protected MethodDeclaration consider(String code) { considerCode("class A { " + code + " }"); - return (MethodDeclaration) cu.getType(0).getMembers().get(0); + return cu.getType(0).getMembers().get(0).asMethodDeclaration(); } // Name diff --git a/javaparser-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java b/javaparser-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java index 05b9038dc..6620bb1c8 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java @@ -34,17 +34,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; public class NodeRemovalTest { - CompilationUnit cu; - - @Before - public void setup() { - cu = new CompilationUnit(); - } - - @After - public void teardown() { - cu = null; - } + private final CompilationUnit cu = new CompilationUnit(); @Test public void testRemoveClassFromCompilationUnit() { |