| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:expect/expect.dart'; | 5 import 'package:expect/expect.dart'; |
| 6 import 'package:async_helper/async_helper.dart'; | 6 import 'package:async_helper/async_helper.dart'; |
| 7 import 'package:compiler/src/compiler.dart'; | 7 import 'package:compiler/src/compiler.dart'; |
| 8 import 'package:compiler/src/elements/elements.dart'; | 8 import 'package:compiler/src/elements/elements.dart'; |
| 9 import 'package:compiler/src/js_backend/js_backend.dart'; | 9 import 'package:compiler/src/js_backend/js_backend.dart'; |
| 10 import 'package:compiler/src/types/types.dart'; | 10 import 'package:compiler/src/types/types.dart'; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 if (expectTrustTypeAnnotations && expectedParameterType != null) { | 98 if (expectTrustTypeAnnotations && expectedParameterType != null) { |
| 99 testTypeMatch(method, expectedParameterType, expectedReturnType, | 99 testTypeMatch(method, expectedParameterType, expectedReturnType, |
| 100 inferrer); | 100 inferrer); |
| 101 } else if (expectAssumeDynamic) { | 101 } else if (expectAssumeDynamic) { |
| 102 testTypeMatch(method, compiler.typesTask.dynamicType, null, inferrer); | 102 testTypeMatch(method, compiler.typesTask.dynamicType, null, inferrer); |
| 103 } | 103 } |
| 104 } | 104 } |
| 105 | 105 |
| 106 TypeMask jsStringType = compiler.typesTask.stringType; | 106 TypeMask jsStringType = compiler.typesTask.stringType; |
| 107 TypeMask jsIntType = compiler.typesTask.intType; | 107 TypeMask jsIntType = compiler.typesTask.intType; |
| 108 TypeMask coreStringType = new TypeMask.subtype(compiler.stringClass, | 108 TypeMask coreStringType = new TypeMask.subtype( |
| 109 compiler.world); | 109 compiler.coreClasses.stringClass, compiler.world); |
| 110 | 110 |
| 111 test('method'); | 111 test('method'); |
| 112 test('methodAssumeDynamic', expectAssumeDynamic: true); | 112 test('methodAssumeDynamic', expectAssumeDynamic: true); |
| 113 test('methodTrustTypeAnnotations', | 113 test('methodTrustTypeAnnotations', |
| 114 expectTrustTypeAnnotations: true, | 114 expectTrustTypeAnnotations: true, |
| 115 expectedParameterType: jsStringType); | 115 expectedParameterType: jsStringType); |
| 116 test('methodNoInline', expectNoInline: true); | 116 test('methodNoInline', expectNoInline: true); |
| 117 test('methodNoInlineTrustTypeAnnotations', | 117 test('methodNoInlineTrustTypeAnnotations', |
| 118 expectNoInline: true, | 118 expectNoInline: true, |
| 119 expectTrustTypeAnnotations: true, | 119 expectTrustTypeAnnotations: true, |
| 120 expectedParameterType: jsStringType, | 120 expectedParameterType: jsStringType, |
| 121 expectedReturnType: jsIntType); | 121 expectedReturnType: jsIntType); |
| 122 test('methodAssumeDynamicTrustTypeAnnotations', | 122 test('methodAssumeDynamicTrustTypeAnnotations', |
| 123 expectAssumeDynamic: true, | 123 expectAssumeDynamic: true, |
| 124 expectTrustTypeAnnotations: true, | 124 expectTrustTypeAnnotations: true, |
| 125 expectedParameterType: coreStringType); | 125 expectedParameterType: coreStringType); |
| 126 | 126 |
| 127 }); | 127 }); |
| 128 } | 128 } |
| OLD | NEW |