| Index: tests/compiler/dart2js/type_order_test.dart
|
| diff --git a/tests/compiler/dart2js/type_order_test.dart b/tests/compiler/dart2js/type_order_test.dart
|
| index 87c2aa20bf34fbc3320f7a734949ed1040f5eda0..5fa80877213dbac5b44a690f8cb7df9ffec485b9 100644
|
| --- a/tests/compiler/dart2js/type_order_test.dart
|
| +++ b/tests/compiler/dart2js/type_order_test.dart
|
| @@ -9,7 +9,7 @@ import 'package:async_helper/async_helper.dart';
|
| import 'type_test_helper.dart';
|
| import 'package:compiler/src/dart_types.dart';
|
| import "package:compiler/src/elements/elements.dart"
|
| - show Element, ClassElement, TypedefElement;
|
| + show Element, ClassElement, TypedefElement;
|
|
|
| void main() {
|
| asyncTest(() => TypeEnvironment.create(r"""
|
| @@ -20,53 +20,69 @@ void main() {
|
| class Y {}
|
| class Z {}
|
| """).then((env) {
|
| + List types = [];
|
| + DartType add(DartType type) {
|
| + types.add(type);
|
| + return type;
|
| + }
|
|
|
| - List types = [];
|
| - DartType add(DartType type) {
|
| - types.add(type);
|
| - return type;
|
| - }
|
| + DartType dynamic_ = add(env['dynamic']);
|
| + DartType void_ = add(env['void']);
|
|
|
| - DartType dynamic_ = add(env['dynamic']);
|
| - DartType void_ = add(env['void']);
|
| + ClassElement A = env.getElement('A');
|
| + TypedefElement B = env.getElement('B');
|
| + ClassElement C = env.getElement('C');
|
| + DartType X = add(env['X']);
|
| + DartType Y = add(env['Y']);
|
| + DartType Z = add(env['Z']);
|
|
|
| - ClassElement A = env.getElement('A');
|
| - TypedefElement B = env.getElement('B');
|
| - ClassElement C = env.getElement('C');
|
| - DartType X = add(env['X']);
|
| - DartType Y = add(env['Y']);
|
| - DartType Z = add(env['Z']);
|
| + InterfaceType A_this = add(A.thisType);
|
| + InterfaceType A_raw = add(A.rawType);
|
| + TypeVariableType AT = add(A_this.typeArguments[0]);
|
| + TypeVariableType AS = add(A_this.typeArguments[1]);
|
| + InterfaceType A_X_Y = add(instantiate(A, [X, Y]));
|
| + InterfaceType A_Y_X = add(instantiate(A, [Y, X]));
|
|
|
| - InterfaceType A_this = add(A.thisType);
|
| - InterfaceType A_raw = add(A.rawType);
|
| - TypeVariableType AT = add(A_this.typeArguments[0]);
|
| - TypeVariableType AS = add(A_this.typeArguments[1]);
|
| - InterfaceType A_X_Y = add(instantiate(A, [X, Y]));
|
| - InterfaceType A_Y_X = add(instantiate(A, [Y, X]));
|
| + TypedefType B_this = add(B.computeType(env.compiler.resolution));
|
| + TypedefType B_raw = add(B.rawType);
|
| + TypeVariableType BT = add(B_this.typeArguments[0]);
|
| + TypeVariableType BS = add(B_this.typeArguments[1]);
|
| + FunctionType B_this_alias = add(B.alias);
|
| + TypedefType B_X_Y = add(instantiate(B, [X, Y]));
|
| + FunctionType B_X_Y_alias = add(B_X_Y.unaliased);
|
| + TypedefType B_Y_X = add(instantiate(B, [Y, X]));
|
| + FunctionType B_Y_X_alias = add(B_Y_X.unaliased);
|
|
|
| - TypedefType B_this = add(B.computeType(env.compiler.resolution));
|
| - TypedefType B_raw = add(B.rawType);
|
| - TypeVariableType BT = add(B_this.typeArguments[0]);
|
| - TypeVariableType BS = add(B_this.typeArguments[1]);
|
| - FunctionType B_this_alias = add(B.alias);
|
| - TypedefType B_X_Y = add(instantiate(B, [X, Y]));
|
| - FunctionType B_X_Y_alias = add(B_X_Y.unaliased);
|
| - TypedefType B_Y_X = add(instantiate(B, [Y, X]));
|
| - FunctionType B_Y_X_alias = add(B_Y_X.unaliased);
|
| + InterfaceType C_this = add(C.thisType);
|
| + InterfaceType C_raw = add(C.rawType);
|
| + TypeVariableType CT = add(C_this.typeArguments[0]);
|
| + TypeVariableType CS = add(C_this.typeArguments[1]);
|
|
|
| - InterfaceType C_this = add(C.thisType);
|
| - InterfaceType C_raw = add(C.rawType);
|
| - TypeVariableType CT = add(C_this.typeArguments[0]);
|
| - TypeVariableType CS = add(C_this.typeArguments[1]);
|
| -
|
| - Expect.listEquals(
|
| - [void_, dynamic_,
|
| - A_raw, A_this, A_X_Y, A_Y_X, AT, AS,
|
| - B_raw, B_this, B_X_Y, B_Y_X, BT, BS,
|
| - C_raw, C_this, CT, CS,
|
| - X, Y, Z,
|
| - B_this_alias, B_Y_X_alias, B_X_Y_alias,
|
| - ],
|
| - Types.sorted(types));
|
| - }));
|
| -}
|
| + Expect.listEquals([
|
| + void_,
|
| + dynamic_,
|
| + A_raw,
|
| + A_this,
|
| + A_X_Y,
|
| + A_Y_X,
|
| + AT,
|
| + AS,
|
| + B_raw,
|
| + B_this,
|
| + B_X_Y,
|
| + B_Y_X,
|
| + BT,
|
| + BS,
|
| + C_raw,
|
| + C_this,
|
| + CT,
|
| + CS,
|
| + X,
|
| + Y,
|
| + Z,
|
| + B_this_alias,
|
| + B_Y_X_alias,
|
| + B_X_Y_alias,
|
| + ], Types.sorted(types));
|
| + }));
|
| +}
|
|
|