Extract unresolved AST parsing (PARSED_UNIT1) from full parsing, which includes UriBasedDirective(s…

pkg/analyzer/test/src/context/context_test.dart

 // Copyright (c) 2014, 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.src.context.context_test;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 137 matching lines @@
     CacheEntry entry = context.getCacheEntry(source);
     expect(entry.explicitlyAdded, isFalse);
     // add the source
     ChangeSet changeSet = new ChangeSet();
     changeSet.addedSource(source);
     context.applyChanges(changeSet);
     // now the entry is explicit
     expect(entry.explicitlyAdded, isTrue);
   }
 
+  void test_applyChanges_addNewImport_invalidateLibraryCycle() {
+    context.analysisOptions =
+        new AnalysisOptionsImpl.from(context.analysisOptions)
+          ..strongMode = true;
+    Source embedder = addSource(
+        '/a.dart',
+        r'''
+library a;
+import 'b.dart';
+//import 'c.dart';
+''');
+    addSource(
+        '/b.dart',
+        r'''
+library b;
+import 'a.dart';
+''');
+    addSource(
+        '/c.dart',
+        r'''
+library c;
+import 'b.dart';
+''');
+    _performPendingAnalysisTasks();
+    // Add a new import into a.dart, this should invalidate its library cycle.
+    // If it doesn't, we will get a task cycle exception.
+    context.setContents(
+        embedder,
+        r'''
+library a;
+import 'b.dart';
+import 'c.dart';
+''');
+    _performPendingAnalysisTasks();
+    expect(context.getCacheEntry(embedder).exception, isNull);
+  }
+
   Future test_applyChanges_change() {
     SourcesChangedListener listener = new SourcesChangedListener();
     context.onSourcesChanged.listen(listener.onData);
     expect(context.sourcesNeedingProcessing, isEmpty);
     Source source = newSource('/test.dart');
     ChangeSet changeSet1 = new ChangeSet();
     changeSet1.addedSource(source);
     context.applyChanges(changeSet1);
     expect(context.sourcesNeedingProcessing, contains(source));
     Source source2 = newSource('/test2.dart');
@@ skipping 312 matching lines @@
     // The reason is that a.dart adds dependencies on (not existing) b.dart
     // results in cache.
     // Now a.dart does not have errors.
     addSource('/b.dart', codeB);
     expect(getErrorsState(a), CacheState.INVALID);
     _performPendingAnalysisTasks();
     expect(getErrorsState(a), CacheState.VALID);
     expect(context.getErrors(a).errors, hasLength(0));
   }
 
-  void test_applyChanges_addNewImport_invalidateLibraryCycle() {
-    context.analysisOptions =
-        new AnalysisOptionsImpl.from(context.analysisOptions)
-          ..strongMode = true;
-    Source embedder = addSource(
-        '/a.dart',
-        r'''
-library a;
-import 'b.dart';
-//import 'c.dart';
-''');
-    addSource(
-        '/b.dart',
-        r'''
-library b;
-import 'a.dart';
-''');
-    addSource(
-        '/c.dart',
-        r'''
-library c;
-import 'b.dart';
-''');
-    _performPendingAnalysisTasks();
-    // Add a new import into a.dart, this should invalidate its library cycle.
-    // If it doesn't, we will get a task cycle exception.
-    context.setContents(
-        embedder,
-        r'''
-library a;
-import 'b.dart';
-import 'c.dart';
-''');
-    _performPendingAnalysisTasks();
-    expect(context.getCacheEntry(embedder).exception, isNull);
-  }
-
   void test_cacheConsistencyValidator_computed_deleted() {
     CacheConsistencyValidator validator = context.cacheConsistencyValidator;
     var stat = PerformanceStatistics.cacheConsistencyValidationStatistics;
     stat.reset();
     // Add sources.
     MemoryResourceProvider resourceProvider = new MemoryResourceProvider();
     String path1 = '/test1.dart';
     String path2 = '/test2.dart';
     Source source1 = resourceProvider.newFile(path1, '// 1-1').createSource();
     Source source2 = resourceProvider.newFile(path2, '// 2-1').createSource();
@@ skipping 1755 matching lines @@
     Set<String> libraryElementUris = new Set<String>();
     Set<String> parsedUnitUris = new Set<String>();
     Set<String> resolvedUnitUris = new Set<String>();
     // listen
     context.onResultChanged(LIBRARY_ELEMENT).listen((event) {
       expect(event.wasComputed, isTrue);
       expect(event.wasInvalidated, isFalse);
       Source librarySource = event.target;
       libraryElementUris.add(librarySource.uri.toString());
     });
-    context.onResultChanged(PARSED_UNIT).listen((event) {
+    context.onResultChanged(PARSED_UNIT1).listen((event) {
       expect(event.wasComputed, isTrue);
       expect(event.wasInvalidated, isFalse);
       Source source = event.target;
       parsedUnitUris.add(source.uri.toString());
     });
     context.onResultChanged(RESOLVED_UNIT).listen((event) {
       expect(event.wasComputed, isTrue);
       expect(event.wasInvalidated, isFalse);
       LibrarySpecificUnit target = event.target;
       Source librarySource = target.library;
@@ skipping 1430 matching lines @@
 ''');
     _performPendingAnalysisTasks();
     Expression find42() {
       CompilationUnit unit =
           context.getResult(new LibrarySpecificUnit(a, a), RESOLVED_UNIT);
       ExpressionStatement statement =
           AstFinder.getStatementsInTopLevelFunction(unit, 'main').single;
       MethodInvocation invocation = statement.expression;
       return invocation.argumentList.arguments[0];
     }
+
     {
       Expression argument = find42();
       expect(argument.staticParameterElement, isNull);
       expect(argument.propagatedParameterElement, isNotNull);
     }
     // Update a.dart: add type annotation for 'a'.
     // '42' has 'staticParameterElement', but not 'propagatedParameterElement'.
     context.setContents(
         a,
         r'''
@@ skipping 1213 matching lines @@
     _assertValidUnits(unit, null);
     _assertUnitValidTaskResults(unit, ResolveUnitTypeNamesTask.DESCRIPTOR);
     _assertUnitValidTaskResults(unit, ResolveUnitTask.DESCRIPTOR);
     _assertValidTaskResults(unit, ResolveLibraryReferencesTask.DESCRIPTOR);
     _assertValidTaskResults(unit, ResolveLibraryTask.DESCRIPTOR);
   }
 
   void _assertValidForAnyLibrary(Source source) {
     // Source results.
     _assertValidTaskResults(source, ScanDartTask.DESCRIPTOR);
+    _assertValidTaskResults(source, ParseDartTask.DESCRIPTOR);
+    _assertValidTaskResults(source, ResolveDirectivesTask.DESCRIPTOR);
     // Library results.
     _assertValidTaskResults(source, BuildLibraryElementTask.DESCRIPTOR);
     _assertValidTaskResults(source, BuildDirectiveElementsTask.DESCRIPTOR);
     _assertValidTaskResults(source, BuildSourceExportClosureTask.DESCRIPTOR);
     _assertValidTaskResults(source, ReadyLibraryElement2Task.DESCRIPTOR);
     _assertValidTaskResults(source, ComputeLibraryCycleTask.DESCRIPTOR);
     // Unit results.
     _assertUnitValidTaskResults(
         source, BuildCompilationUnitElementTask.DESCRIPTOR);
     _assertUnitValidTaskResults(
@@ skipping 185 matching lines @@
    * Initialize the visitor.
    */
   _ElementGatherer();
 
   @override
   void visitElement(Element element) {
     elements[element] = element;
     super.visitElement(element);
   }
 }