Completion with the new analysis driver.

pkg/analysis_server/test/domain_completion_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.domain.completion;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/domain_completion.dart';
@@ skipping 105 matching lines @@
       assertNoResult('test');
     });
   }
 
   test_imports_aborted_new_request() async {
     addTestFile('''
         class foo { }
         c^''');
 
     // Make a request for suggestions
-    Request request =
+    Request request1 =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('7');
-    Response response = handleSuccessfulRequest(request);
-    var result1 = new CompletionGetSuggestionsResult.fromResponse(response);
+    Response response1 = await waitResponse(request1);
+    var result1 = new CompletionGetSuggestionsResult.fromResponse(response1);
     var completionId1 = result1.id;
-    assertValidId(response.id);
+    assertValidId(completionId1);
 
     // Perform some analysis but assert that no suggestions have yet been made
     completionId = completionId1;
     await pumpEventQueue(25);
     expect(suggestionsDone, isFalse);
     expect(suggestions, hasLength(0));
 
     // Make another request before the first request completes
     Request request2 =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('8');
-    Response response2 = handleSuccessfulRequest(request2);
+    Response response2 = await waitResponse(request2);
     var result2 = new CompletionGetSuggestionsResult.fromResponse(response2);
     var completionId2 = result2.id;
     assertValidId(completionId2);
 
     // Wait for both sets of suggestions
     completionId = completionId2;
     await pumpEventQueue();
     expect(allSuggestions[completionId1], hasLength(0));
     expect(allSuggestions[completionId2], same(suggestions));
     assertHasResult(CompletionSuggestionKind.KEYWORD, 'class',
         relevance: DART_RELEVANCE_HIGH);
   }
 
   test_imports_aborted_source_changed() async {
     addTestFile('''
         class foo { }
         c^''');
 
     // Make a request for suggestions
     Request request =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('0');
-    Response response = handleSuccessfulRequest(request);
+    Response response = await waitResponse(request);
     completionId = response.id;
     assertValidId(completionId);
 
     // Perform some analysis but assert that no suggestions have yet been made
     await pumpEventQueue(25);
     expect(suggestionsDone, isFalse);
     expect(suggestions, hasLength(0));
 
     // Simulate user deleting text after request but before suggestions returned
     server.updateContent('uc1', {testFile: new AddContentOverlay(testCode)});
@@ skipping 42 matching lines @@
     // Wait for analysis then edit the content
     await waitForTasksFinished();
     String revisedContent = testCode.substring(0, completionOffset) +
         'i' +
         testCode.substring(completionOffset);
     ++completionOffset;
     server.handleRequest(new AnalysisUpdateContentParams(
         {testFile: new AddContentOverlay(revisedContent)}).toRequest('add1'));
 
     // Request code completion immediately after edit
-    Response response = handleSuccessfulRequest(
+    Response response = await waitResponse(
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('0'));
     completionId = response.id;
     assertValidId(completionId);
     await waitForTasksFinished();
     expect(replacementOffset, completionOffset - 1);
     expect(replacementLength, 1);
     assertHasResult(CompletionSuggestionKind.KEYWORD, 'library',
         relevance: DART_RELEVANCE_HIGH);
     assertHasResult(CompletionSuggestionKind.KEYWORD, 'import \'\';',
@@ skipping 218 matching lines @@
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'a',
           relevance: DART_RELEVANCE_LOCAL_FIELD);
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'b',
           relevance: DART_RELEVANCE_LOCAL_VARIABLE);
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'x',
           relevance: DART_RELEVANCE_LOCAL_METHOD);
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'DateTime');
     });
   }
 
-  test_offset_past_eof() {
+  test_offset_past_eof() async {
     addTestFile('main() { }', offset: 300);
     Request request =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('0');
-    Response response = handler.handleRequest(request);
+    Response response = await waitResponse(request);
     expect(response.id, '0');
     expect(response.error.code, RequestErrorCode.INVALID_PARAMETER);
   }
 
   test_overrides() {
     addFile('/libA.dart', 'class A {m() {}}');
     addTestFile('''
 import '/libA.dart';
 class B extends A {m() {^}}
 ''');
@@ skipping 121 matching lines @@
 }
     ''');
     await waitForTasksFinished();
     Request request =
         new CompletionGetSuggestionsParams(testFile, 0).toRequest('0');
     Response response = handler.handleRequest(request);
     expect(response.error, isNotNull);
     expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED);
   }
 }