Rework "analysis.updateContent" analysis server request.

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/computer/error.dart';
@@ skipping 130 matching lines @@
         expect(response, isResponseSuccess('0'));
         expect(options.analyzeAngular, equals(analyzeAngular));
         expect(options.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',
+        }
+      });
+      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'
       });
       // wait, there is an error
       return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 
   test('incremental', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
-    helper.createSingleFileProject('library A;');
+    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
+      });
       // update code
       helper.sendContentChange({
-        CONTENT: 'library lib',
+        TYPE: CHANGE,
+        REPLACEMENT: 'lib',
         OFFSET: 'library '.length,
         OLD_LENGTH: 'A;'.length,
-        NEW_LENGTH: 'lib'.length,
       });
       // wait, there is an error
       return helper.waitForOperationsFinished().then((_) {
         List<AnalysisError> errors = helper.getTestErrors();
         expect(errors, hasLength(1));
       });
     });
   });
 
   test('change on disk, normal', () {
@@ skipping 12 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;'
       });
       // 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({
-            CONTENT: null
+            TYPE: REMOVE
           });
           // There should be errors now.
           return helper.waitForOperationsFinished().then((_) {
             expect(helper.getTestErrors(), hasLength(1));
           });
         });
       });
     });
   });
 }
@@ skipping 343 matching lines @@
     return waitForServerOperationsPerformed(server);
   }
 
   static String _getCodeString(code) {
     if (code is List<String>) {
       code = code.join('\n');
     }
     return code as String;
   }
 }