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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analyzer/test/generated/type_system_test.dart

Issue 1524893002: Fix imports within the analyzer package (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/test/generated/test_support.dart ('k') | pkg/analyzer/test/src/context/abstract_context.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/test/generated/type_system_test.dart
diff --git a/pkg/analyzer/test/generated/type_system_test.dart b/pkg/analyzer/test/generated/type_system_test.dart
index cd16dcf895bc8165e35e315f4484bf14e63a1fc6..6486b63b5bf657ce71fec483ca450f322304c737 100644
--- a/pkg/analyzer/test/generated/type_system_test.dart
+++ b/pkg/analyzer/test/generated/type_system_test.dart
@@ -6,7 +6,10 @@
library analyzer.test.generated.type_system_test;
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/dart/element/type.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/testing/element_factory.dart';
import 'package:analyzer/src/generated/testing/test_type_provider.dart';
@@ -118,14 +121,14 @@ class StrongAssignabilityTest {
}
void test_isAssignableTo_fuzzy_arrows() {
- FunctionType top = TypeBuilder.function(
- required: <DartType>[dynamicType], result: objectType);
- FunctionType left = TypeBuilder.function(
- required: <DartType>[objectType], result: objectType);
- FunctionType right = TypeBuilder.function(
- required: <DartType>[dynamicType], result: bottomType);
- FunctionType bottom = TypeBuilder.function(
- required: <DartType>[objectType], result: bottomType);
+ FunctionType top = TypeBuilder
+ .function(required: <DartType>[dynamicType], result: objectType);
+ FunctionType left = TypeBuilder
+ .function(required: <DartType>[objectType], result: objectType);
+ FunctionType right = TypeBuilder
+ .function(required: <DartType>[dynamicType], result: bottomType);
+ FunctionType bottom = TypeBuilder
+ .function(required: <DartType>[objectType], result: bottomType);
_checkCrossLattice(top, left, right, bottom);
}
@@ -175,8 +178,8 @@ class StrongAssignabilityTest {
required: <DartType>[],
named: <String, DartType>{'x': intType},
result: intType);
- DartType rr = TypeBuilder.function(
- required: <DartType>[intType, intType], result: intType);
+ DartType rr = TypeBuilder
+ .function(required: <DartType>[intType, intType], result: intType);
DartType ro = TypeBuilder.function(
required: <DartType>[intType],
optional: <DartType>[intType],
@@ -237,8 +240,8 @@ class StrongAssignabilityTest {
TypeBuilder.function(required: <DartType>[intType], result: objectType);
FunctionType left =
TypeBuilder.function(required: <DartType>[intType], result: intType);
- FunctionType right = TypeBuilder.function(
- required: <DartType>[objectType], result: objectType);
+ FunctionType right = TypeBuilder
+ .function(required: <DartType>[objectType], result: objectType);
FunctionType bottom =
TypeBuilder.function(required: <DartType>[objectType], result: intType);
@@ -339,8 +342,8 @@ class StrongGenericFunctionInferenceTest {
var tFrom = TypeBuilder.variable('TFrom');
var tTo =
TypeBuilder.variable('TTo', bound: iterableType.substitute4([tFrom]));
- var cast = TypeBuilder.function(
- types: [tFrom, tTo], required: [tFrom], result: tTo);
+ var cast = TypeBuilder
+ .function(types: [tFrom, tTo], required: [tFrom], result: tTo);
expect(_inferCall(cast, [stringType]), [
stringType,
iterableType.substitute4([stringType])
@@ -375,8 +378,8 @@ class StrongGenericFunctionInferenceTest {
// <TFrom, TTo>(TFrom) -> TTo
var tFrom = TypeBuilder.variable('TFrom');
var tTo = TypeBuilder.variable('TTo');
- var cast = TypeBuilder.function(
- types: [tFrom, tTo], required: [tFrom], result: tTo);
+ var cast = TypeBuilder
+ .function(types: [tFrom, tTo], required: [tFrom], result: tTo);
expect(_inferCall(cast, [intType]), [intType, dynamicType]);
}
@@ -384,8 +387,8 @@ class StrongGenericFunctionInferenceTest {
// <TFrom, TTo extends TFrom>(TFrom) -> TTo
var tFrom = TypeBuilder.variable('TFrom');
var tTo = TypeBuilder.variable('TTo', bound: tFrom);
- var cast = TypeBuilder.function(
- types: [tFrom, tTo], required: [tFrom], result: tTo);
+ var cast = TypeBuilder
+ .function(types: [tFrom, tTo], required: [tFrom], result: tTo);
expect(_inferCall(cast, [intType]), [intType, intType]);
}
@@ -590,14 +593,14 @@ class StrongSubtypingTest {
}
void test_fuzzy_arrows() {
- FunctionType top = TypeBuilder.function(
- required: <DartType>[dynamicType], result: objectType);
- FunctionType left = TypeBuilder.function(
- required: <DartType>[objectType], result: objectType);
- FunctionType right = TypeBuilder.function(
- required: <DartType>[dynamicType], result: bottomType);
- FunctionType bottom = TypeBuilder.function(
- required: <DartType>[objectType], result: bottomType);
+ FunctionType top = TypeBuilder
+ .function(required: <DartType>[dynamicType], result: objectType);
+ FunctionType left = TypeBuilder
+ .function(required: <DartType>[objectType], result: objectType);
+ FunctionType right = TypeBuilder
+ .function(required: <DartType>[dynamicType], result: bottomType);
+ FunctionType bottom = TypeBuilder
+ .function(required: <DartType>[objectType], result: bottomType);
_checkLattice(top, left, right, bottom);
}
@@ -714,8 +717,8 @@ class StrongSubtypingTest {
required: <DartType>[],
named: <String, DartType>{'x': intType},
result: intType);
- DartType rr = TypeBuilder.function(
- required: <DartType>[intType, intType], result: intType);
+ DartType rr = TypeBuilder
+ .function(required: <DartType>[intType, intType], result: intType);
DartType ro = TypeBuilder.function(
required: <DartType>[intType],
optional: <DartType>[intType],
@@ -782,8 +785,8 @@ class StrongSubtypingTest {
TypeBuilder.function(required: <DartType>[intType], result: objectType);
FunctionType left =
TypeBuilder.function(required: <DartType>[intType], result: intType);
- FunctionType right = TypeBuilder.function(
- required: <DartType>[objectType], result: objectType);
+ FunctionType right = TypeBuilder
+ .function(required: <DartType>[objectType], result: objectType);
FunctionType bottom =
TypeBuilder.function(required: <DartType>[objectType], result: intType);
« no previous file with comments | « pkg/analyzer/test/generated/test_support.dart ('k') | pkg/analyzer/test/src/context/abstract_context.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698