Remove references to Engine classes from protocol.dart

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/protocol.dart';
-import '../../reflective_tests.dart';
+import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
+import '../../reflective_tests.dart';
+
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(ChangeTest);
   runReflectiveTests(EditTest);
   runReflectiveTests(FileEditTest);
   runReflectiveTests(LinkedEditGroupTest);
   runReflectiveTests(LinkedEditSuggestionTest);
   runReflectiveTests(PositionTest);
 }
@@ skipping 115 matching lines @@
     change.toString();
   }
 }
 
 
 @ReflectiveTestCase()
 class EditTest {
   void test_applySequence() {
     SourceEdit edit1 = new SourceEdit(5, 2, 'abc');
     SourceEdit edit2 = new SourceEdit(1, 0, '!');
-    expect(SourceEdit.applySequence('0123456789', [edit1, edit2]), '0!1234abc789');
+    expect(
+        SourceEdit.applySequence('0123456789', [edit1, edit2]),
+        '0!1234abc789');
+  }
+
+  void test_editFromRange() {
+    SourceRange range = new SourceRange(1, 2);
+    SourceEdit edit = newSourceEdit_range(range, 'foo');
+    expect(edit.offset, 1);
+    expect(edit.length, 2);
+    expect(edit.replacement, 'foo');
   }
 
   void test_eqEq() {
     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 SourceEdit(1, 2, 'aaa'), isTrue);
     expect(a == this, isFalse);
     expect(a == new SourceEdit(1, 2, 'bbb'), isFalse);
     expect(a == new SourceEdit(10, 2, 'aaa'), isFalse);
   }
 
   void test_new() {
     SourceEdit edit = new SourceEdit(1, 2, 'foo', id: 'my-id');
     expect(edit.offset, 1);
     expect(edit.length, 2);
     expect(edit.replacement, 'foo');
-    expect(
-        edit.toJson(),
-        {'offset': 1, 'length': 2, 'replacement': 'foo', 'id': 'my-id'});
-  }
-
-  void test_editFromRange() {
-    SourceRange range = new SourceRange(1, 2);
-    SourceEdit edit = new SourceEdit.range(range, 'foo');
-    expect(edit.offset, 1);
-    expect(edit.length, 2);
-    expect(edit.replacement, 'foo');
+    expect(edit.toJson(), {
+      'offset': 1,
+      'length': 2,
+      'replacement': 'foo',
+      'id': 'my-id'
+    });
   }
   void test_toJson() {
     SourceEdit edit = new SourceEdit(1, 2, 'foo');
     var expectedJson = {
       OFFSET: 1,
       LENGTH: 2,
       REPLACEMENT: 'foo'
     };
     expect(edit.toJson(), expectedJson);
   }
@@ skipping 60 matching lines @@
 
 
 @ReflectiveTestCase()
 class LinkedEditGroupTest {
   void test_new() {
     LinkedEditGroup group = new LinkedEditGroup.empty();
     group.addPosition(new Position('/a.dart', 1), 2);
     group.addPosition(new Position('/b.dart', 10), 2);
     expect(
         group.toString(),
-        '{"positions":['
-            '{"file":"/a.dart","offset":1},'
+        '{"positions":[' '{"file":"/a.dart","offset":1},'
             '{"file":"/b.dart","offset":10}],"length":2,"suggestions":[]}');
   }
 
   void test_toJson() {
     LinkedEditGroup group = new LinkedEditGroup.empty();
     group.addPosition(new Position('/a.dart', 1), 2);
     group.addPosition(new Position('/b.dart', 10), 2);
     group.addSuggestion(
         new LinkedEditSuggestion('AA', LinkedEditSuggestionKind.TYPE));
     group.addSuggestion(
@@ skipping 61 matching lines @@
 
   void test_toJson() {
     Position position = new Position('/test.dart', 1);
     var expectedJson = {
       FILE: '/test.dart',
       OFFSET: 1
     };
     expect(position.toJson(), expectedJson);
   }
 }