Clean up observable tests to new API.

client/tests/client/observable/observable_tests.dart

Index: client/tests/client/observable/observable_tests.dart
diff --git a/client/tests/client/observable/observable_tests.dart b/client/tests/client/observable/observable_tests.dart
index 57d85641c35eb444c4b914ef7440b2341b628170..420cbecc1bdf77cf697b7ac8afde6e6a4cb71980 100644
--- a/client/tests/client/observable/observable_tests.dart
+++ b/client/tests/client/observable/observable_tests.dart
@@ -4,7 +4,8 @@
 
 #library('observable_tests');
 
-#import('dart:html');
+#import('dart:html'); // TODO(rnystrom): Only needed to tell architecture.py
+                      // that this is a web test. Come up with cleaner solution.
 #import('../../../observable/observable.dart');
 #import('../../../testing/unittest/unittest.dart');
 
@@ -12,19 +13,37 @@
 #source('ChangeEventTests.dart');
 #source('EventBatchTests.dart');
 #source('ObservableListTests.dart');
-#source('ObservableTestSetBase.dart');
 #source('ObservableValueTests.dart');
 
 void main() {
-  var tests = new UnitTestSuite();
+  group('AbstractObservable', testAbstractObservable);
+  group('ChangeEvent', testChangeEvent);
+  group('EventBatch', testEventBatch);
+  group('ObservableList', testObservableList);
+  group('ObservableValue', testObservableValue);
+}
+
+void validateEvent(ChangeEvent e, target, pName, index, type, newVal, oldVal) {
+  expect(e.target).equals(target);
+  expect(e.propertyName).equals(pName);
+  expect(e.index).equals(index);
+  expect(e.type).equals(type);
+  expect(e.newValue).equals(newVal);
+  expect(e.oldValue).equals(oldVal);
+}
 
-  tests.addTestSets([
-    new AbstractObservableTests(),
-    new ChangeEventTests(),
-    new EventBatchTests(),
-    new ObservableListTests(),
-    new ObservableValueTests()
-  ]);
+void validateGlobal(ChangeEvent e, target) {
+  validateEvent(e, target, null, null, ChangeEvent.GLOBAL, null, null);
+}
 
-  tests.run();
+void validateInsert(ChangeEvent e, target, pName, index, newVal) {
+  validateEvent(e, target, pName, index, ChangeEvent.INSERT, newVal, null);
 }
+
+void validateRemove(ChangeEvent e, target, pName, index, oldVal) {
+  validateEvent(e, target, pName, index, ChangeEvent.REMOVE, null, oldVal);
+}
+
+void validateUpdate(ChangeEvent e, target, pName, index, newVal, oldVal) {
+  validateEvent(e, target, pName, index, ChangeEvent.UPDATE, newVal, oldVal);
+}