Add service manager tests and test_driver.

lib/eval_on_dart_library.dart

@@ -12,13 +12,15 @@ class EvalOnDartLibrary {
 
     // TODO: do we need to dispose this subscription at some point? Where?
     serviceManager.isolateManager
-        .getCurrentFlutterIsolate((IsolateRef isolate) {
+        .getCurrentFlutterIsolate((IsolateRef isolate) async {
+      await _initializeComplete;
+
       if (_libraryRef.isCompleted) {
         _libraryRef = new Completer<LibraryRef>();
       }
 
       if (isolate != null) {
-        _initialize(isolate.id);
+        _initializeComplete = _initialize(isolate.id);
       }
     });
   }
@@ -32,24 +34,28 @@ class EvalOnDartLibrary {
   final String libraryName;
   final VmServiceWrapper service;
   Completer<LibraryRef> _libraryRef;
+  Future<void> _initializeComplete;
 
   String get isolateId => _isolateId;
   String _isolateId;
 
   Future<LibraryRef> get libraryRef => _libraryRef.future;
   Completer allPendingRequestsDone;
 
-  void _initialize(String isolateId) async {
+  Future<void> _initialize(String isolateId) async {
     _isolateId = isolateId;
 
     try {
       final Isolate isolate = await service.getIsolate(_isolateId);
       for (LibraryRef library in isolate.libraries) {
         if (library.uri == libraryName) {
+          assert(!_libraryRef.isCompleted);
           _libraryRef.complete(library);
           return;
         }
       }
+      assert(!_libraryRef.isCompleted);
+      _libraryRef.completeError('Library $libraryName not found');
     } catch (e) {
       _handleError(e);
     }
@@ -71,12 +77,16 @@ class EvalOnDartLibrary {
 
     try {
       final LibraryRef libraryRef = await _libraryRef.future;
-      return await service.evaluate(
+      final result =  await service.evaluate(
         _isolateId,
         libraryRef.id,
         expression,
         scope: scope,
       );
+      if (result is ErrorRef) {
+        throw result;
+      }
+      return result;
     } catch (e) {
       _handleError(e);
     }

lib/framework/framework_core.dart

@@ -33,7 +33,7 @@ class FrameworkCore {
       final VmServiceWrapper service =
           await connect('localhost', port, finishedCompleter);
       if (serviceManager != null) {
-        serviceManager.vmServiceOpened(service, finishedCompleter.future);
+        await serviceManager.vmServiceOpened(service, finishedCompleter.future);
       }
     } catch (e) {
       print('Unable to connect to service on port $port');

lib/service_manager.dart

@@ -64,7 +64,7 @@ class ServiceConnectionManager {
       _stateController.add(null);
       _connectionAvailableController.add(service);
 
-      _isolateManager._initIsolates(vm.isolates);
+      await _isolateManager._initIsolates(vm.isolates);
       service.onIsolateEvent.listen(_isolateManager._handleIsolateEvent);
       service.onExtensionEvent
           .listen(_serviceExtensionManager._handleExtensionEvent);
@@ -98,19 +98,16 @@ class ServiceConnectionManager {
 }
 
 class IsolateManager {
-  IsolateManager() {
-    _flutterIsolateController = new StreamController<IsolateRef>.broadcast();
-    _flutterIsolateController.onListen =
-        () => _flutterIsolateController.add(_flutterIsolate);
-  }
-
+  // TODO(kenzie): de-dupe logic between _selectedIsolate and _flutterIsolate.
   List<IsolateRef> _isolates = <IsolateRef>[];
+  List<IsolateRef> _flutterIsolates = <IsolateRef>[];
   IsolateRef _selectedIsolate;
   IsolateRef _flutterIsolate;
   VmServiceWrapper _service;
   ServiceExtensionManager _serviceExtensionManager;
 
-  StreamController<IsolateRef> _flutterIsolateController;
+  final StreamController<IsolateRef> _flutterIsolateController =
+      new StreamController<IsolateRef>.broadcast();
   final StreamController<IsolateRef> _isolateCreatedController =
       new StreamController<IsolateRef>.broadcast();
   final StreamController<IsolateRef> _isolateExitedController =
@@ -120,10 +117,15 @@ class IsolateManager {
 
   List<IsolateRef> get isolates => new List<IsolateRef>.unmodifiable(_isolates);
 
+  IsolateRef get flutterIsolate => _flutterIsolate;
+
   IsolateRef get selectedIsolate => _selectedIsolate;
 
   Stream<IsolateRef> get onIsolateCreated => _isolateCreatedController.stream;
 
+  Stream<IsolateRef> get onFlutterIsolateChanged =>
+      _flutterIsolateController.stream;
+
   Stream<IsolateRef> get onSelectedIsolateChanged =>
       _selectedIsolateController.stream;
 
@@ -139,27 +141,33 @@ class IsolateManager {
     }
   }
 
-  void _initIsolates(List<IsolateRef> isolates) {
+  Future<void> _initIsolates(List<IsolateRef> isolates) async {
     _isolates = isolates;
-    _initFlutterIsolate(isolates);
+    _flutterIsolates = isolates;
+    await _initFlutterIsolate(isolates);
+    if (_flutterIsolate != null) {
+      _flutterIsolateController.add(_flutterIsolate);
+    }
     _selectedIsolate = _selectBestFirstIsolate(isolates);
     if (_selectedIsolate != null) {
       _isolateCreatedController.add(_selectedIsolate);
       _selectedIsolateController.add(_selectedIsolate);
     }
   }
 
-  void _handleIsolateEvent(Event event) {
+  void _handleIsolateEvent(Event event) async {
     if (event.kind == 'IsolateStart') {
       _isolates.add(event.isolate);
+      _flutterIsolates.add(event.isolate);
       _isolateCreatedController.add(event.isolate);
       if (_selectedIsolate == null) {
         _selectedIsolate = event.isolate;
         _selectedIsolateController.add(event.isolate);
       }
     } else if (event.kind == 'ServiceExtensionAdded') {
       // On hot restart, service extensions are added from here.
-      _serviceExtensionManager._maybeAddServiceExtension(event.extensionRPC);
+      await _serviceExtensionManager
+          ._maybeAddServiceExtension(event.extensionRPC);
 
       // Check to see if there is a new flutter isolate.
       if (_flutterIsolate == null) {
@@ -169,13 +177,14 @@ class IsolateManager {
       }
     } else if (event.kind == 'IsolateExit') {
       _isolates.remove(event.isolate);
+      _flutterIsolates.remove(event.isolate);
       _isolateExitedController.add(event.isolate);
       if (_selectedIsolate == event.isolate) {
         _selectedIsolate = _isolates.isEmpty ? null : _isolates.first;
         _selectedIsolateController.add(_selectedIsolate);
       }
       if (_flutterIsolate == event.isolate) {
-        _setFlutterIsolate(null);
+        _setFlutterIsolate(_flutterIsolates.isEmpty ? null : _flutterIsolates.first);
         _serviceExtensionManager.resetAvailableExtensions();
       }
     }
@@ -198,7 +207,7 @@ class IsolateManager {
     return extensionName.startsWith('ext.flutter.');
   }
 
-  void _initFlutterIsolate(List<IsolateRef> isolates) async {
+  Future<void> _initFlutterIsolate(List<IsolateRef> isolates) async {
     for (IsolateRef ref in isolates) {
       // Populate flutter isolate info.
       if (_flutterIsolate == null) {
@@ -214,7 +223,7 @@ class IsolateManager {
       }
       // On initial connection to running app, service extensions are added from
       // here.
-      _serviceExtensionManager._addRegisteredExtensionRPCs(ref);
+      await _serviceExtensionManager._addRegisteredExtensionRPCs(ref);
     }
   }
 
@@ -227,7 +236,11 @@ class IsolateManager {
     _flutterIsolateController.add(ref);
   }
 
-  StreamSubscription<IsolateRef> getCurrentFlutterIsolate(Function onData) {
+  StreamSubscription<IsolateRef> getCurrentFlutterIsolate(
+      void onData(IsolateRef ref)) {
+    if (_flutterIsolate != null) {
+      onData(_flutterIsolate);
+    }
     return _flutterIsolateController.stream.listen(onData);
   }
 }
@@ -236,7 +249,7 @@ class ServiceExtensionManager {
   VmServiceWrapper _service;
   IsolateManager _isolateManager;
 
-  bool firstFrameEventReceived = false;
+  bool _firstFrameEventReceived = false;
 
   final Map<String, StreamController<bool>> _serviceExtensionController =
       <String, StreamController<bool>>{};
@@ -252,7 +265,7 @@ class ServiceExtensionManager {
       <String, ServiceExtensionState>{};
 
   /// Temporarily stores service extensions that we need to add. We should not add
-  /// extensions until the first frame event has been received [firstFrameEventReceived].
+  /// extensions until the first frame event has been received [_firstFrameEventReceived].
   final Set<String> _pendingServiceExtensions = Set<String>();
 
   void _handleExtensionEvent(Event event) {
@@ -265,25 +278,27 @@ class ServiceExtensionManager {
   }
 
   void _onFrameEventReceived() {
-    if (firstFrameEventReceived) {
+    if (_firstFrameEventReceived) {
       // The first frame event was already received.
       return;
     }
-    firstFrameEventReceived = true;
+    _firstFrameEventReceived = true;
 
     _pendingServiceExtensions.forEach(_addServiceExtension);
     _pendingServiceExtensions.clear();
   }
 
-  void _addRegisteredExtensionRPCs(IsolateRef isolateRef) async {
+  Future<void> _addRegisteredExtensionRPCs(IsolateRef isolateRef) async {
     if (_service == null) {
       return;
     }
     final Isolate isolate = await _service.getIsolate(isolateRef.id);
     if (isolate.extensionRPCs != null) {
-      isolate.extensionRPCs.forEach(_maybeAddServiceExtension);
+      for (String extension in isolate.extensionRPCs) {
+        await _maybeAddServiceExtension(extension);
+      };
 
-      if (!firstFrameEventReceived) {
+      if (!_firstFrameEventReceived) {
         final EvalOnDartLibrary flutterLibrary = new EvalOnDartLibrary(
           'package:flutter/src/widgets/binding.dart',
           _service,
@@ -301,16 +316,16 @@ class ServiceExtensionManager {
     }
   }
 
-  void _maybeAddServiceExtension(String name) {
-    if (firstFrameEventReceived) {
+  Future<void> _maybeAddServiceExtension(String name) async {
+    if (_firstFrameEventReceived) {
       assert(_pendingServiceExtensions.isEmpty);
-      _addServiceExtension(name);
+      await _addServiceExtension(name);
     } else {
       _pendingServiceExtensions.add(name);
     }
   }
 
-  void _addServiceExtension(String name) {
+  Future<void> _addServiceExtension(String name) async {
     final StreamController<bool> streamController =
         _getServiceExtensionController(name);
 
@@ -319,30 +334,30 @@ class ServiceExtensionManager {
 
     // Restore any previously enabled states by calling their service extensions.
     if (_enabledServiceExtensions.containsKey(name)) {
-      _callServiceExtension(name, _enabledServiceExtensions[name].value);
+      await _callServiceExtension(name, _enabledServiceExtensions[name].value);
     }
   }
 
-  void _callServiceExtension(String name, dynamic value) {
+  Future<void> _callServiceExtension(String name, dynamic value) async {
     if (_service == null) {
       return;
     }
 
     assert(value != null);
     if (value is bool) {
-      _service.callServiceExtension(
+      await _service.callServiceExtension(
         name,
         isolateId: _isolateManager.selectedIsolate.id,
         args: {'enabled': value},
       );
     } else if (value is String) {
-      _service.callServiceExtension(
+      await _service.callServiceExtension(
         name,
         isolateId: _isolateManager.selectedIsolate.id,
         args: {'value': value},
       );
     } else if (value is double) {
-      _service.callServiceExtension(
+      await _service.callServiceExtension(
         name,
         isolateId: _isolateManager.selectedIsolate.id,
         // The param name for a numeric service extension will be the last part
@@ -353,7 +368,7 @@ class ServiceExtensionManager {
   }
 
   void resetAvailableExtensions() {
-    firstFrameEventReceived = false;
+    _firstFrameEventReceived = false;
     _serviceExtensions.clear();
     _serviceExtensionController
         .forEach((String name, StreamController<bool> stream) {
@@ -362,8 +377,9 @@ class ServiceExtensionManager {
   }
 
   /// Sets the state for a service extension and makes the call to the VMService.
-  void setServiceExtensionState(String name, bool enabled, dynamic value) {
-    _callServiceExtension(name, value);
+  Future<void> setServiceExtensionState(
+      String name, bool enabled, dynamic value) async {
+    await _callServiceExtension(name, value);
 
     final StreamController<ServiceExtensionState> streamController =
         _getServiceExtensionStateController(name);
@@ -378,14 +394,15 @@ class ServiceExtensionManager {
     }
   }
 
-  StreamSubscription<bool> hasServiceExtension(String name, Function onData) {
+  StreamSubscription<bool> hasServiceExtension(
+      String name, void onData(bool value)) {
     final StreamController<bool> streamController =
         _getServiceExtensionController(name);
     return streamController.stream.listen(onData);
   }
 
   StreamSubscription<ServiceExtensionState> getServiceExtensionState(
-      String name, Function onData) {
+      String name, void onData(ServiceExtensionState state)) {
     final StreamController<ServiceExtensionState> streamController =
         _getServiceExtensionStateController(name);
     return streamController.stream.listen(onData);
@@ -422,7 +439,7 @@ class ServiceExtensionManager {
   /// extension name.
   StreamController<T> _getStream<T>(
       String name, Map<String, StreamController<T>> streams,
-      {@required Function onFirstListenerSubscribed}) {
+      {@required void onFirstListenerSubscribed()}) {
     streams.putIfAbsent(
         name,
         () =>

pubspec.yaml

@@ -15,6 +15,8 @@ dependencies:
 dev_dependencies:
   build_runner: 1.0.0
   build_web_compilers: any
+  flutter_tools:
+    path: '../flutter/packages/flutter_tools'
   test: ^1.0.0
   webdev: 1.0.1
   webkit_inspection_protocol: ^0.3.6