Prepare for decoupling analyzer ASTs from element model.

pkg/analyzer/test/generated/element_resolver_test.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.test.generated.element_resolver_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/resolution_accessors.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/generated/element_resolver.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/source.dart';
@@ skipping 24 matching lines @@
 class A {
   const A.named();
 }
 ''');
     _validateAnnotation('', '@A.named()', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<ClassElement>());
-      expect(name1.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name1).displayName, 'A');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<ConstructorElement>());
-      expect(name2.staticElement.displayName, 'named');
+      expect(staticElementForIdentifier(name2).displayName, 'named');
       expect(name3, isNull);
       if (annotationElement is ConstructorElement) {
         expect(annotationElement, same(name2.staticElement));
         expect(annotationElement.enclosingElement, name1.staticElement);
         expect(annotationElement.displayName, 'named');
         expect(annotationElement.parameters, isEmpty);
       } else {
         fail('Expected "annotationElement" is ConstructorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_class_prefixed_namedConstructor() {
     addNamedSource(
         '/a.dart',
         r'''
 class A {
   const A.named();
 }
 ''');
     _validateAnnotation('as p', '@p.A.named()', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<PrefixElement>());
-      expect(name1.staticElement.displayName, 'p');
+      expect(staticElementForIdentifier(name1).displayName, 'p');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<ClassElement>());
-      expect(name2.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name2).displayName, 'A');
       expect(name3, isNotNull);
       expect(name3.staticElement, new isInstanceOf<ConstructorElement>());
-      expect(name3.staticElement.displayName, 'named');
+      expect(staticElementForIdentifier(name3).displayName, 'named');
       if (annotationElement is ConstructorElement) {
         expect(annotationElement, same(name3.staticElement));
         expect(annotationElement.enclosingElement, name2.staticElement);
         expect(annotationElement.displayName, 'named');
         expect(annotationElement.parameters, isEmpty);
       } else {
         fail('Expected "annotationElement" is ConstructorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_class_prefixed_staticConstField() {
     addNamedSource(
         '/a.dart',
         r'''
 class A {
   static const V = 0;
 }
 ''');
     _validateAnnotation('as p', '@p.A.V', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<PrefixElement>());
-      expect(name1.staticElement.displayName, 'p');
+      expect(staticElementForIdentifier(name1).displayName, 'p');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<ClassElement>());
-      expect(name2.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name2).displayName, 'A');
       expect(name3, isNotNull);
       expect(name3.staticElement, new isInstanceOf<PropertyAccessorElement>());
-      expect(name3.staticElement.displayName, 'V');
+      expect(staticElementForIdentifier(name3).displayName, 'V');
       if (annotationElement is PropertyAccessorElement) {
         expect(annotationElement, same(name3.staticElement));
         expect(annotationElement.enclosingElement, name2.staticElement);
         expect(annotationElement.displayName, 'V');
       } else {
         fail('Expected "annotationElement" is PropertyAccessorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_class_prefixed_unnamedConstructor() {
     addNamedSource(
         '/a.dart',
         r'''
 class A {
   const A();
 }
 ''');
     _validateAnnotation('as p', '@p.A', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<PrefixElement>());
-      expect(name1.staticElement.displayName, 'p');
+      expect(staticElementForIdentifier(name1).displayName, 'p');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<ClassElement>());
-      expect(name2.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name2).displayName, 'A');
       expect(name3, isNull);
       if (annotationElement is ConstructorElement) {
         expect(annotationElement.enclosingElement, name2.staticElement);
         expect(annotationElement.displayName, '');
         expect(annotationElement.parameters, isEmpty);
       } else {
         fail('Expected "annotationElement" is ConstructorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_class_staticConstField() {
     addNamedSource(
         '/a.dart',
         r'''
 class A {
   static const V = 0;
 }
 ''');
     _validateAnnotation('', '@A.V', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<ClassElement>());
-      expect(name1.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name1).displayName, 'A');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<PropertyAccessorElement>());
-      expect(name2.staticElement.displayName, 'V');
+      expect(staticElementForIdentifier(name2).displayName, 'V');
       expect(name3, isNull);
       if (annotationElement is PropertyAccessorElement) {
         expect(annotationElement, same(name2.staticElement));
         expect(annotationElement.enclosingElement, name1.staticElement);
         expect(annotationElement.displayName, 'V');
       } else {
         fail('Expected "annotationElement" is PropertyAccessorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_class_unnamedConstructor() {
     addNamedSource(
         '/a.dart',
         r'''
 class A {
   const A();
 }
 ''');
     _validateAnnotation('', '@A', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<ClassElement>());
-      expect(name1.staticElement.displayName, 'A');
+      expect(staticElementForIdentifier(name1).displayName, 'A');
       expect(name2, isNull);
       expect(name3, isNull);
       if (annotationElement is ConstructorElement) {
         expect(annotationElement.enclosingElement, name1.staticElement);
         expect(annotationElement.displayName, '');
         expect(annotationElement.parameters, isEmpty);
       } else {
         fail('Expected "annotationElement" is ConstructorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_topLevelVariable() {
     addNamedSource(
         '/a.dart',
         r'''
 const V = 0;
 ''');
     _validateAnnotation('', '@V', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<PropertyAccessorElement>());
-      expect(name1.staticElement.displayName, 'V');
+      expect(staticElementForIdentifier(name1).displayName, 'V');
       expect(name2, isNull);
       expect(name3, isNull);
       if (annotationElement is PropertyAccessorElement) {
         expect(annotationElement, same(name1.staticElement));
         expect(annotationElement.enclosingElement,
             new isInstanceOf<CompilationUnitElement>());
         expect(annotationElement.displayName, 'V');
       } else {
         fail('Expected "annotationElement" is PropertyAccessorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
     });
   }
 
   void test_annotation_topLevelVariable_prefixed() {
     addNamedSource(
         '/a.dart',
         r'''
 const V = 0;
 ''');
     _validateAnnotation('as p', '@p.V', (SimpleIdentifier name1,
         SimpleIdentifier name2,
         SimpleIdentifier name3,
         Element annotationElement) {
       expect(name1, isNotNull);
       expect(name1.staticElement, new isInstanceOf<PrefixElement>());
-      expect(name1.staticElement.displayName, 'p');
+      expect(staticElementForIdentifier(name1).displayName, 'p');
       expect(name2, isNotNull);
       expect(name2.staticElement, new isInstanceOf<PropertyAccessorElement>());
-      expect(name2.staticElement.displayName, 'V');
+      expect(staticElementForIdentifier(name2).displayName, 'V');
       expect(name3, isNull);
       if (annotationElement is PropertyAccessorElement) {
         expect(annotationElement, same(name2.staticElement));
         expect(annotationElement.enclosingElement,
             new isInstanceOf<CompilationUnitElement>());
         expect(annotationElement.displayName, 'V');
       } else {
         fail('Expected "annotationElement" is PropertyAccessorElement, '
             'but (${annotationElement?.runtimeType}) $annotationElement found.');
       }
@@ skipping 408 matching lines @@
     ClassElementImpl classA = ElementFactory.classElement2("A");
     classA.fields = <FieldElement>[fieldElement];
     FieldFormalParameter parameter =
         AstTestFactory.fieldFormalParameter2(fieldName);
     FieldFormalParameterElementImpl parameterElement =
         ElementFactory.fieldFormalParameter(parameter.identifier);
     parameterElement.field = fieldElement;
     parameterElement.type = intType;
     parameter.identifier.staticElement = parameterElement;
     _resolveInClass(parameter, classA);
-    expect(parameter.element.type, same(intType));
+    expect(elementForFormalParameter(parameter).type, same(intType));
   }
 
   void test_visitImportDirective_noCombinators_noPrefix() {
     ImportDirective directive = AstTestFactory.importDirective3(null, null);
     directive.element = ElementFactory.importFor(
         ElementFactory.library(_definingLibrary.context, "lib"), null);
     _resolveNode(directive);
     _listener.assertNoErrors();
   }
 
@@ skipping 586 matching lines @@
         innerScope = new LabelScope(
             outerScope, labelElement.name, labelTarget, labelElement);
       }
       _visitor.labelScope = innerScope;
       statement.accept(_resolver);
     } finally {
       _visitor.labelScope = outerScope;
     }
   }
 }