Remove many explicit references to AnalysisContextImpl and enable testing of the new task model

pkg/analyzer/test/generated/engine_test.dart

Index: pkg/analyzer/test/generated/engine_test.dart
diff --git a/pkg/analyzer/test/generated/engine_test.dart b/pkg/analyzer/test/generated/engine_test.dart
index f6e60396bb42e5bd8a514edf9d012c92279f5f9d..ac36c05fdefad7f175acbf4b790017e272b8463f 100644
--- a/pkg/analyzer/test/generated/engine_test.dart
+++ b/pkg/analyzer/test/generated/engine_test.dart
@@ -311,7 +311,7 @@ class AnalysisContextImplTest extends EngineTestCase {
   }
 
   void test_applyChanges_change_flush_element() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source librarySource = _addSource("/lib.dart", r'''
 library lib;
@@ -324,7 +324,7 @@ int aa = 0;''');
   }
 
   Future test_applyChanges_change_multiple() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
@@ -416,7 +416,7 @@ int b = aa;''';
   }
 
   Future test_applyChanges_remove() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
@@ -452,7 +452,7 @@ import 'libB.dart';''';
   }
 
   Future test_applyChanges_removeContainer() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
@@ -485,7 +485,7 @@ import 'libB.dart';''';
   }
 
   void test_computeDocumentationComment_block() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/** Comment */";
     Source source = _addSource("/test.dart", """
@@ -499,7 +499,7 @@ class A {}""");
   }
 
   void test_computeDocumentationComment_none() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "class A {}");
     LibraryElement libraryElement = _context.computeLibraryElement(source);
@@ -514,7 +514,7 @@ class A {}""");
   }
 
   void test_computeDocumentationComment_singleLine_multiple_EOL_n() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/// line 1\n/// line 2\n/// line 3\n";
     Source source = _addSource("/test.dart", "${comment}class A {}");
@@ -527,7 +527,7 @@ class A {}""");
   }
 
   void test_computeDocumentationComment_singleLine_multiple_EOL_rn() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/// line 1\r\n/// line 2\r\n/// line 3\r\n";
     Source source = _addSource("/test.dart", "${comment}class A {}");
@@ -627,7 +627,7 @@ class A {}""");
   }
 
   void test_computeLibraryElement() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "library lib;");
     LibraryElement element = _context.computeLibraryElement(source);
@@ -685,7 +685,7 @@ main() {}''');
   }
 
   Future test_computeResolvedCompilationUnitAsync() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     // Complete all pending analysis tasks and flush the AST so that it won't
@@ -709,7 +709,7 @@ main() {}''');
   }
 
   Future test_computeResolvedCompilationUnitAsync_afterDispose() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     // Complete all pending analysis tasks and flush the AST so that it won't
@@ -736,7 +736,7 @@ main() {}''');
   }
 
   Future test_computeResolvedCompilationUnitAsync_cancel() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     // Complete all pending analysis tasks and flush the AST so that it won't
@@ -764,7 +764,7 @@ main() {}''');
   }
 
   Future test_computeResolvedCompilationUnitAsync_dispose() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     // Complete all pending analysis tasks and flush the AST so that it won't
@@ -794,7 +794,7 @@ main() {}''');
   }
 
   Future test_computeResolvedCompilationUnitAsync_unrelatedLibrary() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source librarySource = _addSource("/lib.dart", "library lib;");
     Source partSource = _addSource("/part.dart", "part of foo;");
@@ -871,12 +871,12 @@ main() {}''');
   }
 
   void test_getDeclaredVariables() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     expect(_context.declaredVariables, isNotNull);
   }
 
   void test_getElement() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     LibraryElement core =
         _context.computeLibraryElement(_sourceFactory.forUri("dart:core"));
@@ -983,7 +983,7 @@ class A {
   }
 
   void test_getHtmlFilesReferencing_html() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source htmlSource = _addSource("/test.html", r'''
 <html><head>
@@ -1016,7 +1016,7 @@ class A {
   }
 
   void test_getHtmlFilesReferencing_part() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source htmlSource = _addSource("/test.html", r'''
 <html><head>
@@ -1070,7 +1070,7 @@ class A {
   }
 
   void test_getLaunchableClientLibrarySources() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     List<Source> sources = _context.launchableClientLibrarySources;
     expect(sources, hasLength(0));
@@ -1083,7 +1083,7 @@ main() {}''');
   }
 
   void test_getLaunchableServerLibrarySources() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     List<Source> sources = _context.launchableServerLibrarySources;
     expect(sources, hasLength(0));
@@ -1094,7 +1094,7 @@ main() {}''');
   }
 
   void test_getLibrariesContaining() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source librarySource = _addSource("/lib.dart", r'''
 library lib;
@@ -1110,7 +1110,7 @@ part 'part.dart';''');
   }
 
   void test_getLibrariesDependingOn() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source libASource = _addSource("/libA.dart", "library libA;");
     _addSource("/libB.dart", "library libB;");
@@ -1129,7 +1129,7 @@ export 'libA.dart';''');
   }
 
   void test_getLibrariesReferencedFromHtml() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source htmlSource = _addSource("/test.html", r'''
 <html><head>
@@ -1145,7 +1145,7 @@ export 'libA.dart';''');
   }
 
   void test_getLibrariesReferencedFromHtml_no() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source htmlSource = _addSource("/test.html", r'''
 <html><head>
@@ -1158,7 +1158,7 @@ export 'libA.dart';''');
   }
 
   void test_getLibraryElement() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "library lib;");
     LibraryElement element = _context.getLibraryElement(source);
@@ -1212,7 +1212,7 @@ main() {}''');
   }
 
   void test_getPublicNamespace_element() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "class A {}");
     LibraryElement library = _context.computeLibraryElement(source);
@@ -1223,7 +1223,7 @@ main() {}''');
   }
 
   void test_getResolvedCompilationUnit_library() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library libb;");
     LibraryElement library = _context.computeLibraryElement(source);
@@ -1233,14 +1233,14 @@ main() {}''');
   }
 
   void test_getResolvedCompilationUnit_library_null() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     expect(_context.getResolvedCompilationUnit(source, null), isNull);
   }
 
   void test_getResolvedCompilationUnit_source_dart() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     expect(_context.getResolvedCompilationUnit2(source, source), isNull);
@@ -1249,7 +1249,7 @@ main() {}''');
   }
 
   void test_getResolvedCompilationUnit_source_html() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.html", "<html></html>");
     expect(_context.getResolvedCompilationUnit2(source, source), isNull);
@@ -1258,7 +1258,7 @@ main() {}''');
   }
 
   void test_getResolvedHtmlUnit() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.html", "<html></html>");
     expect(_context.getResolvedHtmlUnit(source), isNull);
@@ -1301,7 +1301,7 @@ main() {}''');
   }
 
   void test_isClientLibrary_dart() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", r'''
 import 'dart:html';
@@ -1320,7 +1320,7 @@ main() {}''');
   }
 
   void test_isServerLibrary_dart() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", r'''
 library lib;
@@ -1751,7 +1751,7 @@ void g() { f(null); }''');
   }
 
   void test_resolveCompilationUnit_import_relative() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     Source sourceA =
         _addSource("/libA.dart", "library libA; import 'libB.dart'; class A{}");
     _addSource("/libB.dart", "library libB; class B{}");
@@ -1765,7 +1765,7 @@ void g() { f(null); }''');
   }
 
   void test_resolveCompilationUnit_import_relative_cyclic() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     Source sourceA =
         _addSource("/libA.dart", "library libA; import 'libB.dart'; class A{}");
     _addSource("/libB.dart", "library libB; import 'libA.dart'; class B{}");
@@ -1779,7 +1779,7 @@ void g() { f(null); }''');
   }
 
   void test_resolveCompilationUnit_library() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     LibraryElement library = _context.computeLibraryElement(source);
@@ -1790,7 +1790,7 @@ void g() { f(null); }''');
   }
 
   void test_resolveCompilationUnit_source() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     CompilationUnit compilationUnit =
@@ -1864,7 +1864,7 @@ void g() { f(null); }''');
   Future test_setChangedContents_libraryWithPart() {
     AnalysisOptionsImpl options = new AnalysisOptionsImpl();
     options.incremental = true;
-    _context = AnalysisContextFactory.contextWithCoreAndOptions(options);
+    _context = AnalysisContextFactory.oldContextWithCoreAndOptions(options);
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
@@ -1907,7 +1907,7 @@ int ya = 0;''';
   }
 
   void test_setChangedContents_notResolved() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     AnalysisOptionsImpl options =
         new AnalysisOptionsImpl.from(_context.analysisOptions);
     options.incremental = true;
@@ -1927,7 +1927,7 @@ int ya = 0;''';
   }
 
   Future test_setContents_libraryWithPart() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
@@ -1964,7 +1964,7 @@ int aa = 0;''';
   }
 
   void test_setContents_null() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source librarySource = _addSource("/lib.dart", r'''
 library lib;
@@ -2005,7 +2005,7 @@ int a = 0;''');
   }
 
   void test_unreadableSource() {
-    _context = AnalysisContextFactory.contextWithCore();
+    _context = AnalysisContextFactory.oldContextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source test1 = _addSource("/test1.dart", r'''
 import 'test2.dart';
@@ -2306,8 +2306,7 @@ class AnalysisTask_test_perform_exception extends AnalysisTask {
 @reflectiveTest
 class AnalysisTaskTest extends EngineTestCase {
   void test_perform_exception() {
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     AnalysisTask task = new AnalysisTask_test_perform_exception(context);
     task.perform(new TestTaskVisitor<Object>());
   }
@@ -3884,8 +3883,7 @@ class GetContentTaskTest extends EngineTestCase {
 
   void test_perform_valid() {
     Source source = new TestSource('/test.dart', 'class A {}');
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     GetContentTask task = new GetContentTask(context, source);
     task.perform(new GetContentTaskTestTV_perform_valid(context, source));
   }
@@ -4577,8 +4575,7 @@ class ParseDartTaskTest extends EngineTestCase {
   void test_perform_exception() {
     TestSource source = new TestSource();
     source.generateExceptionOnRead = true;
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ParseDartTask task = new ParseDartTask(context, source, null, null);
     task.perform(new ParseDartTaskTestTV_perform_exception());
   }
@@ -4591,8 +4588,7 @@ export 'lib3.dart';
 part 'part.dart';
 class A {''';
     Source source = new TestSource('/test.dart', content);
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ParseDartTask task = _createParseTask(context, source, content);
     task.perform(new ParseDartTaskTestTV_perform_library(context, source));
   }
@@ -4602,8 +4598,7 @@ class A {''';
 part of lib;
 class B {}''';
     Source source = new TestSource('/test.dart', content);
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ParseDartTask task = _createParseTask(context, source, content);
     task.perform(new ParseDartTaskTestTV_perform_part(context, source));
   }
@@ -4617,8 +4612,7 @@ export '${a}lib3.dart';
 part 'part.dart';
 class A {}''';
     Source source = new TestSource('/test.dart', content);
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ParseDartTask task = _createParseTask(context, source, content);
     task.perform(
         new ParseDartTaskTestTV_perform_validateDirectives(context, source));
@@ -4636,7 +4630,7 @@ class A {}''';
   void test_resolveDirective_exception() {
     GatheringErrorListener listener = new GatheringErrorListener();
     ImportDirective directive = AstFactory.importDirective3('dart:core', null);
-    AnalysisContext context = new AnalysisContextImpl();
+    AnalysisContext context = AnalysisContextFactory.contextWithCore();
     context.sourceFactory = new MockSourceFactory();
     Source source =
         ParseDartTask.resolveDirective(context, null, directive, listener);
@@ -4753,9 +4747,8 @@ class ParseHtmlTaskTest extends EngineTestCase {
 
   ParseHtmlTask parseSource(
       Source source, String contents, TestLogger testLogger) {
-    InternalAnalysisContext context = new AnalysisContextImpl();
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     context.setContents(source, contents);
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
     ParseHtmlTask task = new ParseHtmlTask(context, source, contents);
     Logger oldLogger = AnalysisEngine.instance.logger;
     try {
@@ -4979,8 +4972,7 @@ class ResolveDartLibraryTaskTest extends EngineTestCase {
   void test_perform_exception() {
     TestSource source = new TestSource();
     source.generateExceptionOnRead = true;
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ResolveDartLibraryTask task =
         new ResolveDartLibraryTask(context, source, source);
     task.perform(new ResolveDartLibraryTaskTestTV_perform_exception());
@@ -5154,8 +5146,7 @@ class ResolveHtmlTaskTest extends EngineTestCase {
 
   void test_perform_exception() {
     Source source = new TestSource();
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ResolveHtmlTask task = new ResolveHtmlTask(context, source, 0, null);
     task.perform(new ResolveHtmlTaskTestTV_perform_exception());
   }
@@ -5249,8 +5240,7 @@ class ScanDartTaskTest extends EngineTestCase {
   void test_perform_valid() {
     String content = 'class A {}';
     Source source = new TestSource('test.dart', content);
-    InternalAnalysisContext context = new AnalysisContextImpl();
-    context.sourceFactory = new SourceFactory([new FileUriResolver()]);
+    InternalAnalysisContext context = AnalysisContextFactory.contextWithCore();
     ScanDartTask task = new ScanDartTask(context, source, content);
     task.perform(new ScanDartTaskTestTV_perform_valid(context, source));
   }