fix(getTypeDeclaration): getTypeDeclaration('?') should point to Object

INRIA · Nov 14, 2016 · 85e29ad · 85e29ad
1 parent a98b96d
commit 85e29ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java
@@ -195,6 +195,9 @@ private CtTypeParameter getRecursiveDeclaration(CtElement element) {
 
  @Override
  public CtType<Object> getTypeDeclaration() {
+ if ("?".equals(getSimpleName())) {
+ return getFactory().Type().get(Object.class);
+ }
  return getDeclaration();
  }
 

diff --git a/src/test/java/spoon/test/reference/TypeReferenceTest.java b/src/test/java/spoon/test/reference/TypeReferenceTest.java
@@ -10,6 +10,7 @@
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtFieldRead;
 import spoon.reflect.code.CtInvocation;
+import spoon.reflect.code.CtLocalVariable;
 import spoon.reflect.code.CtNewClass;
 import spoon.reflect.code.CtReturn;
 import spoon.reflect.code.CtStatement;
@@ -28,6 +29,7 @@
 import spoon.reflect.visitor.Query;
 import spoon.reflect.visitor.filter.ReferenceTypeFilter;
 import spoon.reflect.visitor.filter.TypeFilter;
+import spoon.support.compiler.SnippetCompilationHelper;
 import spoon.test.reference.testclasses.EnumValue;
 import spoon.test.reference.testclasses.Panini;
 import spoon.testing.utils.ModelUtils;
@@ -580,4 +582,19 @@ public void testGetTypeDeclaration() throws Exception {
  assertNotNull(iBar);
  assertEquals("compilation.IBar", iBar.getQualifiedName());
  }
+
+ @Test
+ public void testTypeDeclarationWildcard() throws Exception {
+ // contract1: getTypeDeclaration nevers returns null, even for wilddards
+ // contract2: getTypeDeclaration returns a CtTYpe representing Object as the compiler does
+ CtLocalVariable<?> s = new Launcher().getFactory().Code().createCodeSnippetStatement("java.util.List<?> l = null").compile();
+ assertEquals("?", s.getType().getActualTypeArguments().get(0).getSimpleName());
+ assertEquals("Object", s.getType().getActualTypeArguments().get(0).getTypeDeclaration().getSimpleName());
+ assertEquals(Object.class, s.getType().getActualTypeArguments().get(0).getTypeDeclaration().getActualClass());
+
+ // some additional tests
+ CtLocalVariable<?> s2 = new Launcher().getFactory().Code().createCodeSnippetStatement("java.util.List<String> l = null").compile();
+ assertEquals("String", s2.getType().getActualTypeArguments().get(0).getSimpleName());
+ assertEquals(String.class, s2.getType().getActualTypeArguments().get(0).getTypeDeclaration().getActualClass());
+ }
 }