Bug 928734 - Intermittent test_419731.js | "title 2" == "new title 1". r=mano
authorMarco Bonardo <mbonardo@mozilla.com>
Mon, 03 Feb 2014 16:06:11 +0100
changeset 166633 ee98436d195d934c5e9aa765ed1589d606b57106
parent 166632 aa5a42f85d508e41b3c2f9224fa3ef5876ca65f4
child 166634 06095fccf046df3bcf7b835d1f9ef8c9e81ec0c7
push id4808
push userryanvm@gmail.com
push dateMon, 03 Feb 2014 23:16:15 +0000
treeherderfx-team@c150845d077d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmano
bugs928734
milestone29.0a1
Bug 928734 - Intermittent test_419731.js | "title 2" == "new title 1". r=mano
toolkit/components/places/tests/unit/test_419731.js
--- a/toolkit/components/places/tests/unit/test_419731.js
+++ b/toolkit/components/places/tests/unit/test_419731.js
@@ -1,115 +1,96 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// Get history services
-try {
-  var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
-                getService(Ci.nsINavHistoryService);
-  var bhist = histsvc.QueryInterface(Ci.nsIBrowserHistory);
-} catch(ex) {
-  do_throw("Could not get history services\n");
-}
-
-// Get bookmark service
-try {
-  var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
-              getService(Ci.nsINavBookmarksService);
-}
-catch(ex) {
-  do_throw("Could not get the nav-bookmarks-service\n");
-}
-
-// Get tagging service
-try {
-  var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
-                getService(Ci.nsITaggingService);
-} catch(ex) {
-  do_throw("Could not get tagging service\n");
-}
-
-
-// main
 function run_test() {
-  var uri1 = uri("http://foo.bar/");
+  let uri1 = NetUtil.newURI("http://foo.bar/");
 
   // create 2 bookmarks
-  var bookmark1id = bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder, uri1,
-                                         bmsvc.DEFAULT_INDEX, "title 1");
-  var bookmark2id = bmsvc.insertBookmark(bmsvc.toolbarFolder, uri1,
-                                         bmsvc.DEFAULT_INDEX, "title 2");
+  let bookmark1id = PlacesUtils.bookmarks
+                               .insertBookmark(PlacesUtils.bookmarksMenuFolderId,
+                                               uri1,
+                                               PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                               "title 1");
+  let bookmark2id = PlacesUtils.bookmarks
+                               .insertBookmark(PlacesUtils.toolbarFolderId,
+                                               uri1,
+                                               PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                               "title 2");
   // add a new tag
-  tagssvc.tagURI(uri1, ["foo"]);
+  PlacesUtils.tagging.tagURI(uri1, ["foo"]);
 
   // get tag folder id
-  var options = histsvc.getNewQueryOptions();
-  var query = histsvc.getNewQuery();
-  query.setFolders([bmsvc.tagsFolder], 1);
-  var result = histsvc.executeQuery(query, options);
-  var tagRoot = result.root;
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let query = PlacesUtils.history.getNewQuery();
+  query.setFolders([PlacesUtils.tagsFolderId], 1);
+  let result = PlacesUtils.history.executeQuery(query, options);
+  let tagRoot = result.root;
   tagRoot.containerOpen = true;
-  var tagNode = tagRoot.getChild(0)
+  let tagNode = tagRoot.getChild(0)
                        .QueryInterface(Ci.nsINavHistoryContainerResultNode);
-  var tagItemId = tagNode.itemId;
+  let tagItemId = tagNode.itemId;
   tagRoot.containerOpen = false;
 
   // change bookmark 1 title
-  bmsvc.setItemTitle(bookmark1id, "new title 1");
+  PlacesUtils.bookmarks.setItemTitle(bookmark1id, "new title 1");
+
+  // Workaround timers resolution and time skews.
+  let bookmark2LastMod = PlacesUtils.bookmarks.getItemLastModified(bookmark2id);
+  PlacesUtils.bookmarks.setItemLastModified(bookmark1id, bookmark2LastMod + 1);
 
   // Query the tag.
-  options = histsvc.getNewQueryOptions();
+  options = PlacesUtils.history.getNewQueryOptions();
   options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
   options.resultType = options.RESULTS_AS_TAG_QUERY;
 
-  query = histsvc.getNewQuery();
-  result = histsvc.executeQuery(query, options);
-  var root = result.root;
+  query = PlacesUtils.history.getNewQuery();
+  result = PlacesUtils.history.executeQuery(query, options);
+  let root = result.root;
   root.containerOpen = true;
   do_check_eq(root.childCount, 1);
 
-  var theTag = root.getChild(0)
+  let theTag = root.getChild(0)
                    .QueryInterface(Ci.nsINavHistoryContainerResultNode);
   // Bug 524219: Check that renaming the tag shows up in the result.
   do_check_eq(theTag.title, "foo")
-  bmsvc.setItemTitle(tagItemId, "bar");
+  PlacesUtils.bookmarks.setItemTitle(tagItemId, "bar");
 
   // Check that the item has been replaced
   do_check_neq(theTag, root.getChild(0));
-  var theTag = root.getChild(0)
+  theTag = root.getChild(0)
                    .QueryInterface(Ci.nsINavHistoryContainerResultNode);
   do_check_eq(theTag.title, "bar");
 
   // Check that tag container contains new title
   theTag.containerOpen = true;
   do_check_eq(theTag.childCount, 1);
-  var node = theTag.getChild(0);
+  let node = theTag.getChild(0);
   do_check_eq(node.title, "new title 1");
   theTag.containerOpen = false;
   root.containerOpen = false;
 
   // Change bookmark 2 title.
-  bmsvc.setItemTitle(bookmark2id, "new title 2");
+  PlacesUtils.bookmarks.setItemTitle(bookmark2id, "new title 2");
 
-  // Workaround VM timers issues.
-  var bookmark1LastMod = bmsvc.getItemLastModified(bookmark1id);
-  bmsvc.setItemLastModified(bookmark2id, bookmark1LastMod + 1);
+  // Workaround timers resolution and time skews.
+  let bookmark1LastMod = PlacesUtils.bookmarks.getItemLastModified(bookmark1id);
+  PlacesUtils.bookmarks.setItemLastModified(bookmark2id, bookmark1LastMod + 1);
 
   // Check that tag container contains new title
-  options = histsvc.getNewQueryOptions();
+  options = PlacesUtils.history.getNewQueryOptions();
   options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
   options.resultType = options.RESULTS_AS_TAG_CONTENTS;
 
-  query = histsvc.getNewQuery();
+  query = PlacesUtils.history.getNewQuery();
   query.setFolders([tagItemId], 1);
-  result = histsvc.executeQuery(query, options);
+  result = PlacesUtils.history.executeQuery(query, options);
   root = result.root;
 
   root.containerOpen = true;
-  var cc = root.childCount;
-  do_check_eq(cc, 1);
+  do_check_eq(root.childCount, 1);
   node = root.getChild(0);
   do_check_eq(node.title, "new title 2");
   root.containerOpen = false;
 }