Skip to content

Commit

Permalink
working on adapting tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ftomassetti
ftomassetti committed Sep 30, 2017
1 parent 18ca9b3 commit 3f34115
Show file tree
Hide file tree
Showing 38 changed files with 336 additions and 335 deletions.
4 changes: 2 additions & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue113.java
View file
Expand Up @@ -4,10 +4,10 @@
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
Expand Down Expand Up @@ -46,7 +46,7 @@ public void issue113superClassIsResolvedCorrectly() throws FileNotFoundException
CompilationUnit cu = JavaParser.parse(new File(pathToSourceFile));

JavaParserClassDeclaration jssExtendedWidget = new JavaParserClassDeclaration(cu.getClassByName("Widget").get(), typeSolver);
ReferenceType superClass = jssExtendedWidget.getSuperClass();
ResolvedReferenceType superClass = jssExtendedWidget.getSuperClass();
assertEquals("com.foo.base.Widget", superClass.getQualifiedName());
}

Expand Down
4 changes: 2 additions & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue116.java
View file
Expand Up @@ -22,10 +22,10 @@
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand All @@ -42,7 +42,7 @@ public void arrayTypeIsNotPartOfTheTree() throws ParseException {
TypeSolver typeSolver = new ReflectionTypeSolver();
JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
com.github.javaparser.ast.type.Type typeNode = methodDeclaration.getParameters().get(0).getType();
Type type = javaParserFacade.convert(typeNode, typeNode);
ResolvedType type = javaParserFacade.convert(typeNode, typeNode);
assertEquals("java.lang.String[]", type.describe());

ExpressionStmt expressionStmt = (ExpressionStmt) methodDeclaration.getBody().get().getStatements().get(0);
Expand Down
2 changes: 1 addition & 1 deletion java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue144.java
View file
Expand Up @@ -6,10 +6,10 @@
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.resolution.UnsolvedSymbolException;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
Expand Down
1 change: 0 additions & 1 deletion java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue156.java
View file
Expand Up @@ -10,7 +10,6 @@
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
Expand Down
4 changes: 2 additions & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue18.java
View file
Expand Up @@ -21,10 +21,10 @@
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand All @@ -41,7 +41,7 @@ public void typeDeclarationSuperClassImplicitlyIncludeObject() throws ParseExcep
ExpressionStmt expr = (ExpressionStmt) methodDeclaration.getBody().get().getStatements().get(1);
TypeSolver typeSolver = new ReflectionTypeSolver();
JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
Type type = javaParserFacade.getType(expr.getExpression());
ResolvedType type = javaParserFacade.getType(expr.getExpression());
assertEquals("java.lang.Object", type.describe());
}
}
1 change: 0 additions & 1 deletion java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue186.java
View file
Expand Up @@ -11,7 +11,6 @@
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand Down
1 change: 0 additions & 1 deletion java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue200.java
View file
Expand Up @@ -10,7 +10,6 @@
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand Down
3 changes: 1 addition & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue228.java
View file
Expand Up @@ -4,9 +4,8 @@
import com.github.javaparser.ParseException;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.resolution.MethodUsage;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.methods.MethodUsage;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand Down
4 changes: 2 additions & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue232.java
View file
Expand Up @@ -3,11 +3,11 @@
import com.github.javaparser.ParseException;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedTypeDeclaration;
import com.github.javaparser.symbolsolver.core.resolution.Context;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
Expand All @@ -22,6 +22,6 @@ public void issue232() throws ParseException {
TypeSolver typeSolver = new ReflectionTypeSolver();
JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
Context context = JavaParserFactory.getContext(cls, typeSolver);
SymbolReference<TypeDeclaration> reference = context.solveType("OfPrimitive<Double, DoubleConsumer, OfDouble>", typeSolver);
SymbolReference<ResolvedTypeDeclaration> reference = context.solveType("OfPrimitive<Double, DoubleConsumer, OfDouble>", typeSolver);
}
}
4 changes: 2 additions & 2 deletions java-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue84.java
View file
Expand Up @@ -23,10 +23,10 @@
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.Type;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand All @@ -41,7 +41,7 @@ public void variadicIssue() throws ParseException {
final MethodCallExpr methodCall = Navigator.findMethodCall(cu, "variadicMethod");

final JavaParserFacade javaParserFacade = JavaParserFacade.get(new ReflectionTypeSolver());
final Type type = javaParserFacade.getType(methodCall);
final ResolvedType type = javaParserFacade.getType(methodCall);
assertEquals(String.class.getCanonicalName(), type.asReferenceType().getQualifiedName());
}
}
7 changes: 4 additions & 3 deletions .../test/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariableUsageTest.java
View file
Expand Up @@ -16,7 +16,8 @@

package com.github.javaparser.symbolsolver.model.typesystem;

import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
import com.github.javaparser.resolution.types.ResolvedTypeVariable;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
Expand All @@ -29,13 +30,13 @@

public class TypeVariableUsageTest {

private TypeVariable tpA;
private ResolvedTypeVariable tpA;
private ReferenceTypeImpl tpString;
private TypeSolver typeSolver;

@Before
public void setup() {
tpA = new TypeVariable(TypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()));
tpA = new ResolvedTypeVariable(ResolvedTypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()));

typeSolver = new ReflectionTypeSolver();
tpString = new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver);
Expand Down
48 changes: 26 additions & 22 deletions ...sting/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java
View file
Expand Up @@ -16,7 +16,11 @@

package com.github.javaparser.symbolsolver.model.typesystem;

import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
import com.github.javaparser.resolution.types.ResolvedArrayType;
import com.github.javaparser.resolution.types.ResolvedPrimitiveType;
import com.github.javaparser.resolution.types.ResolvedTypeVariable;
import com.github.javaparser.resolution.types.ResolvedVoidType;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration;
Expand All @@ -32,8 +36,8 @@

public class VoidTypeTest {

private ArrayType arrayOfBooleans;
private ArrayType arrayOfListOfA;
private ResolvedArrayType arrayOfBooleans;
private ResolvedArrayType arrayOfListOfA;
private ReferenceTypeImpl OBJECT;
private ReferenceTypeImpl STRING;
private TypeSolver typeSolver;
Expand All @@ -43,95 +47,95 @@ public void setup() {
typeSolver = new ReflectionTypeSolver();
OBJECT = new ReferenceTypeImpl(new ReflectionClassDeclaration(Object.class, typeSolver), typeSolver);
STRING = new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver);
arrayOfBooleans = new ArrayType(PrimitiveType.BOOLEAN);
arrayOfListOfA = new ArrayType(new ReferenceTypeImpl(
arrayOfBooleans = new ResolvedArrayType(ResolvedPrimitiveType.BOOLEAN);
arrayOfListOfA = new ResolvedArrayType(new ReferenceTypeImpl(
new ReflectionInterfaceDeclaration(List.class, typeSolver),
ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()))), typeSolver));
ImmutableList.of(new ResolvedTypeVariable(ResolvedTypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()))), typeSolver));
}

@Test
public void testIsArray() {
assertEquals(false, VoidType.INSTANCE.isArray());
assertEquals(false, ResolvedVoidType.INSTANCE.isArray());
}

@Test
public void testIsPrimitive() {
assertEquals(false, VoidType.INSTANCE.isPrimitive());
assertEquals(false, ResolvedVoidType.INSTANCE.isPrimitive());
}

@Test
public void testIsNull() {
assertEquals(false, VoidType.INSTANCE.isNull());
assertEquals(false, ResolvedVoidType.INSTANCE.isNull());
}

@Test
public void testIsReference() {
assertEquals(false, VoidType.INSTANCE.isReference());
assertEquals(false, ResolvedVoidType.INSTANCE.isReference());
}

@Test
public void testIsReferenceType() {
assertEquals(false, VoidType.INSTANCE.isReferenceType());
assertEquals(false, ResolvedVoidType.INSTANCE.isReferenceType());
}

@Test
public void testIsVoid() {
assertEquals(true, VoidType.INSTANCE.isVoid());
assertEquals(true, ResolvedVoidType.INSTANCE.isVoid());
}

@Test
public void testIsTypeVariable() {
assertEquals(false, VoidType.INSTANCE.isTypeVariable());
assertEquals(false, ResolvedVoidType.INSTANCE.isTypeVariable());
}

@Test(expected = UnsupportedOperationException.class)
public void testAsReferenceTypeUsage() {
VoidType.INSTANCE.asReferenceType();
ResolvedVoidType.INSTANCE.asReferenceType();
}

@Test(expected = UnsupportedOperationException.class)
public void testAsTypeParameter() {
VoidType.INSTANCE.asTypeParameter();
ResolvedVoidType.INSTANCE.asTypeParameter();
}

@Test(expected = UnsupportedOperationException.class)
public void testAsArrayTypeUsage() {
VoidType.INSTANCE.asArrayType();
ResolvedVoidType.INSTANCE.asArrayType();
}

@Test
public void testAsDescribe() {
assertEquals("void", VoidType.INSTANCE.describe());
assertEquals("void", ResolvedVoidType.INSTANCE.describe());
}

@Test
public void testIsAssignableBy() {
try {
assertEquals(false, VoidType.INSTANCE.isAssignableBy(NullType.INSTANCE));
assertEquals(false, ResolvedVoidType.INSTANCE.isAssignableBy(NullType.INSTANCE));
fail();
} catch (UnsupportedOperationException e) {

}
try {
assertEquals(false, VoidType.INSTANCE.isAssignableBy(OBJECT));
assertEquals(false, ResolvedVoidType.INSTANCE.isAssignableBy(OBJECT));
fail();
} catch (UnsupportedOperationException e) {

}
try {
assertEquals(false, VoidType.INSTANCE.isAssignableBy(STRING));
assertEquals(false, ResolvedVoidType.INSTANCE.isAssignableBy(STRING));
fail();
} catch (UnsupportedOperationException e) {

}
try {
assertEquals(false, VoidType.INSTANCE.isAssignableBy(PrimitiveType.BOOLEAN));
assertEquals(false, ResolvedVoidType.INSTANCE.isAssignableBy(ResolvedPrimitiveType.BOOLEAN));
fail();
} catch (UnsupportedOperationException e) {

}
try {
assertEquals(false, VoidType.INSTANCE.isAssignableBy(VoidType.INSTANCE));
assertEquals(false, ResolvedVoidType.INSTANCE.isAssignableBy(ResolvedVoidType.INSTANCE));
fail();
} catch (UnsupportedOperationException e) {

Expand Down
46 changes: 24 additions & 22 deletions .../src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java
View file
Expand Up @@ -16,7 +16,9 @@

package com.github.javaparser.symbolsolver.model.typesystem;

import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
import com.github.javaparser.resolution.types.ResolvedTypeVariable;
import com.github.javaparser.resolution.types.ResolvedWildcard;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
Expand All @@ -41,16 +43,16 @@ class Bar extends Foo {
private ReferenceTypeImpl bar;
private ReferenceTypeImpl object;
private ReferenceTypeImpl string;
private Wildcard unbounded = Wildcard.UNBOUNDED;
private Wildcard superFoo;
private Wildcard superBar;
private Wildcard extendsFoo;
private Wildcard extendsBar;
private Wildcard superA;
private Wildcard extendsA;
private Wildcard superString;
private Wildcard extendsString;
private TypeVariable a;
private ResolvedWildcard unbounded = ResolvedWildcard.UNBOUNDED;
private ResolvedWildcard superFoo;
private ResolvedWildcard superBar;
private ResolvedWildcard extendsFoo;
private ResolvedWildcard extendsBar;
private ResolvedWildcard superA;
private ResolvedWildcard extendsA;
private ResolvedWildcard superString;
private ResolvedWildcard extendsString;
private ResolvedTypeVariable a;

@Before
public void setup() {
Expand All @@ -59,15 +61,15 @@ public void setup() {
bar = new ReferenceTypeImpl(new ReflectionClassDeclaration(Bar.class, typeSolver), typeSolver);
object = new ReferenceTypeImpl(new ReflectionClassDeclaration(Object.class, typeSolver), typeSolver);
string = new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver);
superFoo = Wildcard.superBound(foo);
superBar = Wildcard.superBound(bar);
extendsFoo = Wildcard.extendsBound(foo);
extendsBar = Wildcard.extendsBound(bar);
a = new TypeVariable(TypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()));
superA = Wildcard.superBound(a);
extendsA = Wildcard.extendsBound(a);
superString = Wildcard.superBound(string);
extendsString = Wildcard.extendsBound(string);
superFoo = ResolvedWildcard.superBound(foo);
superBar = ResolvedWildcard.superBound(bar);
extendsFoo = ResolvedWildcard.extendsBound(foo);
extendsBar = ResolvedWildcard.extendsBound(bar);
a = new ResolvedTypeVariable(ResolvedTypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList()));
superA = ResolvedWildcard.superBound(a);
extendsA = ResolvedWildcard.extendsBound(a);
superString = ResolvedWildcard.superBound(string);
extendsString = ResolvedWildcard.extendsBound(string);
}

@Test
Expand Down Expand Up @@ -182,8 +184,8 @@ public void testAsDescribe() {

@Test
public void testReplaceParam() {
TypeParameterDeclaration tpA = TypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList());
TypeParameterDeclaration tpB = TypeParameterDeclaration.onType("B", "foo.Bar", Collections.emptyList());
ResolvedTypeParameterDeclaration tpA = ResolvedTypeParameterDeclaration.onType("A", "foo.Bar", Collections.emptyList());
ResolvedTypeParameterDeclaration tpB = ResolvedTypeParameterDeclaration.onType("B", "foo.Bar", Collections.emptyList());
assertTrue(unbounded == unbounded.replaceTypeVariables(tpA, string));
assertTrue(superFoo == superFoo.replaceTypeVariables(tpA, string));
assertTrue(extendsFoo == extendsFoo.replaceTypeVariables(tpA, string));
Expand Down

0 comments on commit 3f34115

Please sign in to comment.