| Index: tests/compiler/dart2js/resolver_test.dart
|
| diff --git a/tests/compiler/dart2js/resolver_test.dart b/tests/compiler/dart2js/resolver_test.dart
|
| index 83d8e3d92df06a00880823e9e1f5763c5b2f56d6..3035fbf822bdb6d44c169b78fd0eb0482e7073d3 100644
|
| --- a/tests/compiler/dart2js/resolver_test.dart
|
| +++ b/tests/compiler/dart2js/resolver_test.dart
|
| @@ -147,11 +147,12 @@ Future testTypeVariables() {
|
| matchResolvedTypes(visitor, text, name, expectedElements) {
|
| VariableDefinitions definition = parseStatement(text);
|
| visitor.visit(definition.type);
|
| - InterfaceType type = visitor.registry.mapping.getType(definition.type);
|
| + ResolutionInterfaceType type =
|
| + visitor.registry.mapping.getType(definition.type);
|
| Expect.equals(
|
| definition.type.typeArguments.slowLength(), type.typeArguments.length);
|
| int index = 0;
|
| - for (DartType argument in type.typeArguments) {
|
| + for (ResolutionDartType argument in type.typeArguments) {
|
| Expect.equals(true, index < expectedElements.length);
|
| Expect.equals(expectedElements[index], argument.element);
|
| index++;
|
| @@ -803,7 +804,7 @@ Future testClassHierarchy() {
|
| Expect.equals(0, collector.warnings.length);
|
| Expect.equals(0, collector.errors.length);
|
| ClassElement aElement = compiler.mainApp.find("A");
|
| - Link<DartType> supertypes = aElement.allSupertypes;
|
| + Link<ResolutionDartType> supertypes = aElement.allSupertypes;
|
| Expect.equals(<String>['B', 'C', 'Object'].toString(),
|
| asSortedStrings(supertypes).toString());
|
| }),
|
| @@ -820,7 +821,7 @@ Future testClassHierarchy() {
|
| Expect.equals(0, collector.warnings.length);
|
| Expect.equals(0, collector.errors.length);
|
| ClassElement aElement = compiler.mainApp.find("C");
|
| - Link<DartType> supertypes = aElement.allSupertypes;
|
| + Link<ResolutionDartType> supertypes = aElement.allSupertypes;
|
| // Object is once per inheritance path, that is from both A and I.
|
| Expect.equals(
|
| <String>[
|
| @@ -842,7 +843,7 @@ Future testClassHierarchy() {
|
| Expect.equals(0, collector.warnings.length);
|
| Expect.equals(0, collector.errors.length);
|
| ClassElement aElement = compiler.mainApp.find("E");
|
| - Link<DartType> supertypes = aElement.allSupertypes;
|
| + Link<ResolutionDartType> supertypes = aElement.allSupertypes;
|
| Expect.equals(<String>['A<E>', 'D', 'Object'].toString(),
|
| asSortedStrings(supertypes).toString());
|
| }),
|
|
|