Wait for analysis in search domain. Rewrite with async/await.

pkg/analysis_server/test/search/abstract_search_domain.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.search.abstract_search_domain;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/search/search_domain.dart';
 import 'package:analysis_server/src/services/index/index.dart' show Index;
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
 import 'package:unittest/unittest.dart';
 
 import '../analysis_abstract.dart';
 
 
 class AbstractSearchDomainTest extends AbstractAnalysisTest {
+  final Map<String, _ResultSet> resultSets = {};
   String searchId;
-  bool searchDone = false;
   List<SearchResult> results = <SearchResult>[];
   SearchResult result;
 
   void assertHasResult(SearchResultKind kind, String search, [int length]) {
     int offset = findOffset(search);
     if (length == null) {
       length = findIdentifierLength(search);
     }
     findResult(kind, testFile, offset, length, true);
   }
@@ skipping 36 matching lines @@
   String getPathString(List<Element> path) {
     return path.map((Element element) {
       return '${element.kind.name} ${element.name}';
     }).join('\n');
   }
 
   @override
   void processNotification(Notification notification) {
     if (notification.event == SEARCH_RESULTS) {
       var params = new SearchResultsParams.fromNotification(notification);
-      if (params.id == searchId) {
-        results.addAll(params.results);
-        searchDone = params.isLast;
+      String id = params.id;
+      _ResultSet resultSet = resultSets[id];
+      if (resultSet == null) {
+        resultSet = new _ResultSet(id);
+        resultSets[id] = resultSet;
       }
+      resultSet.results.addAll(params.results);
+      resultSet.done = params.isLast;
     }
   }
 
   @override
   void setUp() {
     super.setUp();
+    server.handlers = [new SearchDomainHandler(server),];
     createProject();
-    handler = new SearchDomainHandler(server);
   }
 
   Future waitForSearchResults() {
-    if (searchDone) {
+    _ResultSet resultSet = resultSets[searchId];
+    if (resultSet != null && resultSet.done) {
+      results = resultSet.results;
       return new Future.value();
     }
     return new Future.delayed(Duration.ZERO, waitForSearchResults);
   }
 }
+
+
+class _ResultSet {
+  final String id;
+  final List<SearchResult> results = <SearchResult>[];
+  bool done = false;
+
+  _ResultSet(this.id);
+}