Clean-up and progress on analysis server

pkg/analysis_server/test/mocks.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 mocks;
 
 import 'dart:async';
 import 'dart:io';
 
+import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:unittest/matcher.dart';
 
 /**
  * Answer the absolute path the the SDK relative to the currently running
  * script or throw an exception if it cannot be found.
  */
 String get sdkPath {
@@ skipping 55 matching lines @@
   StreamController<Response> responseController = new StreamController<Response>();
   StreamController<Notification> notificationController = new StreamController<Notification>();
 
   List<Response> responsesReceived = [];
   List<Notification> notificationsReceived = [];
 
   MockServerChannel() {
   }
 
   @override
-  void listen(void onRequest(Request request), {void onError(), void onDone()}) {
+  void listen(void onRequest(Request request), {Function onError, void onDone()}) {
     requestController.stream.listen(onRequest, onError: onError, onDone: onDone);
   }
 
   @override
   void sendNotification(Notification notification) {
     notificationsReceived.add(notification);
     // Wrap send notification in future to simulate websocket
     new Future(() => notificationController.add(notification));
   }
 
@@ skipping 10 matching lines @@
     responsesReceived.add(response);
     // Wrap send response in future to simulate websocket
     new Future(() => responseController.add(response));
   }
 
   void expectMsgCount({responseCount: 0, notificationCount: 0}) {
     expect(responsesReceived, hasLength(responseCount));
     expect(notificationsReceived, hasLength(notificationCount));
   }
 }