Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: tests/compiler/dart2js/expect_annotations_test.dart

Issue 2278213003: Rename the global inference task and reduce it's API surface by introducing the (Closed)
Patch Set: cl comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 backend.annotations.noInline(method), 87 backend.annotations.noInline(method),
88 "Unexpected annotation of @NoInline on '$method'."); 88 "Unexpected annotation of @NoInline on '$method'.");
89 Expect.equals( 89 Expect.equals(
90 expectTrustTypeAnnotations, 90 expectTrustTypeAnnotations,
91 backend.annotations.trustTypeAnnotations(method), 91 backend.annotations.trustTypeAnnotations(method),
92 "Unexpected annotation of @TrustTypeAnnotations on '$method'."); 92 "Unexpected annotation of @TrustTypeAnnotations on '$method'.");
93 Expect.equals( 93 Expect.equals(
94 expectAssumeDynamic, 94 expectAssumeDynamic,
95 backend.annotations.assumeDynamic(method), 95 backend.annotations.assumeDynamic(method),
96 "Unexpected annotation of @AssumeDynamic on '$method'."); 96 "Unexpected annotation of @AssumeDynamic on '$method'.");
97 TypesInferrer inferrer = compiler.typesTask.typesInferrer; 97 TypesInferrer inferrer = compiler.globalInference.typesInferrer;
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,
103 compiler.commonMasks.dynamicType, null, inferrer);
103 } 104 }
104 } 105 }
105 106
106 TypeMask jsStringType = compiler.typesTask.stringType; 107 TypeMask jsStringType = compiler.commonMasks.stringType;
107 TypeMask jsIntType = compiler.typesTask.intType; 108 TypeMask jsIntType = compiler.commonMasks.intType;
108 TypeMask coreStringType = new TypeMask.subtype( 109 TypeMask coreStringType = new TypeMask.subtype(
109 compiler.coreClasses.stringClass, compiler.world); 110 compiler.coreClasses.stringClass, compiler.world);
110 111
111 test('method'); 112 test('method');
112 test('methodAssumeDynamic', expectAssumeDynamic: true); 113 test('methodAssumeDynamic', expectAssumeDynamic: true);
113 test('methodTrustTypeAnnotations', 114 test('methodTrustTypeAnnotations',
114 expectTrustTypeAnnotations: true, 115 expectTrustTypeAnnotations: true,
115 expectedParameterType: jsStringType); 116 expectedParameterType: jsStringType);
116 test('methodNoInline', expectNoInline: true); 117 test('methodNoInline', expectNoInline: true);
117 test('methodNoInlineTrustTypeAnnotations', 118 test('methodNoInlineTrustTypeAnnotations',
118 expectNoInline: true, 119 expectNoInline: true,
119 expectTrustTypeAnnotations: true, 120 expectTrustTypeAnnotations: true,
120 expectedParameterType: jsStringType, 121 expectedParameterType: jsStringType,
121 expectedReturnType: jsIntType); 122 expectedReturnType: jsIntType);
122 test('methodAssumeDynamicTrustTypeAnnotations', 123 test('methodAssumeDynamicTrustTypeAnnotations',
123 expectAssumeDynamic: true, 124 expectAssumeDynamic: true,
124 expectTrustTypeAnnotations: true, 125 expectTrustTypeAnnotations: true,
125 expectedParameterType: coreStringType); 126 expectedParameterType: coreStringType);
126 127
127 }); 128 });
128 } 129 }
OLDNEW
« no previous file with comments | « tests/compiler/dart2js/dictionary_types_test.dart ('k') | tests/compiler/dart2js/field_type_simple_inferer_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698