Resolve typedefs.

tests/compiler/dart2js/mirrors_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #import("../../../lib/dartdoc/mirrors/mirrors.dart");
 #import("../../../lib/dartdoc/mirrors/mirrors_util.dart");
 
 #import('dart:io');
 
 int count(Iterable iterable) {
@@ skipping 238 matching lines @@
   Expect.isFalse(bazClass.isFunction, "Class is a function");
 
   Expect.isTrue(bazClass.isDeclaration, "Class is not declaration");
   Expect.equals(bazClass, bazClass.declaration,
                 "Class is not its declaration");
 
   Expect.isTrue(bazClass.isClass, "Class is not class");
   Expect.isFalse(bazClass.isInterface, "Class is interface");
   Expect.isFalse(bazClass.isPrivate, "Class is private");
 
+  var bazClassTypeVariables = bazClass.typeVariables();
+  Expect.isNotNull(bazClassTypeVariables, "Type variable list is null");
+  Expect.equals(2, bazClassTypeVariables.length,
+                "Type variable list is not empty");
+
+  var bazE = bazClassTypeVariables[0];
+  Expect.isNotNull(bazE, "Type variable is null");
+  Expect.stringEquals('E', bazE.simpleName(), "Unexpected simpleName");
+  Expect.stringEquals('mirrors_helper.Baz.E', bazE.qualifiedName(),
+                      "Unexpected qualifiedName");
+  Expect.equals(bazClass, bazE.declarer(),
+                "Unexpected type variable declarer");
+  var bazEbound = bazE.bound();
+  Expect.isNotNull(bazEbound, "Missing type variable bound");
+  Expect.isFalse(bazEbound.isDeclaration, "Bound is declaration");
+  Expect.isTrue(bazEbound.isObject, "Bound is not object");
+
+  var bazF = bazClassTypeVariables[1];
+  Expect.isNotNull(bazF, "Type variable is null");
+  Expect.stringEquals('F', bazF.simpleName(), "Unexpected simpleName");
+  Expect.stringEquals('mirrors_helper.Baz.F', bazF.qualifiedName(),
+                      "Unexpected qualifiedName");
+  Expect.equals(bazClass, bazF.declarer());
+  var bazFbound = bazF.bound();
+  Expect.isNotNull(bazFbound, "Missing type variable bound");
+  Expect.isFalse(bazFbound.isDeclaration, "Bound is declaration");
+  Expect.stringEquals("mirrors_helper.Foo", bazFbound.qualifiedName(),
+                      "Bound is not Foo");
+
   var objectType = bazClass.superclass();
   Expect.isNotNull(objectType, "Superclass is null");
   Expect.isTrue(objectType.isObject, "Object is not Object");
   Expect.isFalse(objectType.isDeclaration, "Object type is declaration");
   Expect.isTrue(containsType(bazClass,
                              computeSubdeclarations(objectType)),
                 "Class is not subclass of superclass");
 
   var bazInterfaces = bazClass.interfaces();
   Expect.isNotNull(bazInterfaces, "Interfaces map is null");
   Expect.isTrue(!bazInterfaces.isEmpty(), "Interfaces map is empty");
   for (var bazInterface in bazInterfaces.getValues()) {
     Expect.isTrue(containsType(bazClass,
                                computeSubdeclarations(objectType)),
                   "Class is not subclass of superinterface");
   }
 
   var bazSubdeclarations = computeSubdeclarations(bazClass);
   Expect.equals(0, count(bazSubdeclarations), "Unexpected subtype count");
 
   var barInterface = findMirror(bazInterfaces, "Bar");
   Expect.isNotNull(barInterface, "Interface bar is missing");
   Expect.isFalse(barInterface.isDeclaration, "Interface type is declaration");
   var barInterfaceTypeArguments = barInterface.typeArguments();
   Expect.isNotNull(barInterfaceTypeArguments, "Type arguments are missing");
-  // TODO(johnniwinther): Ensure type arguments on supertypes. Expected result
-  // should have been 1:
-  Expect.equals(0, barInterfaceTypeArguments.length,
+  Expect.equals(1, barInterfaceTypeArguments.length,
                 "Type arguments is empty");
+  Expect.equals(bazE, barInterfaceTypeArguments[0],
+                "Unexpected type argument on super type");
 
   Expect.throws(() => bazClass.typeArguments(),
                 (exception) => true,
                 "Class has type arguments");
-  var bazClassTypeVariables = bazClass.typeVariables();
-  Expect.isNotNull(bazClassTypeVariables, "Type variable list is null");
-  Expect.equals(2, bazClassTypeVariables.length,
-                "Type variable list is not empty");
-
-  var bazE = bazClassTypeVariables[0];
-  Expect.isNotNull(bazE, "Type variable is null");
-  Expect.stringEquals('E', bazE.simpleName(), "Unexpected simpleName");
-  Expect.stringEquals('mirrors_helper.Baz.E', bazE.qualifiedName(),
-                      "Unexpected qualifiedName");
-  Expect.equals(bazClass, bazE.declarer(),
-                "Unexpected type variable declarer");
-  var bazEbound = bazE.bound();
-  Expect.isNotNull(bazEbound, "Missing type variable bound");
-  Expect.isFalse(bazEbound.isDeclaration, "Bound is declaration");
-  Expect.isTrue(bazEbound.isObject, "Bound is not object");
-
-  var bazF = bazClassTypeVariables[1];
-  Expect.isNotNull(bazF, "Type variable is null");
-  Expect.stringEquals('F', bazF.simpleName(), "Unexpected simpleName");
-  Expect.stringEquals('mirrors_helper.Baz.F', bazF.qualifiedName(),
-                      "Unexpected qualifiedName");
-  Expect.equals(bazClass, bazF.declarer());
-  var bazFbound = bazF.bound();
-  Expect.isNotNull(bazFbound, "Missing type variable bound");
-  Expect.isFalse(bazFbound.isDeclaration, "Bound is declaration");
-  Expect.stringEquals("mirrors_helper.Foo", bazFbound.qualifiedName(),
-                      "Bound is not Foo");
 
   Expect.isNull(bazClass.defaultType(), "Class has default type");
 
   var bazClassMembers = bazClass.declaredMembers();
   Expect.isNotNull(bazClassMembers, "Declared members map is null");
   Expect.equals(8, bazClassMembers.length,
                 "Unexpected number of declared members");
 
   ////////////////////////////////////////////////////////////////////////////
   // method1(e) {}
@@ skipping 298 matching lines @@
   Expect.stringEquals('negate', operator_negate.operatorName,
                       "Unexpected operatorName");
 
 
   var bazClassConstructors = bazClass.constructors();
   Expect.isNotNull(bazClassConstructors, "Constructors map is null");
   Expect.equals(3, bazClassConstructors.length,
                 "Unexpected number of constructors");
   // TODO(johnniwinther): Add tests of constructors.
 }