Bug 1207491 - Part 11: Remove use of expression closure from browser/components/places/tests/. r=Gijs
authorTooru Fujisawa <arai_a@mac.com>
Wed, 23 Sep 2015 18:36:22 +0900
changeset 264348 e43fb887ab355e7fce7c9be597aa98899688c41e
parent 264347 65ecd4b86b76bdeebbe48969acb1fb1806aca9d0
child 264349 de798053a05980fe11403ff83dfc66dd3d552a51
push id65606
push userarai_a@mac.com
push dateFri, 25 Sep 2015 08:14:49 +0000
treeherdermozilla-inbound@e4f5f909df68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1207491
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1207491 - Part 11: Remove use of expression closure from browser/components/places/tests/. r=Gijs
browser/components/places/tests/browser/browser_library_search.js
browser/components/places/tests/browser/browser_toolbar_migration.js
browser/components/places/tests/unit/test_PUIU_makeTransaction.js
--- a/browser/components/places/tests/browser/browser_library_search.js
+++ b/browser/components/places/tests/browser/browser_library_search.js
@@ -144,17 +144,17 @@ function search(aFolderId, aSearchStr, a
   }
 }
 
 /**
  * test() contains window-launching boilerplate that calls this to really kick
  * things off.  Add functions to the testCases array, and this will call them.
  */
 function onLibraryAvailable() {
-  testCases.forEach(function (aTest) aTest());
+  testCases.forEach(aTest => aTest());
 
   gLibrary.close();
   gLibrary = null;
 
   // Cleanup.
   PlacesUtils.tagging.untagURI(PlacesUtils._uri(TEST_URL), ["dummyTag"]);
   PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
   PlacesTestUtils.clearHistory().then(finish);
--- a/browser/components/places/tests/browser/browser_toolbar_migration.js
+++ b/browser/components/places/tests/browser/browser_toolbar_migration.js
@@ -5,17 +5,19 @@
 /**
  * Tests PersonalToolbar migration path.
  */
 var bg = Cc["@mozilla.org/browser/browserglue;1"].getService(Ci.nsIObserver);
 var gOriginalMigrationVersion;
 const BROWSER_URL = getBrowserURL();
 
 var localStore = {
-  get xulStore() Cc["@mozilla.org/xul/xulstore;1"].getService(Ci.nsIXULStore),
+  get xulStore() {
+    return Cc["@mozilla.org/xul/xulstore;1"].getService(Ci.nsIXULStore);
+  },
 
   getValue: function getValue(aProperty)
   {
     return this.xulStore.getValue(BROWSER_URL, "PersonalToolbar", aProperty);
   },
 
   setValue: function setValue(aProperty, aValue)
   {
--- a/browser/components/places/tests/unit/test_PUIU_makeTransaction.js
+++ b/browser/components/places/tests/unit/test_PUIU_makeTransaction.js
@@ -10,47 +10,57 @@ function waitForBookmarkNotification(aNo
           (!aProperty || aProperty == aData.property)) {
         PlacesUtils.bookmarks.removeObserver(this);
         aCallback(aData);
       }
     },
 
     // nsINavBookmarkObserver
     QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver]),
-    onBeginUpdateBatch: function onBeginUpdateBatch()
-      this.validate(arguments.callee.name, arguments),
-    onEndUpdateBatch: function onEndUpdateBatch()
-      this.validate(arguments.callee.name, arguments),
+    onBeginUpdateBatch: function onBeginUpdateBatch() {
+      return this.validate(arguments.callee.name, arguments);
+    },
+    onEndUpdateBatch: function onEndUpdateBatch() {
+      return this.validate(arguments.callee.name, arguments);
+    },
     onItemAdded: function onItemAdded(aItemId, aParentId, aIndex, aItemType,
                                       aURI, aTitle)
     {
       return this.validate(arguments.callee.name, { id: aItemId,
                                                     index: aIndex,
                                                     type: aItemType,
                                                     url: aURI ? aURI.spec : null,
                                                     title: aTitle });
     },
-    onItemRemoved: function onItemRemoved()
-      this.validate(arguments.callee.name, arguments),
+    onItemRemoved: function onItemRemoved() {
+      return this.validate(arguments.callee.name, arguments);
+    },
     onItemChanged: function onItemChanged(aItemId, aProperty, aIsAnno,
                                           aNewValue, aLastModified, aItemType)
     {
       return this.validate(arguments.callee.name,
                            { id: aItemId,
-                             get index() PlacesUtils.bookmarks.getItemIndex(this.id),
+                             get index() {
+                               return PlacesUtils.bookmarks.getItemIndex(this.id);
+                             },
                              type: aItemType,
                              property: aProperty,
-                             get url() aItemType == PlacesUtils.bookmarks.TYPE_BOOKMARK ?
-                                                PlacesUtils.bookmarks.getBookmarkURI(this.id).spec :
-                                                null,
-                             get title() PlacesUtils.bookmarks.getItemTitle(this.id),
+                             get url() {
+                               return aItemType == PlacesUtils.bookmarks.TYPE_BOOKMARK ?
+                                      PlacesUtils.bookmarks.getBookmarkURI(this.id).spec :
+                                      null;
+                             },
+                             get title() {
+                               return PlacesUtils.bookmarks.getItemTitle(this.id);
+                             },
                            });
     },
-    onItemVisited: function onItemVisited()
-      this.validate(arguments.callee.name, arguments),
+    onItemVisited: function onItemVisited() {
+      return this.validate(arguments.callee.name, arguments);
+    },
     onItemMoved: function onItemMoved(aItemId, aOldParentId, aOldIndex,
                                       aNewParentId, aNewIndex, aItemType)
     {
       this.validate(arguments.callee.name, { id: aItemId,
                                              index: aNewIndex,
                                              type: aItemType });
     }
   }, false);