Build LIBRARY_ELEMENT after RESOLVED_UNIT6 for all units in the closure of a library.

pkg/analyzer/test/src/task/dart_test.dart

 // Copyright (c) 2015, 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 test.src.task.dart_test;
 
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/constant.dart';
 import 'package:analyzer/src/generated/element.dart';
@@ skipping 711 matching lines @@
 class B {
   B(int i);
 }
 class M1 {}
 class M2 {}
 
 class C2 = C1 with M2;
 class C1 = B with M1;
 class C3 = B with M2;
 ''');
-    _computeResult(source, LIBRARY_ELEMENT);
+    _computeResult(source, LIBRARY_ELEMENT6);
     expect(task, new isInstanceOf<BuildLibraryConstructorsTask>());
-    LibraryElement libraryElement = outputs[LIBRARY_ELEMENT];
+    LibraryElement libraryElement = outputs[LIBRARY_ELEMENT6];
     // C1
     {
       ClassElement classElement = libraryElement.getType('C2');
       List<ConstructorElement> constructors = classElement.constructors;
       expect(constructors, hasLength(1));
       expect(constructors[0].parameters, hasLength(1));
     }
     // C3
     {
       ClassElement classElement = libraryElement.getType('C3');
@@ skipping 1639 matching lines @@
 ''');
     LibrarySpecificUnit target = new LibrarySpecificUnit(source, source);
     // prepare unit and "a.m()" invocation
     _computeResult(target, RESOLVED_UNIT6);
     CompilationUnit unit = outputs[RESOLVED_UNIT6];
     // walk the AST
     FunctionDeclaration function = unit.declarations[1];
     BlockFunctionBody body = function.functionExpression.body;
     ExpressionStatement statement = body.block.statements[0];
     MethodInvocation invocation = statement.expression;
-    expect(task, new isInstanceOf<ResolveReferencesTask>());
+    expect(task, new isInstanceOf<ResolveUnitReferencesTask>());
     expect(unit, same(outputs[RESOLVED_UNIT6]));
     // a.m() is resolved now
     expect(invocation.methodName.staticElement, isNotNull);
   }
 
   test_perform_errors() {
     Source source = newSource('/test.dart', '''
 class A {
 }
 main(A a) {
   a.unknownMethod();
 }
 ''');
     LibrarySpecificUnit target = new LibrarySpecificUnit(source, source);
     _computeResult(target, RESOLVED_UNIT6);
-    expect(task, new isInstanceOf<ResolveReferencesTask>());
+    expect(task, new isInstanceOf<ResolveUnitReferencesTask>());
     // validate
     _fillErrorListener(RESOLVE_REFERENCES_ERRORS);
     errorListener.assertErrorsWithCodes(
         <ErrorCode>[StaticTypeWarningCode.UNDEFINED_METHOD]);
   }
 
   test_perform_importExport() {
     newSource('/a.dart', '''
 library a;
 class A<T> {
   T m() {}
 }
 ''');
     newSource('/b.dart', '''
 library b;
 export 'a.dart';
 ''');
     Source sourceC = newSource('/c.dart', '''
 library c;
 import 'b.dart';
 main() {
   new A<int>().m();
 }
 ''');
     _computeResult(new LibrarySpecificUnit(sourceC, sourceC), RESOLVED_UNIT6);
-    expect(task, new isInstanceOf<ResolveReferencesTask>());
+    expect(task, new isInstanceOf<ResolveUnitReferencesTask>());
     // validate
     CompilationUnit unit = outputs[RESOLVED_UNIT6];
     expect(unit, isNotNull);
     {
       FunctionDeclaration functionDeclaration = unit.declarations[0];
       BlockFunctionBody body = functionDeclaration.functionExpression.body;
       List<Statement> statements = body.block.statements;
       ExpressionStatement statement = statements[0];
       MethodInvocation invocation = statement.expression;
       MethodElement methodElement = invocation.methodName.staticElement;
@@ skipping 60 matching lines @@
   }
 
   test_perform_buildClosureLibraryElements() {
     Source source = newSource('/test.dart', '''
 main() {
 }
 ''');
     LibrarySpecificUnit target = new LibrarySpecificUnit(source, source);
     _computeResult(target, RESOLVED_UNIT5);
     expect(task, new isInstanceOf<ResolveVariableReferencesTask>());
-    // dart:core LIBRARY_ELEMENT is built
-    expect(analysisCache.getState(
-        context.sourceFactory.resolveUri(null, 'dart:core'),
-        LIBRARY_ELEMENT), CacheState.VALID);
   }
 
   test_perform_local() {
     Source source = newSource('/test.dart', '''
 main() {
   var v1 = 1;
   var v2 = 1;
   var v3 = 1;
   var v4 = 1;
   v2 = 2;
@@ skipping 186 matching lines @@
   /**
    * Fill [errorListener] with [result] errors in the current [task].
    */
   void _fillErrorListener(ResultDescriptor<List<AnalysisError>> result) {
     List<AnalysisError> errors = task.outputs[result];
     expect(errors, isNotNull, reason: result.name);
     errorListener = new GatheringErrorListener();
     errorListener.addAll(errors);
   }
 }