| Index: tests/compiler/dart2js/concrete_type_inference_test.dart
|
| diff --git a/tests/compiler/dart2js/concrete_type_inference_test.dart b/tests/compiler/dart2js/concrete_type_inference_test.dart
|
| index ce5b556e53583c3015eb1b7c35cdcf4a2085194b..b1905dd2e28c48f2ccdadc8ad6b2893471e72552 100644
|
| --- a/tests/compiler/dart2js/concrete_type_inference_test.dart
|
| +++ b/tests/compiler/dart2js/concrete_type_inference_test.dart
|
| @@ -16,49 +16,50 @@ Future compileAndFind(String code, String name, check(compiler, element)) {
|
| });
|
| }
|
|
|
| -void checkPrintType(String expression, checkType(compiler, type)) {
|
| +void checkPrintType(String expression, checkType(closedWorld, type)) {
|
| asyncTest(() => compileAndFind('main() { print($expression); }', 'print',
|
| (compiler, printElement) {
|
| var parameter = printElement.functionSignature.requiredParameters.first;
|
| - checkType(compiler, _typeOf(compiler, parameter));
|
| + checkType(compiler.closedWorld, _typeOf(compiler, parameter));
|
| }));
|
|
|
| asyncTest(() =>
|
| compileAndFind('main() { var x = print; print($expression); }', 'print',
|
| (compiler, printElement) {
|
| var parameter = printElement.functionSignature.requiredParameters.first;
|
| - checkType(compiler, _typeOf(compiler, parameter));
|
| + checkType(
|
| + compiler.closedWorld, _typeOf(compiler, parameter));
|
| }));
|
|
|
| asyncTest(() => compileAndFind(
|
| 'main() { print($expression); print($expression); }', 'print',
|
| (compiler, printElement) {
|
| var parameter = printElement.functionSignature.requiredParameters.first;
|
| - checkType(compiler, _typeOf(compiler, parameter));
|
| + checkType(compiler.closedWorld, _typeOf(compiler, parameter));
|
| }));
|
| }
|
|
|
| void testBasicTypes() {
|
| - checkPrintType('true', (compiler, type) {
|
| + checkPrintType('true', (closedWorld, type) {
|
| if (type.isForwarding) type = type.forwardTo;
|
| - Expect.identical(compiler.closedWorld.commonMasks.boolType, type);
|
| + Expect.identical(closedWorld.commonMasks.boolType, type);
|
| });
|
| - checkPrintType('1.5', (compiler, type) {
|
| - Expect.identical(compiler.closedWorld.commonMasks.doubleType, type);
|
| + checkPrintType('1.5', (closedWorld, type) {
|
| + Expect.identical(closedWorld.commonMasks.doubleType, type);
|
| });
|
| - checkPrintType('1', (compiler, type) {
|
| - Expect.identical(compiler.closedWorld.commonMasks.uint31Type, type);
|
| + checkPrintType('1', (closedWorld, type) {
|
| + Expect.identical(closedWorld.commonMasks.uint31Type, type);
|
| });
|
| - checkPrintType('[]', (compiler, type) {
|
| + checkPrintType('[]', (closedWorld, type) {
|
| if (type.isForwarding) type = type.forwardTo;
|
| - Expect.identical(compiler.closedWorld.commonMasks.growableListType, type);
|
| + Expect.identical(closedWorld.commonMasks.growableListType, type);
|
| });
|
| - checkPrintType('null', (compiler, type) {
|
| - Expect.identical(compiler.closedWorld.commonMasks.nullType, type);
|
| + checkPrintType('null', (closedWorld, type) {
|
| + Expect.identical(closedWorld.commonMasks.nullType, type);
|
| });
|
| - checkPrintType('"foo"', (compiler, type) {
|
| - Expect.isTrue(compiler.closedWorld.commonMasks.stringType
|
| - .containsOnlyString(compiler.closedWorld));
|
| + checkPrintType('"foo"', (closedWorld, type) {
|
| + Expect.isTrue(
|
| + closedWorld.commonMasks.stringType.containsOnlyString(closedWorld));
|
| });
|
| }
|
|
|
|
|