Adjust server for API changes

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/computer/computer_highlights.dart';
 import 'package:analysis_server/src/analysis_server.dart';
@@ skipping 21 matching lines @@
     handler = new AnalysisDomainHandler(server);
   });
 
   group('notification.errors', testNotificationErrors);
   group('notification.highlights', testNotificationHighlights);
   group('notification.navigation', testNotificationNavigation);
   group('updateContent', testUpdateContent);
   group('setSubscriptions', test_setSubscriptions);
 
   group('AnalysisDomainHandler', () {
-    test('getFixes', () {
-      var request = new Request('0', METHOD_GET_FIXES);
-      request.setParameter(ERRORS, []);
-      var response = handler.handleRequest(request);
-      // TODO(scheglov) implement
-      expect(response, isNull);
-    });
-
-    test('getMinorRefactorings', () {
-      var request = new Request('0', METHOD_GET_MINOR_REFACTORINGS);
-      request.setParameter(FILE, 'test.dart');
-      request.setParameter(OFFSET, 10);
-      request.setParameter(LENGTH, 20);
-      var response = handler.handleRequest(request);
-      // TODO(scheglov) implement
-      expect(response, isNull);
-    });
-
     group('setAnalysisRoots', () {
       Request request;
 
       setUp(() {
-        request = new Request('0', METHOD_SET_ANALYSIS_ROOTS);
+        request = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
         request.setParameter(INCLUDED, []);
         request.setParameter(EXCLUDED, []);
       });
 
       test('excluded', () {
         request.setParameter(EXCLUDED, ['foo']);
         // TODO(scheglov) implement
         var response = handler.handleRequest(request);
         expect(response, isResponseFailure('0'));
       });
@@ skipping 12 matching lines @@
           // verify that unit is resolved eventually
           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);
+      var request = new Request('0', ANALYSIS_SET_PRIORITY_FILES);
       request.setParameter(
           FILES,
           ['projectA/aa.dart', 'projectB/ba.dart']);
       var response = handler.handleRequest(request);
       // TODO(scheglov) implement
       expect(response, isNull);
     });
 
     test('updateOptions', () {
-      var request = new Request('0', METHOD_UPDATE_OPTIONS);
+      var request = new Request('0', ANALYSIS_UPDATE_OPTIONS);
       request.setParameter(
           OPTIONS,
           {
             'analyzeAngular' : true,
             'enableDeferredLoading': true,
             'enableEnums': false
           });
       var response = handler.handleRequest(request);
       // TODO(scheglov) implement
       expect(response, isNull);
     });
 
     test('updateSdks', () {
-      var request = new Request('0', METHOD_UPDATE_SDKS);
+      var request = new Request('0', ANALYSIS_UPDATE_SDKS);
       request.setParameter(
           ADDED,
           ['/dart/sdk-1.3', '/dart/sdk-1.4']);
       request.setParameter(
           REMOVED,
           ['/dart/sdk-1.2']);
       request.setParameter(DEFAULT, '/dart/sdk-1.4');
       var response = handler.handleRequest(request);
       // TODO(scheglov) implement
       expect(response, isNull);
@@ skipping 51 matching lines @@
 
   AnalysisTestHelper() {
     serverChannel = new MockServerChannel();
     resourceProvider = new MemoryResourceProvider();
     server = new AnalysisServer(serverChannel, resourceProvider);
     server.defaultSdk = new MockSdk();
     handler = new AnalysisDomainHandler(server);
     // listen for notifications
     Stream<Notification> notificationStream = serverChannel.notificationController.stream;
     notificationStream.listen((Notification notification) {
-      if (notification.event == NOTIFICATION_ERRORS) {
+      if (notification.event == ANALYSIS_ERRORS) {
         String file = notification.getParameter(FILE);
         List<Map<String, Object>> errorMaps = notification.getParameter(ERRORS);
         filesErrors[file] = errorMaps.map(jsonToAnalysisError).toList();
       }
-      if (notification.event == NOTIFICATION_HIGHLIGHTS) {
+      if (notification.event == ANALYSIS_HIGHLIGHTS) {
         String file = notification.getParameter(FILE);
         filesHighlights[file] = notification.getParameter(REGIONS);
       }
-      if (notification.event == NOTIFICATION_NAVIGATION) {
+      if (notification.event == ANALYSIS_NAVIGATION) {
         String file = notification.getParameter(FILE);
         filesNavigation[file] = notification.getParameter(REGIONS);
       }
     });
   }
 
   void addAnalysisSubscriptionHighlights(String file) {
     addAnalysisSubscription(AnalysisService.HIGHLIGHTS, file);
   }
 
   void addAnalysisSubscriptionNavigation(String file) {
     addAnalysisSubscription(AnalysisService.NAVIGATION, file);
   }
 
   void addAnalysisSubscription(AnalysisService service, String file) {
     // add file to subscription
     var files = analysisSubscriptions[service.name];
     if (files == null) {
       files = <String>[];
       analysisSubscriptions[service.name] = files;
     }
     files.add(file);
     // set subscriptions
-    Request request = new Request('0', METHOD_SET_ANALYSIS_SUBSCRIPTIONS);
+    Request request = new Request('0', ANALYSIS_SET_SUBSCRIPTIONS);
     request.setParameter(SUBSCRIPTIONS, analysisSubscriptions);
     handleSuccessfulRequest(request);
   }
 
   /**
    * Returns a [Future] that completes when this this helper finished all its
    * scheduled tasks.
    */
   Future waitForOperationsFinished() {
     return waitForServerOperationsPerformed(server);
@@ skipping 67 matching lines @@
    */
   List<Map<String, Object>> getTestNavigation() {
     return getNavigation(testFile);
   }
 
   /**
    * Creates an empty project `/project`.
    */
   void createEmptyProject() {
     resourceProvider.newFolder('/project');
-    Request request = new Request('0', METHOD_SET_ANALYSIS_ROOTS);
+    Request request = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
     request.setParameter(INCLUDED, ['/project']);
     request.setParameter(EXCLUDED, []);
     handleSuccessfulRequest(request);
   }
 
   /**
    * Creates a project with a single Dart file `/project/bin/test.dart` with
    * the given [code].
    */
   void createSingleFileProject(code) {
     this.testCode = _getCodeString(code);
     resourceProvider.newFolder('/project');
     resourceProvider.newFile(testFile, testCode);
-    Request request = new Request('0', METHOD_SET_ANALYSIS_ROOTS);
+    Request request = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
     request.setParameter(INCLUDED, ['/project']);
     request.setParameter(EXCLUDED, []);
     handleSuccessfulRequest(request);
   }
 
   String setFileContent(String path, String content) {
     resourceProvider.newFile(path, content);
     return path;
   }
 
   /**
    * Validates that the given [request] is handled successfully.
    */
   void handleSuccessfulRequest(Request request) {
     Response response = handler.handleRequest(request);
     expect(response, isResponseSuccess('0'));
   }
 
   /**
    * Stops the associated server.
    */
   void stopServer() {
     server.done();
   }
 
   /**
    * Send an `updateContent` request for [testFile].
    */
   void sendContentChange(Map contentChange) {
-    Request request = new Request('0', METHOD_UPDATE_CONTENT);
+    Request request = new Request('0', ANALYSIS_UPDATE_CONTENT);
     request.setParameter('files', {
       testFile: contentChange
     });
     handleSuccessfulRequest(request);
   }
 
   static String _getCodeString(code) {
     if (code is List<String>) {
       code = code.join('\n');
     }
@@ skipping 1291 matching lines @@
       // subscribe
       helper.addAnalysisSubscriptionHighlights(helper.testFile);
       // wait, has regions
       return helper.waitForOperationsFinished().then((_) {
         var highlights = helper.getHighlights(helper.testFile);
         expect(highlights, isNot(isEmpty));
       });
     });
   });
 }