Fix the rest of Quick Assist tests with the new analysis driver.

pkg/analysis_server/test/services/correction/assist_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.assist;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
@@ skipping 485 matching lines @@
     testCode = r'''
 part of my_app;
 main() {
   var v = getFutureInt();
 }
 ''';
     // add sources
     Source appSource = addSource('/app.dart', appCode);
     testSource = addSource('/test.dart', testCode);
     // resolve
-    context.resolveCompilationUnit2(appSource, appSource);
-    testUnit = context.resolveCompilationUnit2(testSource, appSource);
-    testUnitElement = testUnit.element;
-    testLibraryElement = testUnitElement.library;
+    if (enableNewAnalysisDriver) {
+      await resolveTestUnit(testCode);
+    } else {
+      context.resolveCompilationUnit2(appSource, appSource);
+      testUnit = context.resolveCompilationUnit2(testSource, appSource);
+      testUnitElement = testUnit.element;
+      testLibraryElement = testUnitElement.library;
+    }
     // prepare the assist
     offset = findOffset('v = ');
     assist = await _assertHasAssist(DartAssistKind.ADD_TYPE_ANNOTATION);
     change = assist.change;
     // verify
     {
       var testFileEdit = change.getFileEdit('/app.dart');
       var resultCode = SourceEdit.applySequence(appCode, testFileEdit.edits);
       expect(
           resultCode,
@@ skipping 2162 matching lines @@
 }
 ''';
     await assertHasAssistAt(
         'is String', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
     await assertHasAssistAt(
         'while (p', DartAssistKind.INTRODUCE_LOCAL_CAST_TYPE, expected);
   }
 
   test_invalidSelection() async {
     await resolveTestUnit('');
-    List<Assist> assists = await computeAssists(plugin, context,
-        resolutionMap.elementDeclaredByCompilationUnit(testUnit).source, -1, 0);
+    offset = -1;
+    length = 0;
+    List<Assist> assists = await _computeAssists();
     expect(assists, isEmpty);
   }
 
   test_invertIfStatement_blocks() async {
     await resolveTestUnit('''
 main() {
   if (true) {
     0;
   } else {
     1;
@@ skipping 1502 matching lines @@
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }
 
 @reflectiveTest
 class AssistProcessorTest_Driver extends AssistProcessorTest {
   @override
   bool get enableNewAnalysisDriver => true;
-
-  @failingTest
-  @override
-  test_addTypeAnnotation_local_OK_addImport_notLibraryUnit() {
-    return super.test_addTypeAnnotation_local_OK_addImport_notLibraryUnit();
-  }
-
-  @failingTest
-  @override
-  test_invalidSelection() {
-    return super.test_invalidSelection();
-  }
 }
 
 class _DartAssistContextForValues implements DartAssistContext {
   @override
   final Source source;
 
   @override
   final int selectionOffset;
 
   @override
   final int selectionLength;
 
   @override
   final AnalysisContext analysisContext;
 
   @override
   final CompilationUnit unit;
 
   _DartAssistContextForValues(this.source, this.selectionOffset,
       this.selectionLength, this.analysisContext, this.unit);
 }