Skip to content

Commit e5d5a66

Browse files
pqCommit Queue
authored andcommitted
[element model] migrate static_type_analyzer_test
Change-Id: Ic09af41dec9f47ce81eb9b68aeb7545145a12482 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401881 Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 76623a6 commit e5d5a66

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ test/error/error_reporter_test.dart
161161
test/generated/elements_types_mixin.dart
162162
test/generated/non_error_resolver_test.dart
163163
test/generated/resolver_test_case.dart
164-
test/generated/static_type_analyzer_test.dart
165164
test/generated/type_system_test.dart
166165
test/id_tests/assigned_variables_test.dart
167166
test/id_tests/type_constraint_generation_test.dart

pkg/analyzer/test/generated/static_type_analyzer_test.dart

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ late Derived<Derived> derivedDerived;
2828
late Derived<Derived<int>> derivedDerivedInt;
2929
''');
3030
var dynamicType = typeProvider.dynamicType;
31-
var derivedDynamicType = findElement.topVar('derivedDynamic').type;
32-
var derivedIntType = findElement.topVar('derivedInt').type;
33-
var derivedDerivedType = findElement.topVar('derivedDerived').type;
34-
var derivedDerivedIntType = findElement.topVar('derivedDerivedInt').type;
31+
var derivedDynamicType = findElement2.topVar('derivedDynamic').type;
32+
var derivedIntType = findElement2.topVar('derivedInt').type;
33+
var derivedDerivedType = findElement2.topVar('derivedDerived').type;
34+
var derivedDerivedIntType = findElement2.topVar('derivedDerivedInt').type;
3535
// class Derived<T> extends Future<T> { ... }
3636
// flatten(Derived) = dynamic
3737
expect(_flatten(derivedDynamicType), dynamicType);
@@ -53,8 +53,8 @@ late B b;
5353
error(CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE, 6, 1),
5454
error(CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE, 27, 1),
5555
]);
56-
var aType = findElement.topVar('a').type;
57-
var bType = findElement.topVar('b').type;
56+
var aType = findElement2.topVar('a').type;
57+
var bType = findElement2.topVar('b').type;
5858
// flatten(A) = A and flatten(B) = B, since neither class contains Future
5959
// in its class hierarchy. Even though there is a loop in the class
6060
// hierarchy, flatten() should terminate.
@@ -84,8 +84,8 @@ late B b;
8484
]);
8585
InterfaceType intType = typeProvider.intType;
8686
InterfaceType numType = typeProvider.numType;
87-
var aType = findElement.topVar('a').type;
88-
var bType = findElement.topVar('b').type;
87+
var aType = findElement2.topVar('a').type;
88+
var bType = findElement2.topVar('b').type;
8989
// The code in flatten() that inhibits infinite recursion shouldn't be
9090
// fooled by the fact that Derived appears twice in the type hierarchy.
9191
expect(_flatten(aType), intType);
@@ -110,8 +110,8 @@ late B b;
110110
]);
111111
InterfaceType intType = typeProvider.intType;
112112
InterfaceType numType = typeProvider.numType;
113-
var aType = findElement.topVar('a').type;
114-
var bType = findElement.topVar('b').type;
113+
var aType = findElement2.topVar('a').type;
114+
var bType = findElement2.topVar('b').type;
115115
expect(_flatten(aType), intType);
116116
expect(_flatten(bType), numType);
117117
}
@@ -163,8 +163,8 @@ late B b;
163163
error(CompileTimeErrorCode.INCONSISTENT_INHERITANCE, 112, 1),
164164
error(CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS, 148, 11),
165165
]);
166-
var aType = findElement.topVar('a').type;
167-
var bType = findElement.topVar('b').type;
166+
var aType = findElement2.topVar('a').type;
167+
var bType = findElement2.topVar('b').type;
168168
// flatten(A) = A and flatten(B) = B, since neither string nor int is more
169169
// specific than the other.
170170
expect(_flatten(aType), intType);
@@ -187,7 +187,7 @@ class A {
187187
class B extends A {}
188188
late B b;
189189
''');
190-
var bType = findElement.topVar('b').type;
190+
var bType = findElement2.topVar('b').type;
191191
expect(findNode.as_('this as B').staticType, bType);
192192
}
193193

@@ -263,7 +263,7 @@ class C {
263263
test() => new C.m();
264264
late C c;
265265
''');
266-
var cType = findElement.topVar('c').type;
266+
var cType = findElement2.topVar('c').type;
267267
expect(findNode.instanceCreation('new C.m()').staticType, cType);
268268
}
269269

@@ -274,7 +274,7 @@ class I {}
274274
test() => new C<I>();
275275
late I i;
276276
''');
277-
var iType = findElement.topVar('i').type;
277+
var iType = findElement2.topVar('i').type;
278278
InterfaceType type =
279279
findNode.instanceCreation('new C<I>()').staticType as InterfaceType;
280280
List<DartType> typeArgs = type.typeArguments;
@@ -288,7 +288,7 @@ class C {}
288288
test() => new C();
289289
late C c;
290290
''');
291-
var cType = findElement.topVar('c').type;
291+
var cType = findElement2.topVar('c').type;
292292
expect(findNode.instanceCreation('new C()').staticType, cType);
293293
}
294294

@@ -373,7 +373,7 @@ class B extends A {
373373
}
374374
late B b;
375375
''');
376-
var bType = findElement.topVar('b').type;
376+
var bType = findElement2.topVar('b').type;
377377
expect(findNode.super_('super').staticType, bType);
378378
}
379379

@@ -393,7 +393,7 @@ class B extends A {
393393
}
394394
late B b;
395395
''');
396-
var bType = findElement.topVar('b').type;
396+
var bType = findElement2.topVar('b').type;
397397
expect(findNode.this_('this').staticType, bType);
398398
}
399399

0 commit comments

Comments
 (0)