Centralized event streams

runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart

Index: runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart
diff --git a/runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart b/runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart
index 27bf79cac88b2e13d45e3ceb0e1aed6949b150f6..235975f7278e33730bced1d7d339c5b4952c4dd4 100644
--- a/runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart
+++ b/runtime/observatory/tests/observatory_ui/nav/isolate-menu/element_test.dart
@@ -2,41 +2,36 @@
 // 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.
 import 'dart:html';
-import 'dart:async';
 import 'package:unittest/unittest.dart';
-import 'package:observatory/models.dart';
-import 'package:observatory/mocks.dart';
 import 'package:observatory/src/elements/nav/menu.dart';
 import 'package:observatory/src/elements/nav/isolate_menu.dart';
+import '../../mocks.dart';
 
 main(){
   NavIsolateMenuElement.tag.ensureRegistration();
 
-  final String tag = NavMenuElement.tag.name;
+  final tag = NavMenuElement.tag.name;
 
-  StreamController<IsolateUpdateEvent> updatesController;
-  final IsolateRefMock ref = const IsolateRefMock(id: 'i-id', name: 'old-name');
-  final IsolateMock obj = const IsolateMock(id: 'i-id', name: 'new-name');
+  EventRepositoryMock events;
+  final ref = const IsolateRefMock(id: 'i-id', name: 'old-name');
+  final obj = const IsolateMock(id: 'i-id', name: 'new-name');
   setUp(() {
-    updatesController = new StreamController<IsolateUpdateEvent>();
+    events = new EventRepositoryMock();
   });
   group('instantiation', () {
     test('IsolateRef', () {
-      final NavIsolateMenuElement e = new NavIsolateMenuElement(ref,
-                                      updatesController.stream);
+      final e = new NavIsolateMenuElement(ref, events);
       expect(e, isNotNull, reason: 'element correctly created');
       expect(e.isolate, equals(ref));
     });
     test('Isolate', () {
-      final NavIsolateMenuElement e = new NavIsolateMenuElement(obj,
-                                      updatesController.stream);
+      final e = new NavIsolateMenuElement(obj, events);
       expect(e, isNotNull, reason: 'element correctly created');
       expect(e.isolate, equals(obj));
     });
   });
   test('elements created after attachment', () async {
-    final NavIsolateMenuElement e = new NavIsolateMenuElement(ref,
-                                    updatesController.stream);
+    final e = new NavIsolateMenuElement(ref, events);
     document.body.append(e);
     await e.onRendered.first;
     expect(e.shadowRoot.children.length, isNonZero, reason: 'has elements');
@@ -46,24 +41,22 @@ main(){
   });
   group('updates', () {
     test('are correctly listen', () async {
-      final NavIsolateMenuElement e = new NavIsolateMenuElement(ref,
-                                      updatesController.stream);
-      expect(updatesController.hasListener, isFalse);
+      final e = new NavIsolateMenuElement(ref, events);
+      expect(events.onIsolateUpdateHasListener, isFalse);
       document.body.append(e);
       await e.onRendered.first;
-      expect(updatesController.hasListener, isTrue);
+      expect(events.onIsolateUpdateHasListener, isTrue);
       e.remove();
       await e.onRendered.first;
-      expect(updatesController.hasListener, isFalse);
+      expect(events.onIsolateUpdateHasListener, isFalse);
     });
     test('have effects', () async {
-      final NavIsolateMenuElement e = new NavIsolateMenuElement(ref,
-                                      updatesController.stream);
+      final e = new NavIsolateMenuElement(ref, events);
       document.body.append(e);
       await e.onRendered.first;
       expect((e.shadowRoot.querySelector(tag) as NavMenuElement)
              .label.contains(ref.name), isTrue);
-      updatesController.add(new IsolateUpdateEventMock(isolate: obj));
+      events.add(new IsolateUpdateEventMock(isolate: obj));
       await e.onRendered.first;
       expect((e.shadowRoot.querySelector(tag) as NavMenuElement)
              .label.contains(ref.name), isFalse);