improve code completion abort request tests

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/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart';
@@ skipping 266 matching lines @@
 
   test_imports_aborted_new_request() async {
     addTestFile('''
         class foo { }
         c^''');
 
     // Make a request for suggestions
     Request request1 =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('7');
-    Response response1 = await waitResponse(request1);
-    var result1 = new CompletionGetSuggestionsResult.fromResponse(response1);
-    var completionId1 = result1.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));
+    Future<Response> responseFuture1 = waitResponse(request1);
 
     // Make another request before the first request completes
     Request request2 =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('8');
-    Response response2 = await waitResponse(request2);
+    Future<Response> responseFuture2 = waitResponse(request2);
+
+    // Await first response
+    Response response1 = await responseFuture1;
+    var result1 = new CompletionGetSuggestionsResult.fromResponse(response1);
+    assertValidId(result1.id);
+
+    // Await second response
+    Response response2 = await responseFuture2;
     var result2 = new CompletionGetSuggestionsResult.fromResponse(response2);
-    var completionId2 = result2.id;
-    assertValidId(completionId2);
+    assertValidId(result2.id);
 
-    // Wait for both sets of suggestions
-    completionId = completionId2;
+    // Wait for all processing to be complete
+    await analysisHandler.server.analysisDriverScheduler.waitForIdle();
     await pumpEventQueue();
-    expect(allSuggestions[completionId1], hasLength(0));
-    expect(allSuggestions[completionId2], same(suggestions));
+
+    // Assert that first request has been aborted
+    expect(allSuggestions[result1.id], hasLength(0));
+
+    // Assert valid results for the second request
+    expect(allSuggestions[result2.id], same(suggestions));
     assertHasResult(CompletionSuggestionKind.KEYWORD, 'class',
         relevance: DART_RELEVANCE_HIGH);
   }
 
   @failingTest
   test_imports_aborted_source_changed() async {
     // TODO(brianwilkerson) Figure out whether this test makes sense when
     // running the new driver. It waits for an initial empty notification then
     // waits for a new notification. But I think that under the driver we only
     // ever send one notification.
     addTestFile('''
         class foo { }
         c^''');
 
     // Make a request for suggestions
     Request request =
         new CompletionGetSuggestionsParams(testFile, completionOffset)
             .toRequest('0');
-    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));
+    Future<Response> responseFuture = waitResponse(request);
 
     // Simulate user deleting text after request but before suggestions returned
     server.updateContent('uc1', {testFile: new AddContentOverlay(testCode)});
     server.updateContent('uc2', {
       testFile: new ChangeContentOverlay(
           [new SourceEdit(completionOffset - 1, 1, '')])
     });
 
-    // Expect the completion domain to discard request because source changed
-    await pumpEventQueue().then((_) {
-      expect(suggestionsDone, isTrue);
-    });
+    // Await a response
+    Response response = await responseFuture;
+    completionId = response.id;
+    assertValidId(completionId);
+
+    // Wait for all processing to be complete
+    await analysisHandler.server.analysisDriverScheduler.waitForIdle();
+    await pumpEventQueue();
+
+    // Assert that request has been aborted
+    expect(suggestionsDone, isTrue);
     expect(suggestions, hasLength(0));
   }
 
   test_imports_incremental() async {
     addTestFile('''library foo;
       e^
       import "dart:async";
       import "package:foo/foo.dart";
       class foo { }''');
     await waitForTasksFinished();
@@ skipping 418 matching lines @@
 
   @override
   Future sort(
       CompletionRequest request, Iterable<CompletionSuggestion> suggestions) {
     if (!enabled) {
       throw 'unexpected sort';
     }
     return new Future.value();
   }
 }