Use generated classes to create requests in analysis server unit tests.

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';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analysis_server/src/protocol.dart';
-import 'package:analysis_server/src/protocol2.dart' show AnalysisService,
-    AnalysisError, AnalysisErrorsParams;
+import 'package:analysis_server/src/protocol2.dart';
 import 'package:analysis_testing/mock_sdk.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
 
 import 'analysis_abstract.dart';
 import 'mocks.dart';
 
 
@@ skipping 17 matching lines @@
         null,
         new MockSdk());
     handler = new AnalysisDomainHandler(server);
   });
 
   group('updateContent', testUpdateContent);
   group('setSubscriptions', test_setSubscriptions);
 
   group('AnalysisDomainHandler', () {
     group('setAnalysisRoots', () {
-      Request request;
-
-      setUp(() {
-        request = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
-        request.setParameter(INCLUDED, []);
-        request.setParameter(EXCLUDED, []);
-      });
+      Response testSetAnalysisRoots(List<String> included,
+          List<String> excluded) {
+        Request request = new AnalysisSetAnalysisRootsParams(included,
+            excluded).toRequest('0');
+        return handler.handleRequest(request);
+      }
 
       group('excluded', () {
         test('excluded folder', () {
           String project = '/project';
           String fileA = '/project/aaa/a.dart';
           String fileB = '/project/bbb/b.dart';
           resourceProvider.newFolder(project);
           resourceProvider.newFile(fileA, '// a');
           resourceProvider.newFile(fileB, '// b');
-          request.setParameter(INCLUDED, [project]);
-          request.setParameter(EXCLUDED, ['/project/bbb']);
-          var response = handler.handleRequest(request);
+          var response = testSetAnalysisRoots([project], ['/project/bbb']);
           var serverRef = server;
           expect(response, isResponseSuccess('0'));
           // unit "a" is resolved eventually
           // unit "b" is not resolved
           return waitForServerOperationsPerformed(server).then((_) {
             expect(serverRef.test_getResolvedCompilationUnit(fileA), isNotNull);
             expect(serverRef.test_getResolvedCompilationUnit(fileB), isNull);
           });
         });
       });
 
       group('included', () {
         test('new folder', () {
           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 response = testSetAnalysisRoots(['/project'], []);
           var serverRef = server;
           expect(response, isResponseSuccess('0'));
           // verify that unit is resolved eventually
           return waitForServerOperationsPerformed(server).then((_) {
             var unit =
                 serverRef.test_getResolvedCompilationUnit('/project/bin/test.dart');
             expect(unit, isNotNull);
           });
         });
       });
     });
 
     group('setPriorityFiles', () {
       test('invalid', () {
-        var request = new Request('0', ANALYSIS_SET_PRIORITY_FILES);
-        request.setParameter(FILES, ['/project/lib.dart']);
+        // TODO(paulberry): under the "eventual consistency" model this request
+        // should not be invalid.
+        var request = new AnalysisSetPriorityFilesParams(
+            ['/project/lib.dart']).toRequest('0');
         var response = handler.handleRequest(request);
         expect(response, isResponseFailure('0'));
       });
 
       test('valid', () {
         resourceProvider.newFolder('/p1');
         resourceProvider.newFile('/p1/a.dart', 'library a;');
         resourceProvider.newFolder('/p2');
         resourceProvider.newFile('/p2/b.dart', 'library b;');
         resourceProvider.newFile('/p2/c.dart', 'library c;');
 
-        var setRootsRequest = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
-        setRootsRequest.setParameter(INCLUDED, ['/p1', '/p2']);
-        setRootsRequest.setParameter(EXCLUDED, []);
+        var setRootsRequest = new AnalysisSetAnalysisRootsParams(
+            ['/p1', '/p2'], []).toRequest('0');
         var setRootsResponse = handler.handleRequest(setRootsRequest);
         expect(setRootsResponse, isResponseSuccess('0'));
 
         void setPriorityFiles(List<String> fileList) {
-          var request = new Request('0', ANALYSIS_SET_PRIORITY_FILES);
-          request.setParameter(FILES, fileList);
+          var request = new AnalysisSetPriorityFilesParams(
+              fileList).toRequest('0');
           var response = handler.handleRequest(request);
           expect(response, isResponseSuccess('0'));
           // TODO(brianwilkerson) Enable the line below after getPriorityFiles
           // has been implemented.
           // expect(server.getPriorityFiles(), unorderedEquals(fileList));
         }
 
         setPriorityFiles(['/p1/a.dart', '/p2/b.dart']);
         setPriorityFiles(['/p2/b.dart', '/p2/c.dart']);
         setPriorityFiles([]);
       });
     });
 
     group('updateOptions', () {
       test('invalid', () {
-        var request = new Request('0', ANALYSIS_UPDATE_OPTIONS);
-        request.setParameter(OPTIONS, {
+        var request = new Request('0', ANALYSIS_UPDATE_OPTIONS, {OPTIONS: {
           'not-an-option': true
-        });
+        }});
         var response = handler.handleRequest(request);
         // Invalid options should be silently ignored.
         expect(response, isResponseSuccess('0'));
       });
 
       // TODO(paulberry): disabled because analyzeAngular is currently not in the API.
 //      test('valid', () {
-//        AnalysisOptions options = server.contextDirectoryManager.defaultOptions;
-//        bool analyzeAngular = !options.analyzeAngular;
-//        bool enableDeferredLoading = options.enableDeferredLoading;
-//        var request = new Request('0', ANALYSIS_UPDATE_OPTIONS);
-//        request.setParameter(OPTIONS, {
-//          'analyzeAngular': analyzeAngular,
-//          'enableDeferredLoading': enableDeferredLoading,
-//          'enableEnums': false
-//        });
+//        engine.AnalysisOptions oldOptions = server.contextDirectoryManager.defaultOptions;
+//        bool analyzeAngular = !oldOptions.analyzeAngular;
+//        bool enableDeferredLoading = oldOptions.enableDeferredLoading;
+//        var newOptions = new AnalysisOptions(analyzeAngular: analyzeAngular,
+//            enableDeferredLoading: enableDeferredLoading, enableEnums: false);
+//        var request = new AnalysisUpdateOptionsParams(newOptions).toRequest('0');
 //        var response = handler.handleRequest(request);
 //        expect(response, isResponseSuccess('0'));
-//        expect(options.analyzeAngular, equals(analyzeAngular));
-//        expect(options.enableDeferredLoading, equals(enableDeferredLoading));
+//        expect(oldOptions.analyzeAngular, equals(analyzeAngular));
+//        expect(oldOptions.enableDeferredLoading, equals(enableDeferredLoading));
 //      });
     });
   });
 }
 
 
 testUpdateContent() {
   test('bad type', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     helper.createSingleFileProject('// empty');
     return helper.waitForOperationsFinished().then((_) {
-      Request request = new Request('0', ANALYSIS_UPDATE_CONTENT);
-      request.setParameter('files', {
-        helper.testFile: {
-          TYPE: 'foo',
+      Request request = new Request('0', ANALYSIS_UPDATE_CONTENT, {
+        'files': {
+          helper.testFile: {
+            TYPE: 'foo',
+          }
         }
       });
       Response response = helper.handler.handleRequest(request);
       expect(response, isResponseFailure('0'));
     });
   });
 
   test('full content', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     helper.createSingleFileProject('// empty');
     return helper.waitForOperationsFinished().then((_) {
       // no errors initially
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, isEmpty);
       // update code
-      helper.sendContentChange({
-        TYPE: ADD,
-        CONTENT: 'library lib'
-      });
+      helper.sendContentChange(new AddContentOverlay('library lib'));
       // wait, there is an error
       return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 
   test('incremental', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     String initialContent = 'library A;';
     helper.createSingleFileProject(initialContent);
     return helper.waitForOperationsFinished().then((_) {
       // no errors initially
       List<AnalysisError> errors = helper.getTestErrors();
       expect(errors, isEmpty);
       // Add the file to the cache
-      helper.sendContentChange({
-        TYPE: ADD,
-        CONTENT: initialContent
-      });
+      helper.sendContentChange(new AddContentOverlay(initialContent));
       // update code
-      helper.sendContentChange({
-        TYPE: CHANGE,
-        EDITS: [{
-            REPLACEMENT: 'lib',
-            OFFSET: 'library '.length,
-            LENGTH: 'A;'.length
-          }]
-      });
+      helper.sendContentChange(new ChangeContentOverlay([
+          new SourceEdit('library '.length, 'A;'.length, 'lib')]));
       // wait, there is an error
       return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 
   test('change on disk, normal', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
@@ skipping 10 matching lines @@
         });
       });
     });
   });
 
   test('change on disk, during override', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     helper.createSingleFileProject('library A;');
     return helper.waitForOperationsFinished().then((_) {
       // update code
-      helper.sendContentChange({
-        TYPE: ADD,
-        CONTENT: 'library B;'
-      });
+      helper.sendContentChange(new AddContentOverlay('library B;'));
       // There should be no errors
       return helper.waitForOperationsFinished().then((_) {
         expect(helper.getTestErrors(), hasLength(0));
         // Change file on disk, adding a syntax error.
         helper.resourceProvider.modifyFile(helper.testFile, 'library lib');
         // There should still be no errors (file should not have been reread).
         return helper.waitForOperationsFinished().then((_) {
           expect(helper.getTestErrors(), hasLength(0));
           // Send a content change with a null content param--file should be
           // reread from disk.
-          helper.sendContentChange({
-            TYPE: REMOVE
-          });
+          helper.sendContentChange(new RemoveContentOverlay());
           // There should be errors now.
           return helper.waitForOperationsFinished().then((_) {
             expect(helper.getTestErrors(), hasLength(1));
           });
         });
       });
     });
   });
 }
 
@@ skipping 143 matching lines @@
 
 /**
  * A helper to test 'analysis.*' requests.
  */
 class AnalysisTestHelper {
   MockServerChannel serverChannel;
   MemoryResourceProvider resourceProvider;
   AnalysisServer server;
   AnalysisDomainHandler handler;
 
-  Map<String, List<String>> analysisSubscriptions = {};
+  Map<AnalysisService, List<String>> analysisSubscriptions = {};
 
   Map<String, List<AnalysisError>> filesErrors = {};
   Map<String, List<Map<String, Object>>> filesHighlights = {};
   Map<String, List<Map<String, Object>>> filesNavigation = {};
 
   String testFile = '/project/bin/test.dart';
   String testCode;
 
   AnalysisTestHelper() {
     serverChannel = new MockServerChannel();
@@ skipping 19 matching lines @@
       }
       if (notification.event == ANALYSIS_NAVIGATION) {
         String file = notification.getParameter(FILE);
         filesNavigation[file] = notification.getParameter(REGIONS);
       }
     });
   }
 
   void addAnalysisSubscription(AnalysisService service, String file) {
     // add file to subscription
-    var files = analysisSubscriptions[service.name];
+    var files = analysisSubscriptions[service];
     if (files == null) {
       files = <String>[];
-      analysisSubscriptions[service.name] = files;
+      analysisSubscriptions[service] = files;
     }
     files.add(file);
     // set subscriptions
-    Request request = new Request('0', ANALYSIS_SET_SUBSCRIPTIONS);
-    request.setParameter(SUBSCRIPTIONS, analysisSubscriptions);
+    Request request = new AnalysisSetSubscriptionsParams(
+        analysisSubscriptions).toRequest('0');
     handleSuccessfulRequest(request);
   }
 
   void addAnalysisSubscriptionHighlights(String file) {
     addAnalysisSubscription(AnalysisService.HIGHLIGHTS, file);
   }
 
   void addAnalysisSubscriptionNavigation(String file) {
     addAnalysisSubscription(AnalysisService.NAVIGATION, file);
   }
 
   /**
    * Creates an empty project `/project`.
    */
   void createEmptyProject() {
     resourceProvider.newFolder('/project');
-    Request request = new Request('0', ANALYSIS_SET_ANALYSIS_ROOTS);
-    request.setParameter(INCLUDED, ['/project']);
-    request.setParameter(EXCLUDED, []);
+    Request request = new AnalysisSetAnalysisRootsParams(['/project'],
+        []).toRequest('0');
     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', ANALYSIS_SET_ANALYSIS_ROOTS);
-    request.setParameter(INCLUDED, ['/project']);
-    request.setParameter(EXCLUDED, []);
+    Request request = new AnalysisSetAnalysisRootsParams(['/project'],
+        []).toRequest('0');
     handleSuccessfulRequest(request);
   }
 
   /**
    * Returns the offset of [search] in [testCode].
    * Fails if not found.
    */
   int findOffset(String search) {
     int offset = testCode.indexOf(search);
     expect(offset, isNot(-1));
@@ skipping 64 matching lines @@
    * Validates that the given [request] is handled successfully.
    */
   void handleSuccessfulRequest(Request request) {
     Response response = handler.handleRequest(request);
     expect(response, isResponseSuccess('0'));
   }
 
   /**
    * Send an `updateContent` request for [testFile].
    */
-  void sendContentChange(Map contentChange) {
-    Request request = new Request('0', ANALYSIS_UPDATE_CONTENT);
-    request.setParameter('files', {
-      testFile: contentChange
-    });
+  void sendContentChange(dynamic contentChange) {
+    Request request = new AnalysisUpdateContentParams({
+      testFile: contentChange}).toRequest('0');
     handleSuccessfulRequest(request);
   }
 
   String setFileContent(String path, String content) {
     resourceProvider.newFile(path, content);
     return path;
   }
 
   /**
    * Stops the associated server.
@@ skipping 10 matching lines @@
     return waitForServerOperationsPerformed(server);
   }
 
   static String _getCodeString(code) {
     if (code is List<String>) {
       code = code.join('\n');
     }
     return code as String;
   }
 }