wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1071357 - Need yield against checkItem and promiseAsyncUpdates after each importFromFile/exportToFile in test_bookmarks_json.js. r=mak

Browse Source
This commit is contained in:
Hiroyuki Ikezoe 2014-12-22 02:53:00 +01:00
parent 8e83635b22
commit 22c59567cc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/places/tests/unit/test_bookmarks_json.js
View File

@ -78,6 +78,7 @@ add_task(function test_import_bookmarks() {
let bookmarksFile = OS.Path.join(do_get_cwd().path, "bookmarks.json");
yield BookmarkJSONUtils.importFromFile(bookmarksFile, true);
yield promiseAsyncUpdates();
yield testImportedBookmarks();
});
@ -85,19 +86,24 @@ add_task(function test_export_bookmarks() {
bookmarksExportedFile = OS.Path.join(OS.Constants.Path.profileDir,
"bookmarks.exported.json");
yield BookmarkJSONUtils.exportToFile(bookmarksExportedFile);
yield promiseAsyncUpdates();
});
add_task(function test_import_exported_bookmarks() {
remove_all_bookmarks();
yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
yield promiseAsyncUpdates();
yield testImportedBookmarks();
});
add_task(function test_import_ontop() {
remove_all_bookmarks();
yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
yield promiseAsyncUpdates();
yield BookmarkJSONUtils.exportToFile(bookmarksExportedFile);
yield promiseAsyncUpdates();
yield BookmarkJSONUtils.importFromFile(bookmarksExportedFile, true);
yield promiseAsyncUpdates();
yield testImportedBookmarks();
});
@ -202,7 +208,9 @@ function checkItem(aExpected, aNode) {
folder.containerOpen = true;
do_check_eq(folder.childCount, aExpected.children.length);
aExpected.children.forEach(function (item, index) checkItem(item, folder.getChild(index)));
for (let index = 0; index < aExpected.children.length; index++) {
yield checkItem(aExpected.children[index], folder.getChild(index));
}
folder.containerOpen = false;
break;