Backed out changeset 81156ff3f4fa (bug 1571656) for causing browser_PageActions.js and test_insertTree_fixupOrSkipInvalidEntries.js to perma fail CLOSED TREE

Author: SV-ACiure

browser/components/migration/tests/unit/test_IE_history.js

@@ -45,6 +45,6 @@ add_task(async function test_IE_history() {
     let entry = await PlacesUtils.history.fetch(url, { includeVisits: true });
     Assert.equal(entry.url, url, "Should have the correct URL");
     Assert.equal(entry.title, title, "Should have the correct title");
-    Assert.greater(entry.visits.length, 0, "Should have some visits");
+    Assert.ok(entry.visits.length > 0, "Should have some visits");
   }
 });

browser/components/places/tests/browser/browser_bookmarkProperties_bookmarkAllTabs.js

@@ -38,7 +38,7 @@ add_task(async function() {
     },
     dialog => {
       let savedItemId = dialog.gEditItemOverlay.itemId;
-      Assert.greater(savedItemId, 0, "Found the itemId");
+      Assert.ok(savedItemId > 0, "Found the itemId");
       return PlacesTestUtils.waitForNotification(
         "onItemRemoved",
         id => id === savedItemId

browser/components/places/tests/browser/browser_library_commands.js

@@ -145,7 +145,7 @@ add_task(async function test_query_on_toolbar() {
   });
 
   // Get first child and check it is the just inserted query.
-  Assert.greater(toolbarNode.childCount, 0, "Toolbar node has children");
+  Assert.ok(toolbarNode.childCount > 0, "Toolbar node has children");
   let queryNode = toolbarNode.getChild(0);
   Assert.equal(
     queryNode.title,

browser/components/places/tests/browser/browser_toolbar_overflow.js

@@ -132,7 +132,7 @@ add_task(async function test_separator_first() {
   await promiseReady;
 
   let children = gToolbarContent.children;
-  Assert.greater(children.length, 2, "Multiple elements are visible");
+  Assert.ok(children.length > 2, "Multiple elements are visible");
   Assert.equal(
     children[1]._placesNode.uri,
     "http://test.places.0/",

browser/components/sessionstore/test/browser_background_tab_crash.js

@@ -80,7 +80,7 @@ async function setupBackgroundTabs(testFn) {
  *        background state.
  */
 async function crashBackgroundTabs(tabs) {
-  Assert.greater(tabs.length, 0, "Need to crash at least one tab.");
+  Assert.ok(tabs.length > 0, "Need to crash at least one tab.");
   for (let tab of tabs) {
     Assert.ok(tab.linkedBrowser.isRemoteBrowser, "tab is remote");
   }

browser/components/urlbar/tests/browser/browser_restoreEmptyInput.js

@@ -21,7 +21,7 @@ add_task(async function test() {
   );
 
   let resultCount = UrlbarTestUtils.getResultCount(window);
-  Assert.greater(resultCount, 0, "At least one result");
+  Assert.ok(resultCount > 0, "At least one result");
 
   for (let i = 0; i < resultCount; i++) {
     EventUtils.synthesizeKey("KEY_ArrowDown");

browser/extensions/pdfjs/test/browser_pdfjs_main.js

@@ -62,11 +62,7 @@ add_task(async function test() {
         var viewBookmark = content.document.querySelector("a#viewBookmark");
         viewBookmark.click();
 
-        Assert.greater(
-          viewBookmark.href.length,
-          0,
-          "viewBookmark button has href"
-        );
+        Assert.ok(viewBookmark.href.length > 0, "viewBookmark button has href");
 
         var viewer = content.wrappedJSObject.PDFViewerApplication;
         await viewer.close();

browser/modules/test/browser/browser_PageActions.js

@@ -310,11 +310,7 @@ add_task(async function simple() {
   // unregister
   PageActions._actionsByID.delete(action.id);
   let index = PageActions._nonBuiltInActions.findIndex(a => a.id == action.id);
-  Assert.greaterEqual(
-    index,
-    0,
-    "Action should be in _nonBuiltInActions to begin with"
-  );
+  Assert.ok(index >= 0, "Action should be in _nonBuiltInActions to begin with");
   PageActions._nonBuiltInActions.splice(index, 1);
 
   // register again

browser/modules/test/browser/browser_UnsubmittedCrashHandler.js

@@ -575,7 +575,7 @@ add_task(async function test_dont_decrement_chances_on_same_day() {
   let initChances = UnsubmittedCrashHandler.prefs.getIntPref(
     "chancesUntilSuppress"
   );
-  Assert.greater(initChances, 1, "We should start with at least 1 chance.");
+  Assert.ok(initChances > 1, "We should start with at least 1 chance.");
 
   await createPendingCrashReports(1);
   let notification = await UnsubmittedCrashHandler.checkForUnsubmittedCrashReports();
@@ -625,7 +625,7 @@ add_task(async function test_decrement_chances_on_other_day() {
   let initChances = UnsubmittedCrashHandler.prefs.getIntPref(
     "chancesUntilSuppress"
   );
-  Assert.greater(initChances, 1, "We should start with at least 1 chance.");
+  Assert.ok(initChances > 1, "We should start with at least 1 chance.");
 
   await createPendingCrashReports(1);
   let notification = await UnsubmittedCrashHandler.checkForUnsubmittedCrashReports();

dom/tests/browser/perfmetrics/browser_test_performance_metrics.js

@@ -148,14 +148,14 @@ add_task(async function test() {
       let results = await ChromeUtils.requestPerformanceMetrics();
       exploreResults(results);
 
-      Assert.greater(workerDuration, 0, "Worker duration should be positive");
-      Assert.greater(workerTotal, 0, "Worker count should be positive");
-      Assert.greater(duration, 0, "Duration should be positive");
-      Assert.greater(total, 0, "Should get a positive count");
+      Assert.ok(workerDuration > 0, "Worker duration should be positive");
+      Assert.ok(workerTotal > 0, "Worker count should be positive");
+      Assert.ok(duration > 0, "Duration should be positive");
+      Assert.ok(total > 0, "Should get a positive count");
       Assert.ok(parentProcessEvent, "parent process sent back some events");
       Assert.ok(isTopLevel, "example.com as a top level window");
       Assert.ok(aboutMemoryFound, "about:memory");
-      Assert.greater(heapUsage, 0, "got some memory value reported");
+      Assert.ok(heapUsage > 0, "got some memory value reported");
       Assert.ok(sharedWorker, "We got some info from a shared worker");
       let numCounters = counterIds.length;
       Assert.ok(
@@ -185,8 +185,8 @@ add_task(async function test() {
         workerTotal > previousWorkerTotal,
         "Worker count should be positive"
       );
-      Assert.greater(duration, previousDuration, "Duration should be positive");
-      Assert.greater(total, previousTotal, "Should get a positive count");
+      Assert.ok(duration > previousDuration, "Duration should be positive");
+      Assert.ok(total > previousTotal, "Should get a positive count");
 
       // load a tab with a setInterval, we should get counters on TaskCategory::Timer
       await BrowserTestUtils.withNewTab(
@@ -196,7 +196,7 @@ add_task(async function test() {
           let previousTimerCalls = timerCalls;
           results = await ChromeUtils.requestPerformanceMetrics();
           exploreResults(results, tabId);
-          Assert.greater(timerCalls, previousTimerCalls, "Got timer calls");
+          Assert.ok(timerCalls > previousTimerCalls, "Got timer calls");
         }
       );
 
@@ -208,7 +208,7 @@ add_task(async function test() {
           let previousTimerCalls = timerCalls;
           results = await ChromeUtils.requestPerformanceMetrics();
           exploreResults(results, tabId);
-          Assert.greater(timerCalls, previousTimerCalls, "Got timer calls");
+          Assert.ok(timerCalls > previousTimerCalls, "Got timer calls");
         }
       );
 
@@ -219,7 +219,7 @@ add_task(async function test() {
           let tabId = gBrowser.selectedBrowser.outerWindowID;
           results = await ChromeUtils.requestPerformanceMetrics();
           exploreResults(results, tabId);
-          Assert.greater(mediaMemory, 0, "Got some memory used for media");
+          Assert.ok(mediaMemory > 0, "Got some memory used for media");
         }
       );
     }