| Index: tests/html/fileapi_test.dart
|
| ===================================================================
|
| --- tests/html/fileapi_test.dart (revision 8133)
|
| +++ tests/html/fileapi_test.dart (working copy)
|
| @@ -7,60 +7,48 @@
|
| useHtmlConfiguration();
|
| window.webkitRequestFileSystem(Window.TEMPORARY, 100, (fs) {
|
| // FIXME: add types to callback arguments after migration to wrapperless dart:html.
|
| - asyncTest('getDirectory', 2, () {
|
| + test('getDirectory', () {
|
| Expect.throws(() => fs.root.getDirectory('directory1', {'x': true}, (e) {}));
|
|
|
| fs.root.getDirectory(
|
| 'directory2',
|
| flags: {},
|
| - successCallback: (e) {
|
| - Expect.fail('Should not be reached');
|
| - callbackDone();
|
| - },
|
| - errorCallback: (e) {
|
| - Expect.equals(FileError.NOT_FOUND_ERR, e.code);
|
| - callbackDone();
|
| - });
|
| + successCallback:
|
| + (e) => guardAsync(() => Expect.fail('Should not be reached')),
|
| + errorCallback:
|
| + expectAsync1((e) => Expect.equals(FileError.NOT_FOUND_ERR, e.code))
|
| + );
|
|
|
| fs.root.getDirectory(
|
| 'directory3',
|
| flags: {'create': true},
|
| - successCallback: (e) {
|
| - Expect.equals('directory3', e.name);
|
| - callbackDone();
|
| - },
|
| - errorCallback: (e) {
|
| - Expect.fail('Got file error: ${e.code}');
|
| - callbackDone();
|
| - });
|
| + successCallback:
|
| + expectAsync1((e) => Expect.equals('directory3', e.name)),
|
| + errorCallback:
|
| + (e) => guardAsync(() => Expect.fail('Got file error: ${e.code}'))
|
| + );
|
| });
|
|
|
| - asyncTest('getFile', 2, () {
|
| + test('getFile', () {
|
| Expect.throws(() => fs.root.getFile('file1', {'x': true}, (e) {}));
|
|
|
| fs.root.getDirectory(
|
| 'file2',
|
| flags: {},
|
| - successCallback: (e) {
|
| - Expect.fail('Should not be reached');
|
| - callbackDone();
|
| - },
|
| - errorCallback: (e) {
|
| - Expect.equals(FileError.NOT_FOUND_ERR, e.code);
|
| - callbackDone();
|
| - });
|
| + successCallback:
|
| + (e) => guardAsync(() => Expect.fail('Should not be reached')),
|
| + errorCallback:
|
| + expectAsync1((e) => Expect.equals(FileError.NOT_FOUND_ERR, e.code))
|
| + );
|
|
|
| fs.root.getDirectory(
|
| 'file3',
|
| flags: {'create': true},
|
| - successCallback: (e) {
|
| - Expect.equals('file3', e.name);
|
| - callbackDone();
|
| - },
|
| - errorCallback: (e) {
|
| - Expect.fail('Got file error: ${e.code}');
|
| - callbackDone();
|
| - });
|
| + successCallback:
|
| + expectAsync1((e) => Expect.equals('file3', e.name)),
|
| + errorCallback:
|
| + (e) => guardAsync(() => Expect.fail('Got file error: ${e.code}'))
|
| + );
|
| });
|
| });
|
| }
|
|
|