Index: pkg/unittest/test/returning_future_test.dart |
diff --git a/pkg/unittest/test/returning_future_test.dart b/pkg/unittest/test/returning_future_test.dart |
index 97faf8e0e99b3f9b84d157ba1fd15fb15bf7a0c5..1ebaa6d397947f649c4f768b2b8047d4d819e556 100644 |
--- a/pkg/unittest/test/returning_future_test.dart |
+++ b/pkg/unittest/test/returning_future_test.dart |
@@ -2,63 +2,73 @@ |
// 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. |
-library unittestTest; |
- |
-import 'dart:async'; |
-import 'dart:isolate'; |
+library unittest.returning_future_test; |
+import 'package:metatest/metatest.dart'; |
import 'package:unittest/unittest.dart'; |
-part 'utils.dart'; |
+import 'utils.dart'; |
+ |
+void main() => initTests(_test); |
-var testName = 'test returning future'; |
+void _test(message) { |
+ initMetatest(message); |
-var testFunction = (_) { |
- test("successful", () { |
- return _defer(() { |
- expect(true, true); |
+ expectTestResults('returning futures', () { |
+ test("successful", () { |
+ return defer(() { |
+ expect(true, true); |
+ }); |
}); |
- }); |
- // We repeat the fail and error tests, because during development |
- // I had a situation where either worked fine on their own, and |
- // error/fail worked, but fail/error would time out. |
- test("error1", () { |
- var callback = expectAsync(() {}); |
- var excesscallback = expectAsync(() {}); |
- return _defer(() { |
- excesscallback(); |
- excesscallback(); |
- excesscallback(); |
- callback(); |
+ // We repeat the fail and error tests, because during development |
+ // I had a situation where either worked fine on their own, and |
+ // error/fail worked, but fail/error would time out. |
+ test("error1", () { |
+ var callback = expectAsync(() {}); |
+ var excesscallback = expectAsync(() {}); |
+ return defer(() { |
+ excesscallback(); |
+ excesscallback(); |
+ excesscallback(); |
+ callback(); |
+ }); |
}); |
- }); |
- test("fail1", () { |
- return _defer(() { |
- expect(true, false); |
+ test("fail1", () { |
+ return defer(() { |
+ expect(true, false); |
+ }); |
}); |
- }); |
- test("error2", () { |
- var callback = expectAsync(() {}); |
- var excesscallback = expectAsync(() {}); |
- return _defer(() { |
- excesscallback(); |
- excesscallback(); |
- callback(); |
+ test("error2", () { |
+ var callback = expectAsync(() {}); |
+ var excesscallback = expectAsync(() {}); |
+ return defer(() { |
+ excesscallback(); |
+ excesscallback(); |
+ callback(); |
+ }); |
}); |
- }); |
- test("fail2", () { |
- return _defer(() { |
- fail('failure'); |
+ test("fail2", () { |
+ return defer(() { |
+ fail('failure'); |
+ }); |
}); |
- }); |
- test('foo5', () { |
- }); |
-}; |
- |
-var expected = buildStatusString(2, 4, 0, |
- 'successful::' |
- 'error1:Callback called more times than expected (1).:' |
- 'fail1:Expected: <false> Actual: <true>:' |
- 'error2:Callback called more times than expected (1).:' |
- 'fail2:failure:' |
- 'foo5'); |
+ test('foo5', () { |
+ }); |
+ }, [{ |
+ 'result': 'pass' |
+ }, { |
+ 'result': 'fail', |
+ 'message': 'Callback called more times than expected (1).' |
+ }, { |
+ 'result': 'fail', |
+ 'message': 'Expected: <false>\n Actual: <true>\n' |
+ }, { |
+ 'result': 'fail', |
+ 'message': 'Callback called more times than expected (1).' |
+ }, { |
+ 'result': 'fail', |
+ 'message': 'failure' |
+ }, { |
+ 'result': 'pass' |
+ }]); |
+} |