Remove references to Engine classes from protocol.dart

pkg/analysis_server/test/computer/element_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.computer.element;
 
-import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart' as engine;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;
 import 'package:unittest/unittest.dart';
 
 import '../abstract_context.dart';
 import '../reflective_tests.dart';
 
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(ElementTest);
   runReflectiveTests(ElementKindTest);
 }
 
 
 class ElementKindTest {
   void test_fromEngine() {
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.CLASS),
+        newElementKind_fromEngine(engine.ElementKind.CLASS),
         ElementKind.CLASS);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.COMPILATION_UNIT),
+        newElementKind_fromEngine(engine.ElementKind.COMPILATION_UNIT),
         ElementKind.COMPILATION_UNIT);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.CONSTRUCTOR),
+        newElementKind_fromEngine(engine.ElementKind.CONSTRUCTOR),
         ElementKind.CONSTRUCTOR);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.FIELD),
+        newElementKind_fromEngine(engine.ElementKind.FIELD),
         ElementKind.FIELD);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.FUNCTION),
+        newElementKind_fromEngine(engine.ElementKind.FUNCTION),
         ElementKind.FUNCTION);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.FUNCTION_TYPE_ALIAS),
+        newElementKind_fromEngine(engine.ElementKind.FUNCTION_TYPE_ALIAS),
         ElementKind.FUNCTION_TYPE_ALIAS);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.GETTER),
+        newElementKind_fromEngine(engine.ElementKind.GETTER),
         ElementKind.GETTER);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.LABEL),
+        newElementKind_fromEngine(engine.ElementKind.LABEL),
         ElementKind.LABEL);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.LIBRARY),
+        newElementKind_fromEngine(engine.ElementKind.LIBRARY),
         ElementKind.LIBRARY);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.LOCAL_VARIABLE),
+        newElementKind_fromEngine(engine.ElementKind.LOCAL_VARIABLE),
         ElementKind.LOCAL_VARIABLE);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.METHOD),
+        newElementKind_fromEngine(engine.ElementKind.METHOD),
         ElementKind.METHOD);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.PARAMETER),
+        newElementKind_fromEngine(engine.ElementKind.PARAMETER),
         ElementKind.PARAMETER);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.SETTER),
+        newElementKind_fromEngine(engine.ElementKind.SETTER),
         ElementKind.SETTER);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.TOP_LEVEL_VARIABLE),
+        newElementKind_fromEngine(engine.ElementKind.TOP_LEVEL_VARIABLE),
         ElementKind.TOP_LEVEL_VARIABLE);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.TYPE_PARAMETER),
+        newElementKind_fromEngine(engine.ElementKind.TYPE_PARAMETER),
         ElementKind.TYPE_PARAMETER);
     expect(
-        new ElementKind.fromEngine(engine.ElementKind.ANGULAR_COMPONENT),
+        newElementKind_fromEngine(engine.ElementKind.ANGULAR_COMPONENT),
         ElementKind.UNKNOWN);
   }
 
   void test_string_constructor() {
     expect(new ElementKind(ElementKind.CLASS.name), ElementKind.CLASS);
     expect(
         new ElementKind(ElementKind.CLASS_TYPE_ALIAS.name),
         ElementKind.CLASS_TYPE_ALIAS);
     expect(
         new ElementKind(ElementKind.COMPILATION_UNIT.name),
@@ skipping 48 matching lines @@
     return findChildElement(unit.element, name, kind);
   }
 
   void test_fromElement_CLASS() {
     Source source = addSource('/test.dart', '''
 @deprecated
 abstract class _MyClass {}''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.ClassElement engineElement = findElementInUnit(unit, '_MyClass');
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.CLASS);
     expect(element.name, '_MyClass');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 27);
       expect(location.length, '_MyClass'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 16);
     }
     expect(
         element.flags,
         Element.FLAG_ABSTRACT | Element.FLAG_DEPRECATED | Element.FLAG_PRIVATE);
   }
 
   void test_fromElement_CONSTRUCTOR() {
     Source source = addSource('/test.dart', '''
 class A {
   const A.myConstructor(int a, [String b]);
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.ConstructorElement engineElement =
         findElementInUnit(unit, 'myConstructor');
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.CONSTRUCTOR);
     expect(element.name, 'myConstructor');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 20);
       expect(location.length, 'myConstructor'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 11);
     }
     expect(element.parameters, '(int a, [String b])');
     expect(element.returnType, 'A');
     expect(element.flags, Element.FLAG_CONST);
   }
 
   void test_fromElement_FIELD() {
     Source source = addSource('/test.dart', '''
 class A {
   static const myField = 42;
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.FieldElement engineElement = findElementInUnit(unit, 'myField');
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.FIELD);
     expect(element.name, 'myField');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 25);
       expect(location.length, 'myField'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 16);
     }
     expect(element.parameters, isNull);
     expect(element.returnType, isNull);
     expect(element.flags, Element.FLAG_CONST | Element.FLAG_STATIC);
   }
 
   void test_fromElement_GETTER() {
     Source source = addSource('/test.dart', '''
 class A {
   String myGetter => 42;
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.PropertyAccessorElement engineElement =
         findElementInUnit(unit, 'myGetter', engine.ElementKind.GETTER);
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.GETTER);
     expect(element.name, 'myGetter');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 19);
       expect(location.length, 'myGetter'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 10);
     }
     expect(element.parameters, '()');
     expect(element.returnType, 'String');
     expect(element.flags, 0);
   }
 
   void test_fromElement_LABEL() {
     Source source = addSource('/test.dart', '''
 main() {
 myLabel:
   while (true) {
     break myLabel;
   }
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.LabelElement engineElement = findElementInUnit(unit, 'myLabel');
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.LABEL);
     expect(element.name, 'myLabel');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 9);
       expect(location.length, 'myLabel'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 1);
     }
     expect(element.parameters, isNull);
     expect(element.returnType, isNull);
     expect(element.flags, 0);
   }
 
   void test_fromElement_METHOD() {
     Source source = addSource('/test.dart', '''
 class A {
   static List<String> myMethod(int a, {String b}) {
     return null;
   }
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.MethodElement engineElement = findElementInUnit(unit, 'myMethod');
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.METHOD);
     expect(element.name, 'myMethod');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 32);
       expect(location.length, 'myGetter'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 23);
     }
     expect(element.parameters, '(int a, {String b})');
     expect(element.returnType, 'List<String>');
     expect(element.flags, Element.FLAG_STATIC);
   }
 
   void test_fromElement_SETTER() {
     Source source = addSource('/test.dart', '''
 class A {
   set mySetter(String x) {}
 }''');
     CompilationUnit unit = resolveLibraryUnit(source);
     engine.FieldElement engineFieldElement =
         findElementInUnit(unit, 'mySetter', engine.ElementKind.FIELD);
     engine.PropertyAccessorElement engineElement = engineFieldElement.setter;
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.SETTER);
     expect(element.name, 'mySetter');
     {
       Location location = element.location;
       expect(location.file, '/test.dart');
       expect(location.offset, 16);
       expect(location.length, 'mySetter'.length);
       expect(location.startLine, 2);
       expect(location.startColumn, 7);
     }
     expect(element.parameters, '(String x)');
     expect(element.returnType, isNull);
     expect(element.flags, 0);
   }
 
   void test_fromElement_dynamic() {
     var engineElement = engine.DynamicElementImpl.instance;
     // create notification Element
-    Element element = new Element.fromEngine(engineElement);
+    Element element = newElement_fromEngine(engineElement);
     expect(element.kind, ElementKind.UNKNOWN);
     expect(element.name, 'dynamic');
     expect(element.location, isNull);
     expect(element.parameters, isNull);
     expect(element.returnType, isNull);
     expect(element.flags, 0);
   }
 }