Fix regression for import suggestions

pkg/analysis_server/test/analysis_abstract.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.domain.analysis.abstract;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
@@ skipping 46 matching lines @@
       <GeneralAnalysisService>[];
   final Map<AnalysisService, List<String>> analysisSubscriptions = {};
 
   String projectPath = '/project';
   String testFolder = '/project/bin';
   String testFile = '/project/bin/test.dart';
   String testCode;
 
   AbstractAnalysisTest();
 
+  AnalysisDomainHandler get analysisHandler => server.handlers
+      .singleWhere((handler) => handler is AnalysisDomainHandler);
+
   void addAnalysisSubscription(AnalysisService service, String file) {
     // add file to subscription
     var files = analysisSubscriptions[service];
     if (files == null) {
       files = <String>[];
       analysisSubscriptions[service] = files;
     }
     files.add(file);
     // set subscriptions
     Request request = new AnalysisSetSubscriptionsParams(analysisSubscriptions)
@@ skipping 59 matching lines @@
     return null;
   }
 
   /**
    * Creates a project `/project`.
    */
   void createProject() {
     resourceProvider.newFolder(projectPath);
     Request request =
         new AnalysisSetAnalysisRootsParams([projectPath], []).toRequest('0');
-    handleSuccessfulRequest(request);
+    handleSuccessfulRequest(request, handler: analysisHandler);
   }
 
   /**
    * Returns the offset of [search] in [testCode].
    * Fails if not found.
    */
   int findFileOffset(String path, String search) {
     File file = resourceProvider.getResource(path) as File;
     String code = file.createSource().contents.data;
     int offset = code.indexOf(search);
     expect(offset, isNot(-1), reason: '"$search" in\n$code');
     return offset;
   }
 
   /**
    * Returns the offset of [search] in [testCode].
    * Fails if not found.
    */
   int findOffset(String search) {
     int offset = testCode.indexOf(search);
     expect(offset, isNot(-1));
     return offset;
   }
 
   /**
    * Validates that the given [request] is handled successfully.
    */
-  Response handleSuccessfulRequest(Request request) {
+  Response handleSuccessfulRequest(Request request, {RequestHandler handler}) {
+    handler ??= this.handler;
     Response response = handler.handleRequest(request);
     expect(response, isResponseSuccess(request.id));
     return response;
   }
 
   String modifyTestFile(String content) {
     addFile(testFile, content);
     this.testCode = content;
     return testFile;
   }
@@ skipping 11 matching lines @@
         .toRequest('0');
     handleSuccessfulRequest(request);
   }
 
   void setUp() {
     serverChannel = new MockServerChannel();
     resourceProvider = new MemoryResourceProvider();
     packageMapProvider = new MockPackageMapProvider();
     Index index = createIndex();
     server = createAnalysisServer(index);
-    handler = server.handlers
-        .singleWhere((handler) => handler is AnalysisDomainHandler);
+    handler = analysisHandler;
     // listen for notifications
     Stream<Notification> notificationStream =
         serverChannel.notificationController.stream;
     notificationStream.listen((Notification notification) {
       processNotification(notification);
     });
   }
 
   void tearDown() {
     server.done();
@@ skipping 11 matching lines @@
   }
 
   /**
    * Completes with a successful [Response] for the given [request].
    * Otherwise fails.
    */
   Future<Response> waitResponse(Request request) async {
     return serverChannel.sendRequest(request);
   }
 }