update test

INRIA · Mar 14, 2017 · 5a46a4b · 5a46a4b
1 parent c2403e1
commit 5a46a4b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/test/java/spoon/test/generics/ClassThatBindsAGenericType.java b/src/test/java/spoon/test/generics/ClassThatBindsAGenericType.java
@@ -4,13 +4,10 @@
 import java.util.ArrayList;
 
 @SuppressWarnings("serial")
-public class ClassThatBindsAGenericType extends ArrayList<File> {
+class ClassThatBindsAGenericType extends ArrayList<File> {
 
 	public static void main(String[] args) throws Exception {
 	}
 
 }
 
-class ClassThatDefinesANewTypeArgument<T> {
-	void foo(T t){}
-}
diff --git a/src/test/java/spoon/test/generics/ClassThatDefinesANewTypeArgument.java b/src/test/java/spoon/test/generics/ClassThatDefinesANewTypeArgument.java
@@ -0,0 +1,5 @@
+package spoon.test.generics;
+
+public class ClassThatDefinesANewTypeArgument<T> {
+	void foo(T t){}
+}
diff --git a/src/test/java/spoon/test/generics/GenericsTest.java b/src/test/java/spoon/test/generics/GenericsTest.java
@@ -143,8 +143,9 @@ public void testModelBuildingSimilarSignatureMethods() throws Exception {
 
 	@Test
 	public void testTypeParameterReference() throws Exception {
-		CtClass<?> classThatBindsAGenericType = build("spoon.test.generics", "ClassThatBindsAGenericType");
-		CtClass<?> classThatDefinesANewTypeArgument = classThatBindsAGenericType.getPackage().getElements(new NameFilter<CtClass<?>>("ClassThatDefinesANewTypeArgument")).get(0);
+		Factory factory = build(ClassThatBindsAGenericType.class, ClassThatDefinesANewTypeArgument.class);
+		CtClass<?> classThatBindsAGenericType = factory.Class().get(ClassThatBindsAGenericType.class);
+		CtClass<?> classThatDefinesANewTypeArgument = factory.Class().get(ClassThatDefinesANewTypeArgument.class);
 
 		CtTypeReference<?> tr1 = classThatBindsAGenericType.getSuperclass();
 		CtTypeReference<?> trExtends = tr1.getActualTypeArguments().get(0);
@@ -165,21 +166,11 @@ public void testTypeParameterReference() throws Exception {
 
 	@Test
 	public void testTypeParameterDeclarer() throws Exception {
-		CtClass<?> classThatBindsAGenericType = build("spoon.test.generics", "ClassThatBindsAGenericType");
-		CtClass<?> classThatDefinesANewTypeArgument = classThatBindsAGenericType.getPackage().getElements(new NameFilter<CtClass<?>>("ClassThatDefinesANewTypeArgument")).get(0);
-
-		CtTypeParameter typeParam = classThatDefinesANewTypeArgument.getFormalCtTypeParameters().get(0);
-		assertSame(typeParam.getParent(CtFormalTypeDeclarer.class), typeParam.getTypeParameterDeclarer()); 
-	}
-
-	@Test
-	public void testTypeParameterReferenceDeclaration() throws Exception {
-		CtClass<?> classThatBindsAGenericType = build("spoon.test.generics", "ClassThatBindsAGenericType");
-		CtClass<?> classThatDefinesANewTypeArgument = classThatBindsAGenericType.getPackage().getElements(new NameFilter<CtClass<?>>("ClassThatDefinesANewTypeArgument")).get(0);
-
+		// contract: one can navigate to the declarer of a type parameter
+		CtClass<?> classThatDefinesANewTypeArgument = build("spoon.test.generics", "ClassThatDefinesANewTypeArgument");
 		CtTypeParameter typeParam = classThatDefinesANewTypeArgument.getFormalCtTypeParameters().get(0);
-		//contract: the the reference to type parameter must be able to return the same type parameter
-		assertSame(typeParam, typeParam.getReference().getDeclaration()); 
+		assertSame(classThatDefinesANewTypeArgument, typeParam.getTypeParameterDeclarer());
+		assertSame(typeParam, typeParam.getReference().getDeclaration());
 	}
 
 	@Test