Merge pull request #84 from dart-lang/test-package

update to the test package

Author: jakemac53

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 0.13.3
+
+* Update to the `test` package.
+
 #### 0.13.2
 
 * Update to analyzer '^0.27.0'.

pubspec.yaml

@@ -1,5 +1,5 @@
 name: observe
-version: 0.13.2
+version: 0.13.3
 author: Polymer.dart Authors <[email protected]>
 description: >
   Observable properties and objects for use in template_binding.
@@ -22,7 +22,7 @@ dev_dependencies:
   benchmark_harness: '>=1.0.0 <2.0.0'
   browser: any
   chart: '>=1.0.8 <2.0.0'
-  unittest: '>=0.10.0 <0.12.0'
+  test: '^0.12.0'
   stack_trace: '>=0.9.1 <2.0.0'
 environment:
   sdk: '>=1.8.0 <2.0.0'

test/list_change_test.dart

@@ -4,13 +4,12 @@
 
 import 'dart:async';
 import 'package:observe/observe.dart';
-import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
 
 // This file contains code ported from:
 // https://github.com/rafaelw/ChangeSummary/blob/master/tests/test.js
 
-main() => dirtyCheckZone().run(listChangeTests);
+main() => listChangeTests();
 
 // TODO(jmesserly): port or write array fuzzer tests
 listChangeTests() {

test/list_path_observer_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:async';
 import 'package:observe/observe.dart';
-import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
 
 import 'package:observe/mirrors_used.dart' as mu; // make test smaller.

test/observable_list_test.dart

@@ -4,10 +4,9 @@
 
 import 'dart:async';
 import 'package:observe/observe.dart';
-import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
 
-main() => dirtyCheckZone().run(_runTests);
+main() => _runTests();
 
 _runTests() {
   // TODO(jmesserly): need all standard List API tests.

test/observable_map_test.dart

@@ -4,10 +4,9 @@
 
 import 'dart:async';
 import 'package:observe/observe.dart';
-import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
 
-main() => dirtyCheckZone().run(_runTests);
+main() => _runTests();
 
 _runTests() {
   // TODO(jmesserly): need all standard Map API tests.

test/observe_test.dart

@@ -6,7 +6,6 @@ import 'dart:async';
 import 'package:logging/logging.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/src/dirty_check.dart' as dirty_check;
-import 'package:unittest/unittest.dart';
 import 'observe_test_utils.dart';
 
 import 'package:observe/mirrors_used.dart' as mu; // make test smaller.
@@ -15,7 +14,7 @@ import 'package:smoke/mirrors.dart';
 /// Uses [mu].
 main() {
   useMirrors();
-  dirtyCheckZone().run(_tests);
+  _tests();
 }
 
 void _tests() {
@@ -50,8 +49,9 @@ void _tests() {
       var maxNumIterations = dirty_check.MAX_DIRTY_CHECK_CYCLES;
 
       var x = new WatcherModel(0);
-      var sub = x.changes.listen(expectAsync((_) { x.value++; },
-          count: maxNumIterations));
+      var sub = x.changes.listen(expectAsync((_) {
+        x.value++;
+      }, count: maxNumIterations));
       x.value = 1;
       Observable.dirtyCheck();
       expect(x.value, maxNumIterations + 1);
@@ -89,7 +89,7 @@ void _observeTests(createModel(x)) {
   });
 
   test('handle future result', () {
-    var callback = expectAsync((){});
+    var callback = expectAsync(() {});
     return new Future(callback);
   });
 
@@ -144,7 +144,7 @@ void _observeTests(createModel(x)) {
 
     verifyRecords(records) {
       expectPropertyChanges(records, watch ? 1 : 2);
-    };
+    }
 
     subs.add(t.changes.listen(expectAsync(verifyRecords)));
     subs.add(t.changes.listen(expectAsync(verifyRecords)));
@@ -156,7 +156,9 @@ void _observeTests(createModel(x)) {
   test('async processing model', () {
     var t = createModel(123);
     var records = [];
-    subs.add(t.changes.listen((r) { records.addAll(r); }));
+    subs.add(t.changes.listen((r) {
+      records.addAll(r);
+    }));
     t.value = 41;
     t.value = 42;
     expectChanges(records, [], reason: 'changes delived async');
@@ -167,7 +169,6 @@ void _observeTests(createModel(x)) {
 
       t.value = 777;
       expectChanges(records, [], reason: 'changes delived async');
-
     }).then(newMicrotask).then((_) {
       expectPropertyChanges(records, 1);
 
@@ -210,7 +211,9 @@ void _observeTests(createModel(x)) {
   test('cannot modify changes list', () {
     var t = createModel(123);
     var records = null;
-    subs.add(t.changes.listen((r) { records = r; }));
+    subs.add(t.changes.listen((r) {
+      records = r;
+    }));
     t.value = 42;
 
     return new Future(() {
@@ -222,16 +225,22 @@ void _observeTests(createModel(x)) {
         records[0] = new PropertyChangeRecord(t, #value, 0, 1);
       }, throwsUnsupportedError);
 
-      expect(() { records.clear(); }, throwsUnsupportedError);
+      expect(() {
+        records.clear();
+      }, throwsUnsupportedError);
 
-      expect(() { records.length = 0; }, throwsUnsupportedError);
+      expect(() {
+        records.length = 0;
+      }, throwsUnsupportedError);
     });
   });
 
   test('notifyChange', () {
     var t = createModel(123);
     var records = [];
-    subs.add(t.changes.listen((r) { records.addAll(r); }));
+    subs.add(t.changes.listen((r) {
+      records.addAll(r);
+    }));
     t.notifyChange(new PropertyChangeRecord(t, #value, 123, 42));
 
     return new Future(() {
@@ -243,7 +252,9 @@ void _observeTests(createModel(x)) {
   test('notifyPropertyChange', () {
     var t = createModel(123);
     var records = null;
-    subs.add(t.changes.listen((r) { records = r; }));
+    subs.add(t.changes.listen((r) {
+      records = r;
+    }));
     expect(t.notifyPropertyChange(#value, t.value, 42), 42,
         reason: 'notifyPropertyChange returns newValue');
 
@@ -257,10 +268,10 @@ void _observeTests(createModel(x)) {
 expectPropertyChanges(records, int number) {
   expect(records.length, number, reason: 'expected $number change records');
   for (var record in records) {
-    expect(record is PropertyChangeRecord, true, reason:
-        'record should be PropertyChangeRecord');
-    expect((record as PropertyChangeRecord).name, #value, reason:
-        'record should indicate a change to the "value" property');
+    expect(record is PropertyChangeRecord, true,
+        reason: 'record should be PropertyChangeRecord');
+    expect((record as PropertyChangeRecord).name, #value,
+        reason: 'record should indicate a change to the "value" property');
   }
 }
 

test/observe_test_utils.dart

@@ -7,8 +7,27 @@ library observe.test.observe_test_utils;
 import 'dart:async';
 import 'package:observe/observe.dart';
 import 'package:observe/mirrors_used.dart' as mu; // to make tests smaller
-import 'package:unittest/unittest.dart';
+import 'package:observe/src/dirty_check.dart';
+import 'package:test/test.dart' hide test, group, setUp, tearDown;
+import 'package:test/test.dart' as original_test
+    show test, group, setUp, tearDown;
+
 export 'package:observe/src/dirty_check.dart' show dirtyCheckZone;
+export 'package:test/test.dart' hide test, group, setUp, tearDown;
+
+/// Custom implementations of the functions from `package:test`. These ensure
+/// that the body of all test function are run in the dirty checking zone.
+test(String description, body()) => original_test.test(
+    description, () => dirtyCheckZone().bindCallback(body)());
+
+group(String description, body()) => original_test.group(
+    description, () => dirtyCheckZone().bindCallback(body)());
+
+setUp(body()) =>
+    original_test.setUp(() => dirtyCheckZone().bindCallback(body)());
+
+tearDown(body()) =>
+    original_test.tearDown(() => dirtyCheckZone().bindCallback(body)());
 
 /// A small method to help readability. Used to cause the next "then" in a chain
 /// to happen in the next microtask:

test/path_observer_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:async';
 import 'package:observe/observe.dart';
-import 'package:unittest/unittest.dart';
 import 'package:observe/src/path_observer.dart'
     show getSegmentsOfPropertyPathForTesting,
          observerSentinelForTesting;
@@ -21,7 +20,7 @@ import 'package:smoke/mirrors.dart';
 // the tests below.
 //
 /// Uses [mu].
-main() => dirtyCheckZone().run(() {
+main() {
   useMirrors();
 
   group('PathObserver', observePathTests);
@@ -148,7 +147,7 @@ main() => dirtyCheckZone().run(() {
   });
 
   group('CompoundObserver', compoundObserverTests);
-});
+}
 
 observePathTests() {
   test('Degenerate Values', () {

test/transformer_test.dart

@@ -1,16 +1,14 @@
 // Copyright (c) 2013, 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.
+@TestOn('vm')
 import 'dart:async';
 import 'package:barback/barback.dart';
 import 'package:observe/transformer.dart';
-import 'package:unittest/compact_vm_config.dart';
-import 'package:unittest/unittest.dart';
 import 'package:stack_trace/stack_trace.dart';
+import 'package:test/test.dart';
 
 main() {
-  useCompactVMConfiguration();
-
   group('replaces Observable for ChangeNotifier', () {
     _testClause('extends Observable', 'extends ChangeNotifier');
     _testClause('extends Base with Observable',