Fix Quick Fix tests that used AnalysisContext.

pkg/analysis_server/test/services/correction/fix_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 test.services.correction.fix;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
@@ skipping 12 matching lines @@
 import 'package:analyzer/src/generated/source.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../../abstract_context.dart';
 import '../../abstract_single_unit.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(FixProcessorTest);
+    defineReflectiveTests(LintFixTest);
     defineReflectiveTests(FixProcessorTest_Driver);
-    defineReflectiveTests(LintFixTest);
+    defineReflectiveTests(LintFixTest_Driver);
   });
 }
 
 typedef bool AnalysisErrorFilter(AnalysisError error);
 
 /**
  * Base class for fix processor tests.
  */
 class BaseFixProcessorTest extends AbstractSingleUnitTest {
   AnalysisErrorFilter errorFilter = (AnalysisError error) {
@@ skipping 92 matching lines @@
 
   void _assertLinkedGroup(LinkedEditGroup group, List<String> expectedStrings,
       [List<LinkedEditSuggestion> expectedSuggestions]) {
     List<Position> expectedPositions = _findResultPositions(expectedStrings);
     expect(group.positions, unorderedEquals(expectedPositions));
     if (expectedSuggestions != null) {
       expect(group.suggestions, unorderedEquals(expectedSuggestions));
     }
   }
 
+  Future<List<AnalysisError>> _computeErrors() async {
+    if (enableNewAnalysisDriver) {
+      return (await driver.getResult(testFile)).errors;
+    } else {
+      return context.computeErrors(testSource);
+    }
+  }
+
   /**
    * Computes fixes for the given [error] in [testUnit].
    */
   Future<List<Fix>> _computeFixes(AnalysisError error) async {
     if (enableNewAnalysisDriver) {
       DartFixContext fixContext = new _DartFixContextImpl(
           provider,
           driver.getTopLevelNameDeclarations,
           resolutionMap.elementDeclaredByCompilationUnit(testUnit).context,
           testUnit,
@@ skipping 12 matching lines @@
    */
   void _configureMyPkg(Map<String, String> pathToCode) {
     pathToCode.forEach((path, code) {
       provider.newFile('$myPkgLibPath/$path', code);
     });
     // configure SourceFactory
     Folder myPkgFolder = provider.getResource(myPkgLibPath);
     UriResolver pkgResolver = new PackageMapUriResolver(provider, {
       'my_pkg': [myPkgFolder]
     });
-    context.sourceFactory = new SourceFactory(
+    SourceFactory sourceFactory = new SourceFactory(
         [AbstractContextTest.SDK_RESOLVER, pkgResolver, resourceResolver]);
+    if (enableNewAnalysisDriver) {
+      driver.configure(sourceFactory: sourceFactory);
+    } else {
+      context.sourceFactory = sourceFactory;
+    }
     // force 'my_pkg' resolution
     addSource(
         '/tmp/other.dart',
         pathToCode.keys
             .map((path) => "import 'package:my_pkg/$path';")
             .join('\n'));
   }
 
   Future<AnalysisError> _findErrorToFix() async {
-    List<AnalysisError> errors;
-    if (enableNewAnalysisDriver) {
-      errors = (await driver.getResult(testFile)).errors;
-    } else {
-      errors = context.computeErrors(testSource);
-    }
+    List<AnalysisError> errors = await _computeErrors();
     if (errorFilter != null) {
       errors = errors.where(errorFilter).toList();
     }
     expect(errors, hasLength(1));
     return errors[0];
   }
 
   List<Position> _findResultPositions(List<String> searchStrings) {
     List<Position> positions = <Position>[];
     for (String search in searchStrings) {
       int offset = resultCode.indexOf(search);
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
-
-  void _performAnalysis() {
-    while (context.performAnalysisTask().hasMoreWork);
-  }
 }
 
 @reflectiveTest
 class FixProcessorTest extends BaseFixProcessorTest {
   test_addFieldFormalParameters_hasRequiredParameter() async {
     await resolveTestUnit('''
 class Test {
   final int a;
   final int b;
   final int c;
@@ skipping 200 matching lines @@
 // Comment first.
 // Comment second.
 
 class A {}
 ''';
     addSource('/part.dart', partCode);
     await resolveTestUnit('''
 library my.lib;
 part 'part.dart';
 ''');
-    _performAnalysis();
+    performAllAnalysisTasks();
     AnalysisError error = await _findErrorToFix();
     fix = await _assertHasFix(DartFixKind.ADD_PART_OF, error);
     change = fix.change;
     // apply to "file"
     List<SourceFileEdit> fileEdits = change.edits;
     expect(fileEdits, hasLength(1));
     SourceFileEdit fileEdit = change.edits[0];
     expect(fileEdit.file, '/part.dart');
     expect(
         SourceEdit.applySequence(partCode, fileEdit.edits),
@@ skipping 35 matching lines @@
     await assertNoFix(DartFixKind.ADD_ASYNC);
   }
 
   test_addSync_blockFunctionBody() async {
     await resolveTestUnit('''
 foo() {}
 main() {
   await foo();
 }
 ''');
-    List<AnalysisError> errors = context.computeErrors(testSource);
+    List<AnalysisError> errors = await _computeErrors();
     expect(errors, hasLength(2));
     errors.sort((a, b) => a.message.compareTo(b.message));
     // No fix for ";".
     {
       AnalysisError error = errors[0];
       expect(error.message, "Expected to find ';'.");
       List<Fix> fixes = await _computeFixes(error);
       expect(fixes, isEmpty);
     }
     // Has fix for "await".
@@ skipping 3317 matching lines @@
   }
 }
 ''');
   }
 
   test_noException_1() async {
     await resolveTestUnit('''
 main(p) {
   p i s Null;
 }''');
-    List<AnalysisError> errors = context.computeErrors(testSource);
+    List<AnalysisError> errors = await _computeErrors();
     for (var error in errors) {
       await _computeFixes(error);
     }
   }
 
   test_nonBoolCondition_addNotNull() async {
     await resolveTestUnit('''
 main(String p) {
   if (p) {
     print(p);
@@ skipping 1555 matching lines @@
   }
 
   @failingTest
   @override
   test_addPartOfDirective() {
     return super.test_addPartOfDirective();
   }
 
   @failingTest
   @override
-  test_addSync_blockFunctionBody() {
-    return super.test_addSync_blockFunctionBody();
-  }
-
-  @failingTest
-  @override
   test_createFile_forPart_inPackageLib() {
     return super.test_createFile_forPart_inPackageLib();
   }
 
   @failingTest
   @override
-  test_importLibraryPackage_preferDirectOverExport() {
-    return super.test_importLibraryPackage_preferDirectOverExport();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryPackage_preferDirectOverExport_src() {
-    return super.test_importLibraryPackage_preferDirectOverExport_src();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryPackage_preferPublicOverPrivate() {
-    return super.test_importLibraryPackage_preferPublicOverPrivate();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_annotation() {
-    return super.test_importLibraryProject_withClass_annotation();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_constInstanceCreation() {
-    return super.test_importLibraryProject_withClass_constInstanceCreation();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_hasOtherLibraryWithPrefix() {
-    return super
-        .test_importLibraryProject_withClass_hasOtherLibraryWithPrefix();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_inParentFolder() {
-    return super.test_importLibraryProject_withClass_inParentFolder();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_inRelativeFolder() {
-    return super.test_importLibraryProject_withClass_inRelativeFolder();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withClass_inSameFolder() {
-    return super.test_importLibraryProject_withClass_inSameFolder();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withFunction() {
-    return super.test_importLibraryProject_withFunction();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withFunction_unresolvedMethod() {
-    return super.test_importLibraryProject_withFunction_unresolvedMethod();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withFunctionTypeAlias() {
-    return super.test_importLibraryProject_withFunctionTypeAlias();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryProject_withTopLevelVariable() {
-    return super.test_importLibraryProject_withTopLevelVariable();
-  }
-
-  @failingTest
-  @override
-  test_importLibrarySdk_withClass_itemOfList() {
-    return super.test_importLibrarySdk_withClass_itemOfList();
-  }
-
-  @failingTest
-  @override
-  test_importLibrarySdk_withTopLevelVariable() {
-    return super.test_importLibrarySdk_withTopLevelVariable();
-  }
-
-  @failingTest
-  @override
-  test_importLibrarySdk_withTopLevelVariable_annotation() {
-    return super.test_importLibrarySdk_withTopLevelVariable_annotation();
-  }
-
-  @failingTest
-  @override
-  test_importLibraryShow_project() {
-    return super.test_importLibraryShow_project();
-  }
-
-  @failingTest
-  @override
-  test_noException_1() {
-    return super.test_noException_1();
-  }
-
-  @failingTest
-  @override
   test_replaceImportUri_inProject() {
     return super.test_replaceImportUri_inProject();
   }
 
   @failingTest
   @override
   test_replaceImportUri_package() {
     return super.test_replaceImportUri_package();
   }
 }
@@ skipping 219 matching lines @@
   print('v: $v');
 }
 ''');
   }
 
   void verifyResult(String expectedResult) {
     expect(resultCode, expectedResult);
   }
 }
 
+@reflectiveTest
+class LintFixTest_Driver extends LintFixTest {
+  @override
+  bool get enableNewAnalysisDriver => true;
+}
+
 class _DartFixContextImpl implements DartFixContext {
   @override
   final ResourceProvider resourceProvider;
 
   @override
   final GetTopLevelDeclarations getTopLevelDeclarations;
 
   @override
   final AnalysisContext analysisContext;
 
   @override
   final CompilationUnit unit;
 
   @override
   final AnalysisError error;
 
   _DartFixContextImpl(this.resourceProvider, this.getTopLevelDeclarations,
       this.analysisContext, this.unit, this.error);
 }