Cache flushing implementation for the task model.

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

Index: pkg/analyzer/test/src/context/context_test.dart
diff --git a/pkg/analyzer/test/src/context/context_test.dart b/pkg/analyzer/test/src/context/context_test.dart
index a4764b8e47661802f9977852b4af9085e49764a7..932c245154d36c930524d32227acec6bf61de2c5 100644
--- a/pkg/analyzer/test/src/context/context_test.dart
+++ b/pkg/analyzer/test/src/context/context_test.dart
@@ -23,6 +23,7 @@ import 'package:analyzer/src/generated/engine.dart'
         AnalysisOptions,
         AnalysisOptionsImpl,
         AnalysisResult,
+        CacheState,
         ChangeNotice,
         ChangeSet,
         IncrementalAnalysisCache,
@@ -38,6 +39,7 @@ import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/plugin/engine_plugin.dart';
+import 'package:analyzer/task/dart.dart';
 import 'package:plugin/manager.dart';
 import 'package:unittest/unittest.dart';
 import 'package:watcher/src/utils.dart';
@@ -282,11 +284,6 @@ import 'libB.dart';''';
     expect(_context.computeImportedLibraries(source), hasLength(2));
   }
 
-  void test_computeKindOf_html() {
-    Source source = _addSource("/test.html", "");
-    expect(_context.computeKindOf(source), same(SourceKind.HTML));
-  }
-
   void fail_computeResolvableCompilationUnit_dart_exception() {
     TestSource source = _addSourceWithException("/test.dart");
     try {
@@ -324,8 +321,7 @@ import 'libB.dart';''';
     // Complete all pending analysis tasks and flush the AST so that it won't
     // be available immediately.
     _performPendingAnalysisTasks();
-    CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
-    entry.flushAstStructures();
+    _flushAst(source);
     CancelableFuture<CompilationUnit> future =
         _context.computeResolvedCompilationUnitAsync(source, source);
     bool completed = false;
@@ -512,27 +508,6 @@ class A {
     expect(sources[0], source);
   }
 
-  void test_getKindOf_html() {
-    Source source = _addSource("/test.html", "");
-    expect(_context.getKindOf(source), same(SourceKind.HTML));
-  }
-
-  void test_getLibrariesContaining() {
-    _context = contextWithCore();
-    _sourceFactory = _context.sourceFactory;
-    Source librarySource = _addSource("/lib.dart", r'''
-library lib;
-part 'part.dart';''');
-    Source partSource = _addSource("/part.dart", "part of lib;");
-    _context.computeLibraryElement(librarySource);
-    List<Source> result = _context.getLibrariesContaining(librarySource);
-    expect(result, hasLength(1));
-    expect(result[0], librarySource);
-    result = _context.getLibrariesContaining(partSource);
-    expect(result, hasLength(1));
-    expect(result[0], librarySource);
-  }
-
   void fail_getLibrariesReferencedFromHtml() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
@@ -1117,6 +1092,19 @@ library test2;''');
     _context.analysisOptions = options;
   }
 
+  void test_applyChanges_change_flush_element() {
+    _context = contextWithCore();
+    _sourceFactory = _context.sourceFactory;
+    Source librarySource = _addSource("/lib.dart", r'''
+library lib;
+int a = 0;''');
+    expect(_context.computeLibraryElement(librarySource), isNotNull);
+    _context.setContents(librarySource, r'''
+library lib;
+int aa = 0;''');
+    expect(_context.getLibraryElement(librarySource), isNull);
+  }
+
   @override
   void tearDown() {
     _context = null;
@@ -1186,19 +1174,6 @@ library test2;''');
     });
   }
 
-  void test_applyChanges_change_flush_element() {
-    _context = contextWithCore();
-    _sourceFactory = _context.sourceFactory;
-    Source librarySource = _addSource("/lib.dart", r'''
-library lib;
-int a = 0;''');
-    expect(_context.computeLibraryElement(librarySource), isNotNull);
-    _context.setContents(librarySource, r'''
-library lib;
-int aa = 0;''');
-    expect(_context.getLibraryElement(librarySource), isNull);
-  }
-
   Future test_applyChanges_change_multiple() {
     _context = contextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
@@ -1346,6 +1321,11 @@ class A {}""");
     expect(_context.computeHtmlElement(source), isNull);
   }
 
+  void test_computeKindOf_html() {
+    Source source = _addSource("/test.html", "");
+    expect(_context.computeKindOf(source), same(SourceKind.HTML));
+  }
+
   void test_computeKindOf_library() {
     Source source = _addSource("/test.dart", "library lib;");
     expect(_context.computeKindOf(source), same(SourceKind.LIBRARY));
@@ -1396,8 +1376,7 @@ main() {}''');
     // Complete all pending analysis tasks and flush the AST so that it won't
     // be available immediately.
     _performPendingAnalysisTasks();
-    CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
-    entry.flushAstStructures();
+    _flushAst(source);
     // Dispose of the context.
     _context.dispose();
     // Any attempt to start an asynchronous computation should return a future
@@ -1515,6 +1494,11 @@ main() {}''');
     expect(result, hasLength(0));
   }
 
+  void test_getKindOf_html() {
+    Source source = _addSource("/test.html", "");
+    expect(_context.getKindOf(source), same(SourceKind.HTML));
+  }
+
   void test_getKindOf_library() {
     Source source = _addSource("/test.dart", "library lib;");
     expect(_context.getKindOf(source), same(SourceKind.UNKNOWN));
@@ -1630,6 +1614,22 @@ main() {}''');
     expect(_context.launchableServerLibrarySources, isEmpty);
   }
 
+  void test_getLibrariesContaining() {
+    _context = contextWithCore();
+    _sourceFactory = _context.sourceFactory;
+    Source librarySource = _addSource("/lib.dart", r'''
+library lib;
+part 'part.dart';''');
+    Source partSource = _addSource("/part.dart", "part of lib;");
+    _context.computeLibraryElement(librarySource);
+    List<Source> result = _context.getLibrariesContaining(librarySource);
+    expect(result, hasLength(1));
+    expect(result[0], librarySource);
+    result = _context.getLibrariesContaining(partSource);
+    expect(result, hasLength(1));
+    expect(result[0], librarySource);
+  }
+
   void test_getLibrariesDependingOn() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
@@ -1860,17 +1860,6 @@ main() {}''');
     expect(errorInfo.errors, hasLength(0));
   }
 
-//  void test_resolveCompilationUnit_sourceChangeDuringResolution() {
-//    _context = new _AnalysisContext_sourceChangeDuringResolution();
-//    AnalysisContextFactory.initContextWithCore(_context);
-//    _sourceFactory = _context.sourceFactory;
-//    Source source = _addSource("/lib.dart", "library lib;");
-//    CompilationUnit compilationUnit =
-//        _context.resolveCompilationUnit2(source, source);
-//    expect(compilationUnit, isNotNull);
-//    expect(_context.getLineInfo(source), isNotNull);
-//  }
-
   void test_parseCompilationUnit_nonExistentSource() {
     Source source =
         new FileBasedSource.con1(FileUtilities2.createFile("/test.dart"));
@@ -1882,6 +1871,17 @@ main() {}''');
     }
   }
 
+//  void test_resolveCompilationUnit_sourceChangeDuringResolution() {
+//    _context = new _AnalysisContext_sourceChangeDuringResolution();
+//    AnalysisContextFactory.initContextWithCore(_context);
+//    _sourceFactory = _context.sourceFactory;
+//    Source source = _addSource("/lib.dart", "library lib;");
+//    CompilationUnit compilationUnit =
+//        _context.resolveCompilationUnit2(source, source);
+//    expect(compilationUnit, isNotNull);
+//    expect(_context.getLineInfo(source), isNotNull);
+//  }
+
   void test_performAnalysisTask_modifiedAfterParse() {
     // TODO(scheglov) no threads in Dart
 //    Source source = _addSource("/test.dart", "library lib;");
@@ -2044,8 +2044,7 @@ int a = 0;''');
     // Complete all pending analysis tasks and flush the AST so that it won't
     // be available immediately.
     _performPendingAnalysisTasks();
-    CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
-    entry.flushAstStructures();
+    _flushAst(source);
     bool completed = false;
     _context
         .computeResolvedCompilationUnitAsync(source, source)
@@ -2068,8 +2067,7 @@ int a = 0;''');
     // Complete all pending analysis tasks and flush the AST so that it won't
     // be available immediately.
     _performPendingAnalysisTasks();
-    CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
-    entry.flushAstStructures();
+    _flushAst(source);
     CancelableFuture<CompilationUnit> future =
         _context.computeResolvedCompilationUnitAsync(source, source);
     bool completed = false;
@@ -2188,6 +2186,11 @@ int a = 0;''');
     return null;
   }
 
+  void _flushAst(Source source) {
+    CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
+    entry.setState(RESOLVED_UNIT, CacheState.FLUSHED);
+  }
+
   IncrementalAnalysisCache _getIncrementalAnalysisCache(
       AnalysisContextImpl context2) {
     return context2.test_incrementalAnalysisCache;