1074640 - More tests for bookmarks

Status: RESOLVED FIXED

(Cloud Services Graveyard :: cloudSync, defect)

Description

[Alan K [:ack]]

Add some additional xpcshell tests for bookmarks.

Comment 1

[Alan K [:ack]]

Attachment: 0001-CLOUDSYNC-more-tests.patch

https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=26e156d45bbb

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Did somebody r+ this?

Comment 3

[Richard Newman [:rnewman]]

Comment on attachment 8497303 [details] [diff] [review]
0001-CLOUDSYNC-more-tests.patch

Review of attachment 8497303 [details] [diff] [review]:
-----------------------------------------------------------------

::: services/cloudsync/tests/xpcshell/test_bookmarks.js
@@ +13,5 @@
>    let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
> +  ok(rootFolder.id, "root folder id is ok");
> +
> +  let items = [
> +  	{"id":"G_UL4ZhOyX8m","type":rootFolder.BOOKMARK,"title":"reddit: the front page of the internet 1","uri":"http://www.reddit.com",index:2},

Could you make sure there's non-ASCII in here?

@@ +14,5 @@
> +  ok(rootFolder.id, "root folder id is ok");
> +
> +  let items = [
> +  	{"id":"G_UL4ZhOyX8m","type":rootFolder.BOOKMARK,"title":"reddit: the front page of the internet 1","uri":"http://www.reddit.com",index:2},
> +    {"id":"G_UL4ZhOyX8n","type":rootFolder.BOOKMARK,"title":"reddit: the front page of the internet 2","uri":"http://www.reddit.com?1",index:1},

Nit: alignment.

@@ +19,5 @@
> +  ];
> +  yield rootFolder.mergeRemoteItems(items);
> +
> +  let localItems = yield rootFolder.getLocalItems();
> +  equal(Object.keys(localItems).length, items.length, "found merged items");

Test contents?

@@ +30,5 @@
> +  ok(rootFolder.id, "root folder id is ok");
> +
> +  let items = [
> +  	{"id":"G_UL4ZhOyX8m","type":rootFolder.BOOKMARK,"title":"reddit: the front page of the internet 1","uri":"http://www.reddit.com",index:2},
> +    {"id":"G_UL4ZhOyX8n","type":rootFolder.BOOKMARK,parent:"G_UL4ZhOyX8x","title":"reddit: the front page of the internet 2","uri":"http://www.reddit.com/?1",index:1},

Alignment again.

@@ +42,5 @@
> +  localItems.forEach(function(item) {
> +    ok(item.id == "G_UL4ZhOyX8m" ||
> +       item.id == "G_UL4ZhOyX8n" ||
> +       item.id == "G_UL4ZhOyX8x");
> +    if(item.id == "G_UL4ZhOyX8n") {

Nit: "if ("

@@ +60,5 @@
> +  equal(bookmark.title, "reddit: the front page of the internet 2");
> +  equal(bookmark.index, 0);
> +  equal(bookmark.uri, "http://www.reddit.com/?1");
> +
> +  yield CloudSync().bookmarks.deleteRootFolder("TEST");

This won't run if the earlier code throws, right? Put this in a cleanup function (for toplevel; IIRC, that's do_register_cleanup in xpcshell) or finally.

Comment 4

[Alan K [:ack]]

Attachment: 0001-CLOUDSYNC-more-tests.patch

Comment 5

[Alan K [:ack]]

https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=dfd69d5f6dbf

Comment 6

[Alan K [:ack]]

Note that this is blocking an uplift to Aurora (bug#993584).

Comment 7

[Richard Newman [:rnewman]]

Alan: when things are urgent, it's best not to rely on checkin-needed. Try pinging a sheriff in #developers, or finding someone you know has commit access.

(I'm afk for the next few hours, else I'd do it.)

Comment 8

[Alan K [:ack]]

Richard: Thanks, I've pinged a sheriff.

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/integration/fx-team/rev/7c28c8e03229

Comment 10

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/7c28c8e03229