Make more use of generated classes in analysis server.

pkg/analysis_server/test/services/correction/change_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.services.correction.change;
 
 import 'package:analysis_server/src/constants.dart';
+import 'package:analysis_server/src/protocol2.dart' show SourceEdit;
 import 'package:analysis_server/src/services/correction/change.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(ChangeTest);
   runReflectiveTests(EditTest);
   runReflectiveTests(FileEditTest);
   runReflectiveTests(LinkedEditGroupTest);
   runReflectiveTests(LinkedEditSuggestionTest);
   runReflectiveTests(PositionTest);
 }
 
 
 @ReflectiveTestCase()
 class ChangeTest {
   void test_addEdit() {
     Change change = new Change('msg');
-    Edit edit1 = new Edit(1, 2, 'a');
-    Edit edit2 = new Edit(1, 2, 'b');
+    SourceEdit edit1 = new SourceEdit(1, 2, 'a');
+    SourceEdit edit2 = new SourceEdit(1, 2, 'b');
     expect(change.fileEdits, hasLength(0));
     change.addEdit('/a.dart', edit1);
     expect(change.fileEdits, hasLength(1));
     change.addEdit('/a.dart', edit2);
     expect(change.fileEdits, hasLength(1));
     {
       FileEdit fileEdit = change.getFileEdit('/a.dart');
       expect(fileEdit, isNotNull);
       expect(fileEdit.edits, unorderedEquals([edit1, edit2]));
     }
   }
 
   void test_getFileEdit() {
     Change change = new Change('msg');
     FileEdit fileEdit = new FileEdit('/a.dart');
     change.addFileEdit(fileEdit);
     expect(change.getFileEdit('/a.dart'), fileEdit);
   }
 
   void test_getFileEdit_empty() {
     Change change = new Change('msg');
     expect(change.getFileEdit('/some.dart'), isNull);
   }
 
   void test_toJson() {
     Change change = new Change('msg');
     change.addFileEdit(new FileEdit('/a.dart')
-        ..add(new Edit(1, 2, 'aaa'))
-        ..add(new Edit(10, 20, 'bbb')));
+        ..add(new SourceEdit(1, 2, 'aaa'))
+        ..add(new SourceEdit(10, 20, 'bbb')));
     change.addFileEdit(new FileEdit('/b.dart')
-        ..add(new Edit(21, 22, 'xxx'))
-        ..add(new Edit(210, 220, 'yyy')));
+        ..add(new SourceEdit(21, 22, 'xxx'))
+        ..add(new SourceEdit(210, 220, 'yyy')));
     {
       var group = new LinkedEditGroup('id-a');
       change.addLinkedEditGroup(group
           ..addPosition(new Position('/ga.dart', 1), 2)
           ..addPosition(new Position('/ga.dart', 10), 2));
       group.addSuggestion(
           new LinkedEditSuggestion(LinkedEditSuggestionKind.TYPE, 'AA'));
       group.addSuggestion(
           new LinkedEditSuggestion(LinkedEditSuggestionKind.TYPE, 'BB'));
     }
@@ skipping 63 matching lines @@
     expect(change.toJson(), expectedJson);
     // some toString()
     change.toString();
   }
 }
 
 
 @ReflectiveTestCase()
 class EditTest {
   void test_applySequence() {
-    Edit edit1 = new Edit(5, 2, 'abc');
-    Edit edit2 = new Edit(1, 0, '!');
-    expect(Edit.applySequence('0123456789', [edit1, edit2]), '0!1234abc789');
-  }
-
-  void test_end() {
-    Edit edit = new Edit(1, 2, 'foo');
-    expect(edit.end, 3);
+    SourceEdit edit1 = new SourceEdit(5, 2, 'abc');
+    SourceEdit edit2 = new SourceEdit(1, 0, '!');
+    expect(applySequence('0123456789', [edit1, edit2]), '0!1234abc789');
   }
 
   void test_eqEq() {
-    Edit a = new Edit(1, 2, 'aaa');
-    Edit a2 = new Edit(1, 2, 'aaa');
-    Edit b = new Edit(1, 2, 'aaa');
+    SourceEdit a = new SourceEdit(1, 2, 'aaa');
+    SourceEdit a2 = new SourceEdit(1, 2, 'aaa');
+    SourceEdit b = new SourceEdit(1, 2, 'aaa');
     expect(a == a, isTrue);
-    expect(a == new Edit(1, 2, 'aaa'), isTrue);
+    expect(a == new SourceEdit(1, 2, 'aaa'), isTrue);
     expect(a == this, isFalse);
-    expect(a == new Edit(1, 2, 'bbb'), isFalse);
-    expect(a == new Edit(10, 2, 'aaa'), isFalse);
+    expect(a == new SourceEdit(1, 2, 'bbb'), isFalse);
+    expect(a == new SourceEdit(10, 2, 'aaa'), isFalse);
   }
 
   void test_new() {
-    Edit edit = new Edit(1, 2, 'foo');
-    edit.id = 'my-id';
+    SourceEdit edit = new SourceEdit(1, 2, 'foo', id: 'my-id');
     expect(edit.offset, 1);
     expect(edit.length, 2);
     expect(edit.replacement, 'foo');
     expect(
-        edit.toString(),
-        'Edit(offset=1, length=2, replacement=:>foo<:, id=my-id)');
+        edit.toJson(),
+        {'offset': 1, 'length': 2, 'replacement': 'foo', 'id': 'my-id'});
   }
 
-  void test_new_range() {
+  void test_editFromRange() {
     SourceRange range = new SourceRange(1, 2);
-    Edit edit = new Edit.range(range, 'foo');
+    SourceEdit edit = editFromRange(range, 'foo');
     expect(edit.offset, 1);
     expect(edit.length, 2);
     expect(edit.replacement, 'foo');
   }
   void test_toJson() {
-    Edit edit = new Edit(1, 2, 'foo');
+    SourceEdit edit = new SourceEdit(1, 2, 'foo');
     var expectedJson = {
       OFFSET: 1,
       LENGTH: 2,
       REPLACEMENT: 'foo'
     };
     expect(edit.toJson(), expectedJson);
   }
 
 }
 
 
 @ReflectiveTestCase()
 class FileEditTest {
   void test_addAll() {
-    Edit edit1a = new Edit(1, 0, 'a1');
-    Edit edit1b = new Edit(1, 0, 'a2');
-    Edit edit10 = new Edit(10, 1, 'b');
-    Edit edit100 = new Edit(100, 2, 'c');
+    SourceEdit edit1a = new SourceEdit(1, 0, 'a1');
+    SourceEdit edit1b = new SourceEdit(1, 0, 'a2');
+    SourceEdit edit10 = new SourceEdit(10, 1, 'b');
+    SourceEdit edit100 = new SourceEdit(100, 2, 'c');
     FileEdit fileEdit = new FileEdit('/test.dart');
     fileEdit.addAll([edit100, edit1a, edit10, edit1b]);
     expect(fileEdit.edits, [edit100, edit10, edit1b, edit1a]);
   }
 
   void test_add_sorts() {
-    Edit edit1a = new Edit(1, 0, 'a1');
-    Edit edit1b = new Edit(1, 0, 'a2');
-    Edit edit10 = new Edit(10, 1, 'b');
-    Edit edit100 = new Edit(100, 2, 'c');
+    SourceEdit edit1a = new SourceEdit(1, 0, 'a1');
+    SourceEdit edit1b = new SourceEdit(1, 0, 'a2');
+    SourceEdit edit10 = new SourceEdit(10, 1, 'b');
+    SourceEdit edit100 = new SourceEdit(100, 2, 'c');
     FileEdit fileEdit = new FileEdit('/test.dart');
     fileEdit.add(edit100);
     fileEdit.add(edit1a);
     fileEdit.add(edit1b);
     fileEdit.add(edit10);
     expect(fileEdit.edits, [edit100, edit10, edit1b, edit1a]);
   }
 
   void test_new() {
     FileEdit fileEdit = new FileEdit('/test.dart');
-    fileEdit.add(new Edit(1, 2, 'aaa'));
-    fileEdit.add(new Edit(10, 20, 'bbb'));
+    fileEdit.add(new SourceEdit(1, 2, 'aaa'));
+    fileEdit.add(new SourceEdit(10, 20, 'bbb'));
     expect(
         fileEdit.toString(),
         'FileEdit(file=/test.dart, edits=['
-            'Edit(offset=10, length=20, replacement=:>bbb<:), '
-            'Edit(offset=1, length=2, replacement=:>aaa<:)])');
+            '{"offset":10,"length":20,"replacement":"bbb"}, '
+            '{"offset":1,"length":2,"replacement":"aaa"}])');
   }
 
   void test_toJson() {
     FileEdit fileEdit = new FileEdit('/test.dart');
-    fileEdit.add(new Edit(1, 2, 'aaa'));
-    fileEdit.add(new Edit(10, 20, 'bbb'));
+    fileEdit.add(new SourceEdit(1, 2, 'aaa'));
+    fileEdit.add(new SourceEdit(10, 20, 'bbb'));
     var expectedJson = {
       FILE: '/test.dart',
       EDITS: [{
           OFFSET: 10,
           LENGTH: 20,
           REPLACEMENT: 'bbb'
         }, {
           OFFSET: 1,
           LENGTH: 2,
           REPLACEMENT: 'aaa'
@@ skipping 89 matching lines @@
 
   void test_toJson() {
     Position position = new Position('/test.dart', 1);
     var expectedJson = {
       FILE: '/test.dart',
       OFFSET: 1
     };
     expect(position.toJson(), expectedJson);
   }
 }