Add ServerOperation and queue.

pkg/analysis_server/test/domain_analysis_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.analysis;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
@@ skipping 65 matching lines @@
           resourceProvider.newFolder('/project');
           resourceProvider.newFile('/project/pubspec.yaml', 'name: project');
           resourceProvider.newFile('/project/bin/test.dart', 'main() {}');
           request.setParameter(
               INCLUDED,
               ['/project']);
           var response = handler.handleRequest(request);
           var serverRef = server;
           expect(response, isResponseSuccess('0'));
           // verify that unit is resolved eventually
-          return waitForServerTasksFinished(server).then((_) {
+          return waitForServerOperationsPerformed(server).then((_) {
             var unit = serverRef.test_getResolvedCompilationUnit('/project/bin/test.dart');
             expect(unit, isNotNull);
           });
         });
       });
     });
 
     test('setPriorityFiles', () {
       var request = new Request('0', METHOD_SET_PRIORITY_FILES);
       request.setParameter(
@@ skipping 113 matching lines @@
     // set subscriptions
     Request request = new Request('0', METHOD_SET_ANALYSIS_SUBSCRIPTIONS);
     request.setParameter(SUBSCRIPTIONS, analysisSubscriptions);
     handleSuccessfulRequest(request);
   }
 
   /**
    * Returns a [Future] that completes when this this helper finished all its
    * scheduled tasks.
    */
-  Future waitForTasksFinished() {
-    return waitForServerTasksFinished(server);
+  Future waitForOperationsFinished() {
+    return waitForServerOperationsPerformed(server);
   }
 
   /**
    * Returns [AnalysisError]s recorded for the given [file].
    * May be empty, but not `null`.
    */
   List<AnalysisError> getErrors(String file) {
     List<AnalysisError> errors = filesErrors[file];
     if (errors != null) {
       return errors;
@@ skipping 23 matching lines @@
 
   /**
    * Returns highlights recorded for the given [testFile].
    * May be empty, but not `null`.
    */
   List<Map<String, Object>> getTestHighlights() {
     return getHighlights(testFile);
   }
 
   /**
-   * Creates an empty project `/project/`.
+   * Creates an empty project `/project`.
    */
   void createEmptyProject() {
     resourceProvider.newFolder('/project');
     Request request = new Request('0', METHOD_SET_ANALYSIS_ROOTS);
     request.setParameter(INCLUDED, ['/project']);
     request.setParameter(EXCLUDED, []);
     handleSuccessfulRequest(request);
   }
 
   /**
@@ skipping 40 matching lines @@
 
 testNotificationErrors() {
   AnalysisTestHelper helper;
 
   setUp(() {
     helper = new AnalysisTestHelper();
   });
 
   test('ParserErrorCode', () {
     helper.createSingleFileProject('library lib');
-    return helper.waitForTasksFinished().then((_) {
+    return helper.waitForOperationsFinished().then((_) {
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, hasLength(1));
       AnalysisError error = errors[0];
       expect(error.file, '/project/bin/test.dart');
       expect(error.errorCode, 'ParserErrorCode.EXPECTED_TOKEN');
       expect(error.offset, isPositive);
       expect(error.length, isNonNegative);
       expect(error.message, isNotNull);
     });
   });
 
   test('StaticWarningCode', () {
     helper.createSingleFileProject([
       'main() {',
       '  print(unknown);',
       '}']);
-    return helper.waitForTasksFinished().then((_) {
+    return helper.waitForOperationsFinished().then((_) {
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, hasLength(1));
       AnalysisError error = errors[0];
       expect(error.errorCode, 'StaticWarningCode.UNDEFINED_IDENTIFIER');
     });
   });
 }
 
 
 class NotificationHighlightHelper extends AnalysisTestHelper {
   List<Map<String, Object>> regions;
 
   Future prepareRegions(then()) {
     addAnalysisSubscriptionHighlight(testFile);
-    return waitForTasksFinished().then((_) {
+    return waitForOperationsFinished().then((_) {
       regions = getTestHighlights();
       then();
     });
   }
 
   void assertHasRawRegion(HighlightType type, int offset, int length) {
     for (Map<String, Object> region in regions) {
       if (region['offset'] == offset && region['length'] == length
           && region['type'] == type.name) {
         return;
@@ skipping 712 matching lines @@
       helper.assertHasRegion(HighlightType.TYPE_PARAMETER, 'T p)');
     });
   });
 }
 
 
 testUpdateContent() {
   test('full content', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     helper.createSingleFileProject('// empty');
-    return helper.waitForTasksFinished().then((_) {
+    return helper.waitForOperationsFinished().then((_) {
       // no errors initially
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, isEmpty);
       // update code
       {
         Request request = new Request('0', METHOD_UPDATE_CONTENT);
         request.setParameter('files',
             {
               helper.testFile : {
                 CONTENT : 'library lib'
               }
             });
         helper.handleSuccessfulRequest(request);
       }
       // wait, there is an error
-      helper.waitForTasksFinished().then((_) {
+      return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 
   test('incremental', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     helper.createSingleFileProject('library A;');
-    return helper.waitForTasksFinished().then((_) {
+    return helper.waitForOperationsFinished().then((_) {
       // no errors initially
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, isEmpty);
       // update code
       {
         Request request = new Request('0', METHOD_UPDATE_CONTENT);
         request.setParameter('files',
             {
               helper.testFile : {
                 CONTENT : 'library lib',
                 OFFSET : 'library '.length,
                 OLD_LENGTH : 'A;'.length,
                 NEW_LENGTH : 'lib'.length,
               }
             });
         helper.handleSuccessfulRequest(request);
       }
       // wait, there is an error
-      helper.waitForTasksFinished().then((_) {
+      return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 }
 
 
 void test_setSubscriptions() {
   test('before analysis', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     // subscribe
     helper.addAnalysisSubscriptionHighlight(helper.testFile);
     // create project
     helper.createSingleFileProject('int V = 42;');
     // wait, there are highlight regions
-    helper.waitForTasksFinished().then((_) {
+    helper.waitForOperationsFinished().then((_) {
       var highlights = helper.getHighlights(helper.testFile);
       expect(highlights, isNot(isEmpty));
     });
   });
 
   test('after analysis', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     // create project
     helper.createSingleFileProject('int V = 42;');
     // wait, no regions initially
-    return helper.waitForTasksFinished().then((_) {
+    return helper.waitForOperationsFinished().then((_) {
       var highlights = helper.getHighlights(helper.testFile);
       expect(highlights, isEmpty);
       // subscribe
       helper.addAnalysisSubscriptionHighlight(helper.testFile);
       // wait, has regions
-      return helper.waitForTasksFinished().then((_) {
+      return helper.waitForOperationsFinished().then((_) {
         var highlights = helper.getHighlights(helper.testFile);
         expect(highlights, isNot(isEmpty));
       });
     });
   });
 }