Clean up observable tests to new API.

client/tests/client/observable/AbstractObservableTests.dart

Index: client/tests/client/observable/AbstractObservableTests.dart
diff --git a/client/tests/client/observable/AbstractObservableTests.dart b/client/tests/client/observable/AbstractObservableTests.dart
index 83a24dd377c167154108ef494e35b0a4bafdcd95..7738fd2529f6e24804c12cb946741d108ae140ec 100644
--- a/client/tests/client/observable/AbstractObservableTests.dart
+++ b/client/tests/client/observable/AbstractObservableTests.dart
@@ -2,59 +2,51 @@
 // 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.
 
-class AbstractObservableTests extends ObservableTestSetBase {
-  // TODO(rnystrom): Remove this when default constructors are supported.
-  AbstractObservableTests() : super();
-
-  setup() {
-    addTest(testObservableListeners);
-    addTest(testObservableFiresImmediatelyIfNoBatch);
-
-    group('addChangeListener()', () {
-      test('adding the same listener twice returns false the second time', () {
-        final target = new AbstractObservable();
-        final listener = (e) { };
-
-        expect(target.addChangeListener(listener)).isTrue();
-        expect(target.addChangeListener(listener)).isFalse();
-      });
+testAbstractObservable() {
+  group('addChangeListener()', () {
+    test('adding the same listener twice returns false the second time', () {
+      final target = new AbstractObservable();
+      final listener = (e) { };
+
+      expect(target.addChangeListener(listener)).isTrue();
+      expect(target.addChangeListener(listener)).isFalse();
     });
-  }
 
-  void testObservableListeners() {
-    // check that add/remove works, see contents of listeners too
-    final target = new AbstractObservable();
-    final l1 = (e) { };
-    final l2 = (e) { };
-    final l3 = (e) { };
-    final l4 = (e) { };
+    test('modifies listeners list', () {
+      // check that add/remove works, see contents of listeners too
+      final target = new AbstractObservable();
+      final l1 = (e) { };
+      final l2 = (e) { };
+      final l3 = (e) { };
+      final l4 = (e) { };
 
-    expect(target.listeners).equalsCollection([]);
+      expect(target.listeners).equalsCollection([]);
 
-    target.addChangeListener(l1);
-    expect(target.listeners).equalsCollection([l1]);
+      target.addChangeListener(l1);
+      expect(target.listeners).equalsCollection([l1]);
 
-    target.addChangeListener(l2);
-    expect(target.listeners).equalsCollection([l1, l2]);
+      target.addChangeListener(l2);
+      expect(target.listeners).equalsCollection([l1, l2]);
 
-    target.addChangeListener(l3);
-    target.addChangeListener(l4);
-    expect(target.listeners).equalsCollection([l1, l2, l3, l4]);
+      target.addChangeListener(l3);
+      target.addChangeListener(l4);
+      expect(target.listeners).equalsCollection([l1, l2, l3, l4]);
 
-    target.removeChangeListener(l4);
-    expect(target.listeners).equalsCollection([l1, l2, l3]);
+      target.removeChangeListener(l4);
+      expect(target.listeners).equalsCollection([l1, l2, l3]);
 
-    target.removeChangeListener(l2);
-    expect(target.listeners).equalsCollection([l1, l3]);
+      target.removeChangeListener(l2);
+      expect(target.listeners).equalsCollection([l1, l3]);
 
-    target.removeChangeListener(l1);
-    expect(target.listeners).equalsCollection([l3]);
+      target.removeChangeListener(l1);
+      expect(target.listeners).equalsCollection([l3]);
 
-    target.removeChangeListener(l3);
-    expect(target.listeners).equalsCollection([]);
-  }
+      target.removeChangeListener(l3);
+      expect(target.listeners).equalsCollection([]);
+    });
+  });
 
-  void testObservableFiresImmediatelyIfNoBatch() {
+  test('fires immediately if no batch', () {
     // If no batch is created, a summary should be automatically created and
     // fired on each property change.
     final target = new AbstractObservable();
@@ -69,15 +61,13 @@ class AbstractObservableTests extends ObservableTestSetBase {
 
     expect(res).isNotNull();
     expect(res.events.length).equals(1);
-    checkEvent(res.events[0],
-        target, 'pM', null, ChangeEvent.UPDATE, 10, 11);
+    validateUpdate(res.events[0], target, 'pM', null, 10, 11);
     res = null;
 
     target.recordPropertyUpdate('pL', '11', '13');
 
     expect(res).isNotNull();
     expect(res.events.length).equals(1);
-    checkEvent(res.events[0],
-        target, 'pL', null, ChangeEvent.UPDATE, '11', '13');
-  }
+    validateUpdate(res.events[0], target, 'pL', null, '11', '13');
+  });
 }