Fix for 14221/ 15553/ 16673- X isSubtypeOf E now returns false when X is some type and E is a type …

editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java

Index: editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java
diff --git a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java
index 880286c4f1a18487d468c0eba87aaa33b7ebf3ef..afa4b93d7b5baee7bd7cd541e4b7d4affe944b4d 100644
--- a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java
+++ b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/internal/type/InterfaceTypeImplTest.java
@@ -29,6 +29,7 @@ import com.google.dart.engine.internal.resolver.TestTypeProvider;
 import com.google.dart.engine.type.FunctionType;
 import com.google.dart.engine.type.InterfaceType;
 import com.google.dart.engine.type.Type;
+import com.google.dart.engine.type.TypeParameterType;
 
 import static com.google.dart.engine.ast.AstFactory.identifier;
 import static com.google.dart.engine.element.ElementFactory.classElement;
@@ -1099,6 +1100,36 @@ public class InterfaceTypeImplTest extends EngineTestCase {
     assertTrue(typeC.isMoreSpecificThan(typeA));
   }
 
+  public void test_isMoreSpecificThan_typeParameterType() {
+    //
+    // class A<E> {}
+    //
+    ClassElement classA = classElement("A", "E");
+    InterfaceType typeA = classA.getType();
+    TypeParameterType parameterType = classA.getTypeParameters()[0].getType();
+    Type objectType = typeProvider.getObjectType();
+
+    assertTrue(parameterType.isMoreSpecificThan(objectType));
+    assertFalse(parameterType.isMoreSpecificThan(typeA));
+  }
+
+  public void test_isMoreSpecificThan_typeParameterType_withBound() {
+    //
+    // class A {}
+    // class B<E extends A> {}
+    //
+    ClassElement classA = classElement("A");
+    InterfaceType typeA = classA.getType();
+    ClassElementImpl classB = classElement("B");
+    TypeParameterElementImpl parameterEA = new TypeParameterElementImpl(identifier("E"));
+    TypeParameterType parameterAEType = new TypeParameterTypeImpl(parameterEA);
+    parameterEA.setBound(typeA);
+    parameterEA.setType(parameterAEType);
+    classB.setTypeParameters(new TypeParameterElementImpl[] {parameterEA});
+
+    assertTrue(parameterAEType.isMoreSpecificThan(typeA));
+  }
+
   public void test_isSubtypeOf_directSubtype() {
     ClassElement classA = classElement("A");
     ClassElement classB = classElement("B", classA.getType());
@@ -1252,6 +1283,19 @@ public class InterfaceTypeImplTest extends EngineTestCase {
     assertFalse(typeAK.isSubtypeOf(typeAI));
   }
 
+  public void test_isSubtypeOf_typeParameter() {
+    //
+    // class A<E> {}
+    //
+    ClassElement classA = classElement("A", "E");
+    InterfaceType typeA = classA.getType();
+    TypeParameterType parameterType = classA.getTypeParameters()[0].getType();
+    Type dynamicType = DynamicTypeImpl.getInstance();
+
+    assertFalse(typeA.isSubtypeOf(parameterType));
+    assertTrue(dynamicType.isSubtypeOf(parameterType));
+  }
+
   public void test_isSupertypeOf_directSupertype() {
     ClassElement classA = classElement("A");
     ClassElement classB = classElement("B", classA.getType());