Bug 507172 - random failure in browser_ui_bookmarks_sidebar.js and browser_ui_history_sidebar.js r=dietrich

browser/components/places/tests/perf/Makefile.in

@@ -48,14 +48,15 @@ _CHROME_FILES = \
 	perf_large_delete.xul \
 	$(NULL)
 
-# XXX disabled tests, not working properly yet
-#  browser_ui_history_menu.js
-#  browser_ui_locationbar.js
-# XXX disabled tests, random failures
-#  browser_ui_bookmarks_sidebar.js
+# Disabled due to bad interactions with next tests.
+# browser_ui_locationbar.js
 _BROWSER_TEST_FILES = \
 	browser_ui_000_data.js \
+	browser_ui_history_menu.js \
+	browser_ui_bookmarks_sidebar.js \
 	browser_ui_history_sidebar.js \
+	browser_ui_history_sidebar_2.js \
+	browser_ui_history_sidebar_3.js \
 	$(NULL)
 
 libs:: $(_CHROME_FILES)

browser/components/places/tests/perf/browser_ui_bookmarks_sidebar.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -62,13 +63,13 @@ var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
          getService(Ci.nsINavBookmarksService);
 
 function add_visit(aURI, aDate) {
-  var placeID = hs.addVisit(aURI,
+  var visitId = hs.addVisit(aURI,
                             aDate,
                             null, // no referrer
                             hs.TRANSITION_TYPED, // user typed in URL bar
                             false, // not redirect
                             0);
-  return placeID;
+  return visitId;
 }
 
 function add_bookmark(aURI) {
@@ -86,7 +87,7 @@ var ptests = [];
 
 /*********************** end header **********************/
 
-const TEST_REPEAT_COUNT = 10;
+const TEST_REPEAT_COUNT = 6;
 
 // test duration of bookmarks sidebar opening
 ptests.push({
@@ -116,18 +117,19 @@ ptests.push({
     var avgDuration = totalDuration/this.times.length;
     var report = make_test_report("open_bookmarks_sidebar", avgDuration);
     ok(true, report);
-    runNextTest();
+    setTimeout(runNextTest, 0);
   }
 });
 
 function test() {
   // kick off tests
-  runNextTest();
+  setTimeout(runNextTest, 0);
 }
 
 function runNextTest() {
-  if (ptests.length > 0)
+  if (ptests.length > 0) {
     ptests.shift().run();
+  }
   else
     finish();
 }

browser/components/places/tests/perf/browser_ui_history_menu.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -40,8 +41,6 @@ Tests the performance of opening the history menu.
 */
 
 /*********************** begin header **********************/
-waitForExplicitFinish();
-
 const TEST_IDENTIFIER = "ui-perf-test";
 const TEST_SUITE = "places";
 
@@ -60,14 +59,17 @@ var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
 var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
          getService(Ci.nsINavBookmarksService);
 
+var historyMenu = document.getElementById("history-menu");
+var historyPopup = document.getElementById("goPopup");
+
 function add_visit(aURI, aDate) {
-  var placeID = hs.addVisit(aURI,
+  var visitId = hs.addVisit(aURI,
                             aDate,
                             null, // no referrer
                             hs.TRANSITION_TYPED, // user typed in URL bar
                             false, // not redirect
                             0);
-  return placeID;
+  return visitId;
 }
 
 function add_bookmark(aURI) {
@@ -85,38 +87,56 @@ var ptests = [];
 
 /*********************** end header **********************/
 
+const TEST_REPEAT_COUNT = 6;
+
 // test duration of history menu opening
 ptests.push({
   name: "open_history_menu",
+  times: [],
   run: function() {
-    var menu = document.getElementById("history-menu");
-    ok(menu, "history menu should exist!");
+    var self = this;
     var start = Date.now();
-
-    var popup = document.getElementById("goPopup");
-    popup.addEventListener("popupshown", function() {
-      var duration = Date.now() - start;
-      var report = make_test_report("open_history_menu", duration);
-      ok(true, report);
-
-      // clean up
-      popup.removeEventListener("popupshown", arguments.callee, false);
-      menu.open = false;
-
-      runNextTest();
-    }, false);
-    
-    // XXX does not work, is still open=false immediately after setting it to true
-    //menu.open = true;
-
-    // XXX does nada
-    //EventUtils.sendMouseEvent({type:"click"}, "history-menu");
+    historyPopup.addEventListener("popupshown", function() {
+      historyPopup.removeEventListener("popupshown", arguments.callee, true);
+      executeSoon(function() {
+        var duration = Date.now() - start;
+        historyPopup.hidePopup();
+        historyMenu.open = false;
+        self.times.push(duration);
+        if (self.times.length == TEST_REPEAT_COUNT)
+          self.finish();
+        else
+          self.run();
+      });
+    }, true);
+    historyMenu.open = true;
+    historyPopup.openPopup();
+  },
+  finish: function() {
+    processTestResult(this);
+    setTimeout(runNextTest, 0);
   }
 });
 
+function processTestResult(aTest) {
+  aTest.times.sort();  // sort the scores
+  aTest.times.pop();   // remove worst
+  aTest.times.shift(); // remove best
+  var totalDuration = aTest.times.reduce(function(time, total){ return time + total; });
+  var avgDuration = totalDuration/aTest.times.length;
+  var report = make_test_report(aTest.name, avgDuration);
+  ok(true, report);
+}
+
 function test() {
+  // Skip test on Mac due to native menus.
+  if (navigator.platform.toLowerCase().indexOf("mac") != -1)
+    return;
+
+  waitForExplicitFinish();
+
   // kick off tests
-  runNextTest();
+  setTimeout(runNextTest, 0);
 }
 
 function runNextTest() {

browser/components/places/tests/perf/browser_ui_history_sidebar.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -87,7 +88,7 @@ var ptests = [];
 
 /*********************** end header **********************/
 
-const TEST_REPEAT_COUNT = 10;
+const TEST_REPEAT_COUNT = 6;
 
 // test duration of history sidebar opening
 // default: bydayandsite
@@ -113,7 +114,7 @@ ptests.push({
   },
   finish: function() {
     processTestResult(this);
-    runNextTest();
+    setTimeout(runNextTest, 0);
   }
 });
 
@@ -141,7 +142,7 @@ ptests.push({
   },
   finish: function() {
     processTestResult(this);
-    runNextTest();
+    setTimeout(runNextTest, 0);
   }
 });
 
@@ -169,63 +170,7 @@ ptests.push({
   },
   finish: function() {
     processTestResult(this);
-    runNextTest();
-  }
-});
-
-// byvisited
-ptests.push({
-  name: "history_sidebar_byvisited",
-  times: [],
-  run: function() {
-    var self = this;
-    var start = Date.now();
-    sidebar.addEventListener("load", function() {
-      sidebar.removeEventListener("load", arguments.callee, true);
-      executeSoon(function() {
-        var duration = Date.now() - start;
-        sidebar.contentDocument.getElementById("byvisited").doCommand();
-        toggleSidebar("viewHistorySidebar", false);
-        self.times.push(duration);
-        if (self.times.length == TEST_REPEAT_COUNT)
-          self.finish();
-        else
-          self.run();
-      });
-    }, true);
-    toggleSidebar("viewHistorySidebar", true);
-  },
-  finish: function() {
-    processTestResult(this);
-    runNextTest();
-  }
-});
-
-// bylastvisited
-ptests.push({
-  name: "history_sidebar_bylastvisited",
-  times: [],
-  run: function() {
-    var self = this;
-    var start = Date.now();
-    sidebar.addEventListener("load", function() {
-      sidebar.removeEventListener("load", arguments.callee, true);
-      executeSoon(function() {
-        var duration = Date.now() - start;
-        sidebar.contentDocument.getElementById("bylastvisited").doCommand();
-        toggleSidebar("viewHistorySidebar", false);
-        self.times.push(duration);
-        if (self.times.length == TEST_REPEAT_COUNT)
-          self.finish();
-        else
-          self.run();
-      });
-    }, true);
-    toggleSidebar("viewHistorySidebar", true);
-  },
-  finish: function() {
-    processTestResult(this);
-    runNextTest();
+    setTimeout(runNextTest, 0);
   }
 });
 
@@ -241,7 +186,7 @@ function processTestResult(aTest) {
 
 function test() {
   // kick off tests
-  runNextTest();
+  setTimeout(runNextTest, 0);
 }
 
 function runNextTest() {

browser/components/places/tests/perf/browser_ui_history_sidebar_2.js

@@ -0,0 +1,142 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+Tests the performance of opening the History
+sidebar in all the available views.
+*/
+
+/*********************** begin header **********************/
+waitForExplicitFinish();
+
+const TEST_IDENTIFIER = "ui-perf-test";
+const TEST_SUITE = "places";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
+         getService(Ci.nsIWindowMediator);
+var win = wm.getMostRecentWindow("navigator:browser");
+var ios = Cc["@mozilla.org/network/io-service;1"].
+          getService(Ci.nsIIOService);
+var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
+         getService(Ci.nsINavHistoryService);
+var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
+         getService(Ci.nsINavBookmarksService);
+
+var sidebar = document.getElementById("sidebar");
+
+function add_visit(aURI, aDate) {
+  var visitId = hs.addVisit(aURI,
+                            aDate,
+                            null, // no referrer
+                            hs.TRANSITION_TYPED, // user typed in URL bar
+                            false, // not redirect
+                            0);
+  return visitId;
+}
+
+function add_bookmark(aURI) {
+  var bId = bs.insertBookmark(bs.unfiledBookmarksFolder, aURI,
+                              bs.DEFAULT_INDEX, "bookmark/" + aURI.spec);
+  return bId;
+}
+
+function make_test_report(testName, result, units) {
+  return [TEST_IDENTIFIER, TEST_SUITE, testName, result, units||"ms"].join(":");
+}
+
+// Each test is an obj w/ a name property and run method
+var ptests = [];
+
+/*********************** end header **********************/
+
+const TEST_REPEAT_COUNT = 6;
+
+// test duration of history sidebar opening
+// byvisited
+ptests.push({
+  name: "history_sidebar_byvisited",
+  times: [],
+  run: function() {
+    var self = this;
+    var start = Date.now();
+    sidebar.addEventListener("load", function() {
+      sidebar.removeEventListener("load", arguments.callee, true);
+      executeSoon(function() {
+        var duration = Date.now() - start;
+        sidebar.contentDocument.getElementById("byvisited").doCommand();
+        toggleSidebar("viewHistorySidebar", false);
+        self.times.push(duration);
+        if (self.times.length == TEST_REPEAT_COUNT)
+          self.finish();
+        else
+          self.run();
+      });
+    }, true);
+    toggleSidebar("viewHistorySidebar", true);
+  },
+  finish: function() {
+    processTestResult(this);
+    setTimeout(runNextTest, 0);
+  }
+});
+
+function processTestResult(aTest) {
+  aTest.times.sort();  // sort the scores
+  aTest.times.pop();   // remove worst
+  aTest.times.shift(); // remove best
+  var totalDuration = aTest.times.reduce(function(time, total){ return time + total; });
+  var avgDuration = totalDuration/aTest.times.length;
+  var report = make_test_report(aTest.name, avgDuration);
+  ok(true, report);
+}
+
+function test() {
+  // kick off tests
+  setTimeout(runNextTest, 0);
+}
+
+function runNextTest() {
+  if (ptests.length > 0)
+    ptests.shift().run();
+  else
+    finish();
+}

browser/components/places/tests/perf/browser_ui_history_sidebar_3.js

@@ -0,0 +1,142 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+Tests the performance of opening the History
+sidebar in all the available views.
+*/
+
+/*********************** begin header **********************/
+waitForExplicitFinish();
+
+const TEST_IDENTIFIER = "ui-perf-test";
+const TEST_SUITE = "places";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
+         getService(Ci.nsIWindowMediator);
+var win = wm.getMostRecentWindow("navigator:browser");
+var ios = Cc["@mozilla.org/network/io-service;1"].
+          getService(Ci.nsIIOService);
+var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
+         getService(Ci.nsINavHistoryService);
+var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
+         getService(Ci.nsINavBookmarksService);
+
+var sidebar = document.getElementById("sidebar");
+
+function add_visit(aURI, aDate) {
+  var visitId = hs.addVisit(aURI,
+                            aDate,
+                            null, // no referrer
+                            hs.TRANSITION_TYPED, // user typed in URL bar
+                            false, // not redirect
+                            0);
+  return visitId;
+}
+
+function add_bookmark(aURI) {
+  var bId = bs.insertBookmark(bs.unfiledBookmarksFolder, aURI,
+                              bs.DEFAULT_INDEX, "bookmark/" + aURI.spec);
+  return bId;
+}
+
+function make_test_report(testName, result, units) {
+  return [TEST_IDENTIFIER, TEST_SUITE, testName, result, units||"ms"].join(":");
+}
+
+// Each test is an obj w/ a name property and run method
+var ptests = [];
+
+/*********************** end header **********************/
+
+const TEST_REPEAT_COUNT = 6;
+
+// test duration of history sidebar opening
+// bylastvisited
+ptests.push({
+  name: "history_sidebar_bylastvisited",
+  times: [],
+  run: function() {
+    var self = this;
+    var start = Date.now();
+    sidebar.addEventListener("load", function() {
+      sidebar.removeEventListener("load", arguments.callee, true);
+      executeSoon(function() {
+        var duration = Date.now() - start;
+        sidebar.contentDocument.getElementById("bylastvisited").doCommand();
+        toggleSidebar("viewHistorySidebar", false);
+        self.times.push(duration);
+        if (self.times.length == TEST_REPEAT_COUNT)
+          self.finish();
+        else
+          self.run();
+      });
+    }, true);
+    toggleSidebar("viewHistorySidebar", true);
+  },
+  finish: function() {
+    processTestResult(this);
+    setTimeout(runNextTest, 0);
+  }
+});
+
+function processTestResult(aTest) {
+  aTest.times.sort();  // sort the scores
+  aTest.times.pop();   // remove worst
+  aTest.times.shift(); // remove best
+  var totalDuration = aTest.times.reduce(function(time, total){ return time + total; });
+  var avgDuration = totalDuration/aTest.times.length;
+  var report = make_test_report(aTest.name, avgDuration);
+  ok(true, report);
+}
+
+function test() {
+  // kick off tests
+  setTimeout(runNextTest, 0);
+}
+
+function runNextTest() {
+  if (ptests.length > 0)
+    ptests.shift().run();
+  else
+    finish();
+}

browser/components/places/tests/perf/browser_ui_locationbar.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Dietrich Ayala <dietrich@mozilla.com>
+ *   Marco Bonardo <mak77@bonardo.net>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -59,15 +60,20 @@ var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
          getService(Ci.nsINavHistoryService);
 var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
          getService(Ci.nsINavBookmarksService);
+var prefs = Cc["@mozilla.org/preferences-service;1"].
+            getService(Ci.nsIPrefBranch);
+
+var maxResults = prefs.getIntPref("browser.urlbar.maxRichResults");
+var onSearchComplete = gURLBar.onSearchComplete;
 
 function add_visit(aURI, aDate) {
-  var placeID = hs.addVisit(aURI,
+  var visitId = hs.addVisit(aURI,
                             aDate,
                             null, // no referrer
                             hs.TRANSITION_TYPED, // user typed in URL bar
                             false, // not redirect
                             0);
-  return placeID;
+  return visitId;
 }
 
 function add_bookmark(aURI) {
@@ -85,30 +91,61 @@ var ptests = [];
 
 /*********************** end header **********************/
 
-// test duration of history menu opening
+const TEST_REPEAT_COUNT = 6;
+
+// test duration of locationbar searching
 ptests.push({
   name: "open_locationbar_default",
+  times: [],
   run: function() {
-    var urlbar = document.getElementById("urlbar");
-    urlbar.addEventListener("onsearchcomplete", function() {
-      urlbar.removeEventListener("onsearchcomplete", arguments.callee, false);
-      runNextTest();
-    }, false);
-
-    urlbar.value = "example";
-    urlbar.select();
-    EventUtils.synthesizeKey("VK_RETURN", {});
+    var self = this;
+    var start = Date.now();
+    var acItemsCount = 1;
+    gURLBar.onSearchComplete = function() {
+      executeSoon(function() {
+        var duration = Date.now() - start;
+        self.times.push(duration);
+        if (self.times.length == TEST_REPEAT_COUNT)
+          self.finish();
+        else
+          self.run();
+      });
+    };
+    window.focus();
+    gURLBar.focus();
+    var synthesizeSearch = function() {
+      EventUtils.synthesizeKey("VK_BACK_SPACE", {});
+      EventUtils.synthesizeKey("e", {});
+    };
+    waitForFocus(synthesizeSearch);
+  },
+  finish: function() {
+    gURLBar.value = "";
+    processTestResult(this);
+    setTimeout(runNextTest, 0);
   }
 });
 
+function processTestResult(aTest) {
+  aTest.times.sort();  // sort the scores
+  aTest.times.pop();   // remove worst
+  aTest.times.shift(); // remove best
+  var totalDuration = aTest.times.reduce(function(time, total){ return time + total; });
+  var avgDuration = totalDuration/aTest.times.length;
+  var report = make_test_report(aTest.name, avgDuration);
+  ok(true, report);
+}
+
 function test() {
   // kick off tests
-  runNextTest();
+  setTimeout(runNextTest, 0);
 }
 
 function runNextTest() {
   if (ptests.length > 0)
     ptests.shift().run();
-  else
+  else {
+    gURLBar.onSearchComplete = onSearchComplete;
     finish();
+  }
 }

browser/components/places/tests/perf/perf_large_delete.xul

@@ -87,7 +87,7 @@ function test()
   // Close the window if it's already open
   let wm = Cc["@mozilla.org/appshell/window-mediator;1"].
            getService(Ci.nsIWindowMediator);
-  let win = wm.getMostRecentWindow("Places:Orgainzier");
+  let win = wm.getMostRecentWindow("Places:Organizer");
   if (win)
     win.close();