Handle null content in ContentChange.

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 333 matching lines @@
     expect(response, isResponseSuccess('0'));
   }
 
   /**
    * Stops the associated server.
    */
   void stopServer() {
     server.done();
   }
 
+  /**
+   * Send an updateContent request for testFile.

[scheglov, 2014/06/13 16:55:54]

Would be good to wrap constants with ``.

Send an `updateContent` request for [testFile].

[Paul Berry, 2014/06/13 20:23:00]

Done.

+   */
+  void sendContentChange(Map contentChange) {
+    Request request = new Request('0', METHOD_UPDATE_CONTENT);
+    request.setParameter('files', {
+      testFile: contentChange
+    });
+    handleSuccessfulRequest(request);
+  }
+
   static String _getCodeString(code) {
     if (code is List<String>) {
       code = code.join('\n');
     }
     return code as String;
   }
 }
 
 
 testNotificationErrors() {
@@ skipping 1189 matching lines @@
 
 testUpdateContent() {
   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
-      {
-        Request request = new Request('0', METHOD_UPDATE_CONTENT);
-        request.setParameter('files',
-            {
-              helper.testFile : {
-                CONTENT : 'library lib'
-              }
-            });
-        helper.handleSuccessfulRequest(request);
-      }
+      helper.sendContentChange({
+        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;');
     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);
-      }
+      helper.sendContentChange({
+        CONTENT: 'library 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', () {
+    AnalysisTestHelper helper = new AnalysisTestHelper();
+    helper.createSingleFileProject('library A;');
+    return helper.waitForOperationsFinished().then((_) {
+      // update code
+      helper.sendContentChange({
+        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
+          });
+          // There should be errors now.
+          return helper.waitForOperationsFinished().then((_) {
+            expect(helper.getTestErrors(), hasLength(1));
+          });
+        });
+      });
+    });
+  });
 }
 
-
 void test_setSubscriptions() {
   test('before analysis', () {
     AnalysisTestHelper helper = new AnalysisTestHelper();
     // subscribe
     helper.addAnalysisSubscriptionHighlights(helper.testFile);
     // create project
     helper.createSingleFileProject('int V = 42;');
     // wait, there are highlight regions
     helper.waitForOperationsFinished().then((_) {
       var highlights = helper.getHighlights(helper.testFile);
@@ skipping 12 matching lines @@
       // subscribe
       helper.addAnalysisSubscriptionHighlights(helper.testFile);
       // wait, has regions
       return helper.waitForOperationsFinished().then((_) {
         var highlights = helper.getHighlights(helper.testFile);
         expect(highlights, isNot(isEmpty));
       });
     });
   });
 }