tests: don't use extractType() here

Author: panchenko

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/TypeUtil.java

@@ -106,6 +106,7 @@ public static ParameterizedType genericType(String baseType,
 		return genericType;
 	}
 
+	@Deprecated
 	public static Type extractType(JSType type) {
 		if (type instanceof SimpleType) {
 			return ((SimpleType) type).getTarget();

tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinference/TypeInferenceTests.java

@@ -33,6 +33,7 @@
 import org.eclipse.dltk.javascript.typeinference.IValueReference;
 import org.eclipse.dltk.javascript.typeinfo.IRClassType;
 import org.eclipse.dltk.javascript.typeinfo.IRRecordType;
+import org.eclipse.dltk.javascript.typeinfo.IRSimpleType;
 import org.eclipse.dltk.javascript.typeinfo.IRType;
 import org.eclipse.dltk.javascript.typeinfo.ITypeNames;
 import org.eclipse.dltk.javascript.typeinfo.JSTypeSet;
@@ -79,10 +80,6 @@ private IValueCollection inference(final String code) {
 		return inferencer.getCollection();
 	}
 
-	private Type extractType(IRType type) {
-		return TypeUtil.extractType(inferencer, type);
-	}
-
 	public void testNewNamedFunction() throws Exception {
 		List<String> lines = new StringList();
 		lines.add("var test = new function Test() {");
@@ -711,7 +708,8 @@ public void testJavaClzIntegrationWithPackagesPrefix() {
 
 		IValueReference str = collection.getChild("x");
 		assertEquals(1, str.getTypes().size());
-		assertEquals(stringType, extractType(str.getTypes().getFirst()));
+		assertEquals(stringType,
+				((IRSimpleType) str.getTypes().toRType()).getTarget());
 
 		final Member toString = stringType.findDirectMember("toString");
 		assertNotNull(toString);
@@ -735,7 +733,8 @@ public void testJavaClzIntegrationWithJavaPrefix() {
 
 		IValueReference str = collection.getChild("x");
 		assertEquals(1, str.getTypes().size());
-		assertEquals(stringType, extractType(str.getTypes().getFirst()));
+		assertEquals(stringType,
+				((IRSimpleType) str.getTypes().toRType()).getTarget());
 
 		final Member toString = stringType.findDirectMember("toString");
 		assertNotNull(toString);
@@ -752,7 +751,7 @@ public void testJavaIntegrationWithJavaPrefix() {
 		assertEquals("java.lang.String", type.getName());
 
 		boolean toStringFound = false;
-		for (Member member : extractType(type).getMembers()) {
+		for (Member member : ((IRSimpleType) type).getTarget().getMembers()) {
 			toStringFound = member.getName().equals("toString");
 			if (toStringFound) {
 				assertEquals(false, member.isStatic());
@@ -774,7 +773,7 @@ public void testJavaIntegrationWithPackagesPrefix() {
 		assertEquals("java.lang.String", type.getName());
 
 		boolean toStringFound = false;
-		for (Member member : extractType(type).getMembers()) {
+		for (Member member : ((IRSimpleType) type).getTarget().getMembers()) {
 			toStringFound = member.getName().equals("toString");
 			if (toStringFound) {
 				assertEquals(false, member.isStatic());