Elements. Migrate many analyzer resolution tests.

Change-Id: Ied261a783756c5954d4363c4298201b8fc25e560
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/396381
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

pkg/analyzer/analyzer_use_new_elements.txt

@@ -238,25 +238,9 @@ test/src/dart/element/type_references_any_test.dart
 test/src/dart/element/type_visitor_test.dart
 test/src/dart/element/upper_lower_bound_test.dart
 test/src/dart/micro/simple_file_resolver_test.dart
-test/src/dart/resolution/ast_rewrite_test.dart
-test/src/dart/resolution/class_alias_test.dart
-test/src/dart/resolution/class_test.dart
-test/src/dart/resolution/comment_test.dart
 test/src/dart/resolution/constant_test.dart
 test/src/dart/resolution/context_collection_resolution.dart
-test/src/dart/resolution/enum_test.dart
-test/src/dart/resolution/field_test.dart
-test/src/dart/resolution/for_element_test.dart
-test/src/dart/resolution/function_body_test.dart
-test/src/dart/resolution/function_declaration_test.dart
-test/src/dart/resolution/generic_function_type_test.dart
 test/src/dart/resolution/generic_type_alias_test.dart
-test/src/dart/resolution/instance_member_inference_class_test.dart
-test/src/dart/resolution/instance_member_inference_mixin_test.dart
-test/src/dart/resolution/library_element_test.dart
-test/src/dart/resolution/library_export_test.dart
-test/src/dart/resolution/library_import_prefix_test.dart
-test/src/dart/resolution/local_function_test.dart
 test/src/dart/resolution/local_variable_test.dart
 test/src/dart/resolution/metadata_test.dart
 test/src/dart/resolution/prefix_element_test.dart

pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart

@@ -719,8 +719,21 @@ f(A a) {
 }
 ''');
 
-    var invocation = findNode.methodInvocation('foo();');
-    assertElement(invocation, findElement.method('foo'));
+    var node = findNode.methodInvocation('foo();');
+    assertResolvedNodeText(node, r'''
+MethodInvocation
+  operator: ..
+  methodName: SimpleIdentifier
+    token: foo
+    staticElement: <testLibraryFragment>::@class::A::@method::foo
+    element: <testLibraryFragment>::@class::A::@method::foo#element
+    staticType: void Function()
+  argumentList: ArgumentList
+    leftParenthesis: (
+    rightParenthesis: )
+  staticInvokeType: void Function()
+  staticType: void
+''');
   }
 
   test_targetNull_class() async {
@@ -1427,8 +1440,31 @@ f() {
 }
 ''');
 
-    var invocation = findNode.methodInvocation('foo(0);');
-    assertElement(invocation, findElement.method('foo'));
+    var node = findNode.methodInvocation('foo(0);');
+    assertResolvedNodeText(node, r'''
+MethodInvocation
+  target: SimpleIdentifier
+    token: A
+    staticElement: <testLibraryFragment>::@class::A
+    element: <testLibrary>::@class::A
+    staticType: null
+  operator: .
+  methodName: SimpleIdentifier
+    token: foo
+    staticElement: <testLibraryFragment>::@class::A::@method::foo
+    element: <testLibraryFragment>::@class::A::@method::foo#element
+    staticType: void Function(int)
+  argumentList: ArgumentList
+    leftParenthesis: (
+    arguments
+      IntegerLiteral
+        literal: 0
+        parameter: <testLibraryFragment>::@class::A::@method::foo::@parameter::a
+        staticType: int
+    rightParenthesis: )
+  staticInvokeType: void Function(int)
+  staticType: void
+''');
   }
 
   test_targetSimpleIdentifier_prefix_class() async {
@@ -1686,8 +1722,26 @@ void g() {
 }
 ''');
 
-    var identifier = findNode.constructorReference('C.new');
-    assertElement(identifier, findElement.unnamedConstructor('C'));
+    var node = findNode.constructorReference('C.new');
+    assertResolvedNodeText(node, r'''
+ConstructorReference
+  constructorName: ConstructorName
+    type: NamedType
+      name: C
+      element: <testLibraryFragment>::@class::C
+      element2: <testLibrary>::@class::C
+      type: null
+    period: .
+    name: SimpleIdentifier
+      token: new
+      staticElement: <testLibraryFragment>::@class::C::@constructor::new
+      element: <testLibraryFragment>::@class::C::@constructor::new#element
+      staticType: null
+    staticElement: <testLibraryFragment>::@class::C::@constructor::new
+    element: <testLibraryFragment>::@class::C::@constructor::new#element
+  parameter: <testLibraryFragment>::@setter::f::@parameter::_f
+  staticType: C Function()
+''');
   }
 
   // TODO(srawlins): Complete tests of all cases of rewriting (or not) a

pkg/analyzer/test/src/dart/resolution/class_alias_test.dart

@@ -73,7 +73,7 @@ class X = Function with A;
       error(
           CompileTimeErrorCode.FINAL_CLASS_EXTENDED_OUTSIDE_OF_LIBRARY, 27, 8),
     ]);
-    var x = findElement.class_('X');
+    var x = findElement2.class_('X');
     assertType(x.supertype, 'Object');
   }
 
@@ -86,7 +86,7 @@ class X = Object with A implements A, Function, B;
       error(CompileTimeErrorCode.FINAL_CLASS_IMPLEMENTED_OUTSIDE_OF_LIBRARY, 66,
           8),
     ]);
-    var x = findElement.class_('X');
+    var x = findElement2.class_('X');
     assertElementTypes(x.interfaces, ['A', 'B']);
   }
 
@@ -98,7 +98,7 @@ class X = Object with A, Function, B;
 ''', [
       error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 59, 8),
     ]);
-    var x = findElement.class_('X');
+    var x = findElement2.class_('X');
     assertElementTypes(x.mixins, ['A', 'B']);
   }
 

pkg/analyzer/test/src/dart/resolution/class_test.dart

@@ -31,23 +31,23 @@ class X5 extends A with B, C implements D, E {}
 ''');
 
     assertElementTypes(
-      findElement.class_('X1').allSupertypes,
+      findElement2.class_('X1').allSupertypes,
       ['Object', 'A'],
     );
     assertElementTypes(
-      findElement.class_('X2').allSupertypes,
+      findElement2.class_('X2').allSupertypes,
       ['Object', 'B'],
     );
     assertElementTypes(
-      findElement.class_('X3').allSupertypes,
+      findElement2.class_('X3').allSupertypes,
       ['Object', 'A', 'B'],
     );
     assertElementTypes(
-      findElement.class_('X4').allSupertypes,
+      findElement2.class_('X4').allSupertypes,
       ['Object', 'A', 'B', 'C'],
     );
     assertElementTypes(
-      findElement.class_('X5').allSupertypes,
+      findElement2.class_('X5').allSupertypes,
       ['Object', 'A', 'B', 'C', 'D', 'E'],
     );
   }
@@ -64,15 +64,15 @@ class X3 extends C<double> {}
 ''');
 
     assertElementTypes(
-      findElement.class_('X1').allSupertypes,
+      findElement2.class_('X1').allSupertypes,
       ['Object', 'A<String>'],
     );
     assertElementTypes(
-      findElement.class_('X2').allSupertypes,
+      findElement2.class_('X2').allSupertypes,
       ['Object', 'B<String, List<int>>'],
     );
     assertElementTypes(
-      findElement.class_('X3').allSupertypes,
+      findElement2.class_('X3').allSupertypes,
       ['Object', 'B<int, double>', 'C<double>'],
     );
   }
@@ -91,7 +91,7 @@ class X extends A {}
     ]);
 
     assertElementTypes(
-      findElement.class_('X').allSupertypes,
+      findElement2.class_('X').allSupertypes,
       ['A', 'B', 'C'],
     );
   }
@@ -103,7 +103,7 @@ class A extends Function {}
       error(
           CompileTimeErrorCode.FINAL_CLASS_EXTENDED_OUTSIDE_OF_LIBRARY, 16, 8),
     ]);
-    var a = findElement.class_('A');
+    var a = findElement2.class_('A');
     assertType(a.supertype, 'Object');
   }
 
@@ -114,7 +114,7 @@ class A extends Function {}
 ''', [
       error(WarningCode.DEPRECATED_EXTENDS_FUNCTION, 32, 8),
     ]);
-    var a = findElement.class_('A');
+    var a = findElement2.class_('A');
     assertType(a.supertype, 'Object');
   }
 
@@ -128,7 +128,7 @@ class C extends Object with A, Function, B {}
     ]);
 
     assertElementTypes(
-      findElement.class_('C').mixins,
+      findElement2.class_('C').mixins,
       ['A', 'B'],
     );
   }
@@ -144,7 +144,7 @@ class C extends Object with A, Function, B {}
     ]);
 
     assertElementTypes(
-      findElement.class_('C').mixins,
+      findElement2.class_('C').mixins,
       ['A', 'B'],
     );
   }

pkg/analyzer/test/src/dart/resolution/comment_test.dart

@@ -1639,10 +1639,14 @@ CommentReference
 foo(int p) {}
 ''');
 
-    assertElement(
-      findNode.simple('p]'),
-      findElement.parameter('p'),
-    );
+    var node = findNode.simple('p]');
+    assertResolvedNodeText(node, r'''
+SimpleIdentifier
+  token: p
+  staticElement: <testLibraryFragment>::@function::foo::@parameter::p
+  element: <testLibraryFragment>::@function::foo::@parameter::p#element
+  staticType: null
+''');
   }
 
   test_beforeFunction_expressionBody() async {
@@ -1717,7 +1721,14 @@ CommentReference
 get g => null;
 ''');
 
-    assertElement(findNode.simple('int]'), intElement);
+    var node = findNode.simple('int]');
+    assertResolvedNodeText(node, r'''
+SimpleIdentifier
+  token: int
+  staticElement: dart:core::<fragment>::@class::int
+  element: dart:core::@class::int
+  staticType: null
+''');
   }
 
   test_beforeMethod() async {

pkg/analyzer/test/src/dart/resolution/enum_test.dart

@@ -398,7 +398,7 @@ enum E2 {a, b}
 var v = [E1.a, E2.b];
 ''');
 
-    var v = findElement.topVar('v');
+    var v = findElement2.topVar('v');
     assertType(v.type, 'List<Enum>');
   }
 
@@ -430,10 +430,10 @@ enum E {
 }
 ''');
 
-    expect(findElement.field('a').isEnumConstant, isTrue);
-    expect(findElement.field('b').isEnumConstant, isTrue);
+    expect(findElement2.field('a').isEnumConstant, isTrue);
+    expect(findElement2.field('b').isEnumConstant, isTrue);
 
-    expect(findElement.field('values').isEnumConstant, isFalse);
+    expect(findElement2.field('values').isEnumConstant, isFalse);
   }
 
   test_method() async {

pkg/analyzer/test/src/dart/resolution/field_test.dart

@@ -223,10 +223,10 @@ class A {
   var f = 0;
 }
 ''');
-    var getter = findElement.getter('f');
+    var getter = findElement2.getter('f');
     expect(getter.session, result.session);
 
-    var setter = findElement.setter('f');
+    var setter = findElement2.setter('f');
     expect(setter.session, result.session);
   }
 
@@ -236,7 +236,7 @@ class A {
   var f = 0;
 }
 ''');
-    assertType(findElement.field('f').type, 'int');
+    assertType(findElement2.field('f').type, 'int');
   }
 
   test_type_inferred_Never() async {
@@ -245,7 +245,7 @@ class A {
   var f = throw 42;
 }
 ''');
-    assertType(findElement.field('f').type, 'Never');
+    assertType(findElement2.field('f').type, 'Never');
   }
 
   test_type_inferred_noInitializer() async {
@@ -254,7 +254,7 @@ class A {
   var f;
 }
 ''');
-    assertType(findElement.field('f').type, 'dynamic');
+    assertType(findElement2.field('f').type, 'dynamic');
   }
 
   test_type_inferred_null() async {
@@ -263,7 +263,7 @@ class A {
   var f = null;
 }
 ''');
-    assertType(findElement.field('f').type, 'dynamic');
+    assertType(findElement2.field('f').type, 'dynamic');
   }
 
   test_type_scope() async {