Bug 1780071 - autofix browser/ violations of no-comparison-or-assignment-inside-ok, r=Standard8,webcompat-reviewers,extension-reviewers,settings-reviewers,credential-management-reviewers,fxview-reviewers,sessionstore-reviewers,places-reviewers,sgalich,dao,twisniewski,mconley,sclements

Differential Revision: https://phabricator.services.mozilla.com/D198974

Author: gijsk

browser/base/content/test/about/browser_aboutCertError_offlineSupport.js

@@ -28,8 +28,9 @@ add_task(async function testOfflineSupportPage() {
 
       let learnMoreLink = doc.getElementById("learnMoreLink");
       let supportPageURL = learnMoreLink.getAttribute("href");
-      ok(
-        supportPageURL == expectedURL + "time-errors",
+      Assert.equal(
+        supportPageURL,
+        expectedURL + "time-errors",
         "Correct support page URL has been set"
       );
       await EventUtils.synthesizeMouseAtCenter(learnMoreLink, {}, content);

browser/base/content/test/about/browser_aboutNetError_native_fallback.js

@@ -30,8 +30,9 @@ async function verifyLoad(url, testName) {
 
   await SpecialPowers.spawn(browser, [{ url, testName }], function (args) {
     const doc = content.document;
-    ok(
-      doc.documentURI == args.url,
+    Assert.equal(
+      doc.documentURI,
+      args.url,
       "Should have loaded page: " + args.testName
     );
   });
@@ -84,8 +85,9 @@ async function verifyError(url, fallbackWarning, testName) {
           "Correct fallback warning error page title is set: " + args.testName
         );
       } else {
-        ok(
-          actualDataL10nID != "dns-not-found-native-fallback-title2",
+        Assert.notEqual(
+          actualDataL10nID,
+          "dns-not-found-native-fallback-title2",
           "Should not show fallback warning: " + args.testName
         );
       }

browser/base/content/test/alerts/browser_notification_close.js

@@ -88,8 +88,9 @@ add_task(async function test_notificationClose() {
       let currentTime = alertWindow.Date.now();
       // The notification will self-close at 12 seconds, so this checks
       // that the notification closed before the timeout.
-      ok(
-        currentTime - closedTime < 5000,
+      Assert.less(
+        currentTime - closedTime,
+        5000,
         "Close requested at " +
           closedTime +
           ", actually closed at " +

browser/base/content/test/captivePortal/browser_captivePortalTabReference.js

@@ -21,11 +21,12 @@ async function checkCaptivePortalTabReference(evt, currState) {
   gBrowser.removeTab(errorTab);
 
   await portalDetected();
-  ok(CPS.state == CPS.LOCKED_PORTAL, "Captive portal is locked again");
+  Assert.equal(CPS.state, CPS.LOCKED_PORTAL, "Captive portal is locked again");
   errorTab = await openCaptivePortalErrorTab();
   let portalTab2 = await openCaptivePortalLoginTab(errorTab);
-  ok(
-    portalTab != portalTab2,
+  Assert.notEqual(
+    portalTab,
+    portalTab2,
     "waitForNewTab in openCaptivePortalLoginTab should not have completed at this point if references were held to the old captive portal tab after login/abort."
   );
   gBrowser.removeTab(portalTab);

browser/base/content/test/forms/browser_selectpopup.js

@@ -724,14 +724,14 @@ add_task(async function test_somehidden() {
   let selectPopup = await openSelectPopup("click");
 
   // The exact number is not needed; just ensure the height is larger than 4 items to accommodate any popup borders.
-  ok(
-    selectPopup.getBoundingClientRect().height >=
-      selectPopup.lastElementChild.getBoundingClientRect().height * 4,
+  Assert.greaterOrEqual(
+    selectPopup.getBoundingClientRect().height,
+    selectPopup.lastElementChild.getBoundingClientRect().height * 4,
     "Height contains at least 4 items"
   );
-  ok(
-    selectPopup.getBoundingClientRect().height <
-      selectPopup.lastElementChild.getBoundingClientRect().height * 5,
+  Assert.less(
+    selectPopup.getBoundingClientRect().height,
+    selectPopup.lastElementChild.getBoundingClientRect().height * 5,
     "Height doesn't contain 5 items"
   );
 
@@ -823,8 +823,9 @@ add_task(async function test_zoom() {
     );
     info("Zoomed font-size is " + zoomedFontSize);
 
-    ok(
-      Math.abs(zoomedFontSize - nonZoomedFontSize * 2.0) < 0.01,
+    Assert.less(
+      Math.abs(zoomedFontSize - nonZoomedFontSize * 2.0),
+      0.01,
       `Zoom should affect menu popup size, got ${zoomedFontSize}, ` +
         `expected ${nonZoomedFontSize * 2.0}`
     );

browser/base/content/test/forms/browser_selectpopup_large.js

@@ -219,12 +219,14 @@ async function performLargePopupTests(win) {
     let rect = selectPopup.getBoundingClientRect();
     let marginBottom = parseFloat(getComputedStyle(selectPopup).marginBottom);
     let marginTop = parseFloat(getComputedStyle(selectPopup).marginTop);
-    ok(
-      rect.top - marginTop >= browserRect.top,
+    Assert.greaterOrEqual(
+      rect.top - marginTop,
+      browserRect.top,
       "Popup top position in within browser area"
     );
-    ok(
-      rect.bottom + marginBottom <= browserRect.bottom,
+    Assert.lessOrEqual(
+      rect.bottom + marginBottom,
+      browserRect.bottom,
       "Popup bottom position in within browser area"
     );
 

browser/base/content/test/general/browser_alltabslistener.js

@@ -133,8 +133,9 @@ var gAllProgressListener = {
 };
 
 function assertCorrectBrowserAndEventOrderForAll(aState, aBrowser) {
-  ok(
-    aBrowser == gTestBrowser,
+  Assert.equal(
+    aBrowser,
+    gTestBrowser,
     aState + " notification came from the correct browser"
   );
   Assert.less(

browser/base/content/test/general/browser_bug356571.js

@@ -53,8 +53,9 @@ var gProgressListener = {
       // Check we failed on unknown protocol (received an alert from docShell)
       ok(didFail, "Correctly failed on unknown protocol");
       // Check we opened all tabs
-      ok(
-        gBrowser.tabs.length == kURIs.length,
+      Assert.equal(
+        gBrowser.tabs.length,
+        kURIs.length,
         "Correctly opened all expected tabs"
       );
       finishTest();

browser/base/content/test/general/browser_drag.js

@@ -22,7 +22,7 @@ async function test() {
     },
     expected
   );
-  ok(result === true, "dragging dataTransfer should be expected");
+  Assert.strictEqual(result, true, "dragging dataTransfer should be expected");
   gURLBar.setPageProxyState(oldstate);
   // Now, the identity information panel is opened by the proxy icon click.
   // We need to close it for next tests.

browser/base/content/test/general/browser_gestureSupport.js

@@ -409,7 +409,8 @@ async function test_emitLatchedEvents(eventPrefix, initialDelta, cmd) {
     cmd[dir].callCount = expect[dir] = 0;
   }
 
-  let check = (aDir, aMsg) => ok(cmd[aDir].callCount == expect[aDir], aMsg);
+  let check = (aDir, aMsg) =>
+    Assert.equal(cmd[aDir].callCount, expect[aDir], aMsg);
   let checkBoth = function (aNum, aInc, aDec) {
     let prefix = "Step " + aNum + ": ";
     check("inc", prefix + aInc);
@@ -633,8 +634,8 @@ async function test_thresholdGesture(gesture, inc, dec, eventPrefix) {
     0,
     0
   );
-  ok(cmdInc.callCount == 0, "Increasing command was triggered");
-  ok(cmdDec.callCount == 0, "Decreasing command was triggered");
+  Assert.equal(cmdInc.callCount, 0, "Increasing command was triggered");
+  Assert.equal(cmdDec.callCount, 0, "Decreasing command was triggered");
 
   // Now trigger the threshold.
   cmdInc.callCount = cmdDec.callCount = 0;
@@ -648,8 +649,8 @@ async function test_thresholdGesture(gesture, inc, dec, eventPrefix) {
     0,
     0
   );
-  ok(cmdInc.callCount == 1, "Increasing command was not triggered");
-  ok(cmdDec.callCount == 0, "Decreasing command was triggered");
+  Assert.equal(cmdInc.callCount, 1, "Increasing command was not triggered");
+  Assert.equal(cmdDec.callCount, 0, "Decreasing command was triggered");
 
   // The tracking counter should go to zero. Go back the other way and
   // stop short of triggering the threshold.
@@ -664,8 +665,8 @@ async function test_thresholdGesture(gesture, inc, dec, eventPrefix) {
     0,
     0
   );
-  ok(cmdInc.callCount == 0, "Increasing command was triggered");
-  ok(cmdDec.callCount == 0, "Decreasing command was triggered");
+  Assert.equal(cmdInc.callCount, 0, "Increasing command was triggered");
+  Assert.equal(cmdDec.callCount, 0, "Decreasing command was triggered");
 
   // Now cross the threshold and trigger the decreasing command.
   cmdInc.callCount = cmdDec.callCount = 0;
@@ -679,8 +680,8 @@ async function test_thresholdGesture(gesture, inc, dec, eventPrefix) {
     0,
     0
   );
-  ok(cmdInc.callCount == 0, "Increasing command was triggered");
-  ok(cmdDec.callCount == 1, "Decreasing command was not triggered");
+  Assert.equal(cmdInc.callCount, 0, "Increasing command was triggered");
+  Assert.equal(cmdDec.callCount, 1, "Decreasing command was not triggered");
 
   // Send the wrap-up event. No commands should trigger.
   cmdInc.callCount = cmdDec.callCount = 0;
@@ -694,8 +695,8 @@ async function test_thresholdGesture(gesture, inc, dec, eventPrefix) {
     0,
     0
   );
-  ok(cmdInc.callCount == 0, "Increasing command was triggered");
-  ok(cmdDec.callCount == 0, "Decreasing command was triggered");
+  Assert.equal(cmdInc.callCount, 0, "Increasing command was triggered");
+  Assert.equal(cmdDec.callCount, 0, "Decreasing command was triggered");
 
   // Restore the gesture to its original configuration.
   Services.prefs.setBoolPref(branch + "latched", oldLatchedValue);
@@ -738,10 +739,10 @@ async function test_swipeGestures() {
     0,
     0
   );
-  ok(cmdUp.callCount == 1, "Step 1: Up command was not triggered");
-  ok(cmdDown.callCount == 0, "Step 1: Down command was triggered");
-  ok(cmdLeft.callCount == 0, "Step 1: Left command was triggered");
-  ok(cmdRight.callCount == 0, "Step 1: Right command was triggered");
+  Assert.equal(cmdUp.callCount, 1, "Step 1: Up command was not triggered");
+  Assert.equal(cmdDown.callCount, 0, "Step 1: Down command was triggered");
+  Assert.equal(cmdLeft.callCount, 0, "Step 1: Left command was triggered");
+  Assert.equal(cmdRight.callCount, 0, "Step 1: Right command was triggered");
 
   // DOWN
   resetCounts();
@@ -755,10 +756,10 @@ async function test_swipeGestures() {
     0,
     0
   );
-  ok(cmdUp.callCount == 0, "Step 2: Up command was triggered");
-  ok(cmdDown.callCount == 1, "Step 2: Down command was not triggered");
-  ok(cmdLeft.callCount == 0, "Step 2: Left command was triggered");
-  ok(cmdRight.callCount == 0, "Step 2: Right command was triggered");
+  Assert.equal(cmdUp.callCount, 0, "Step 2: Up command was triggered");
+  Assert.equal(cmdDown.callCount, 1, "Step 2: Down command was not triggered");
+  Assert.equal(cmdLeft.callCount, 0, "Step 2: Left command was triggered");
+  Assert.equal(cmdRight.callCount, 0, "Step 2: Right command was triggered");
 
   // LEFT
   resetCounts();
@@ -772,10 +773,10 @@ async function test_swipeGestures() {
     0,
     0
   );
-  ok(cmdUp.callCount == 0, "Step 3: Up command was triggered");
-  ok(cmdDown.callCount == 0, "Step 3: Down command was triggered");
-  ok(cmdLeft.callCount == 1, "Step 3: Left command was not triggered");
-  ok(cmdRight.callCount == 0, "Step 3: Right command was triggered");
+  Assert.equal(cmdUp.callCount, 0, "Step 3: Up command was triggered");
+  Assert.equal(cmdDown.callCount, 0, "Step 3: Down command was triggered");
+  Assert.equal(cmdLeft.callCount, 1, "Step 3: Left command was not triggered");
+  Assert.equal(cmdRight.callCount, 0, "Step 3: Right command was triggered");
 
   // RIGHT
   resetCounts();
@@ -789,10 +790,14 @@ async function test_swipeGestures() {
     0,
     0
   );
-  ok(cmdUp.callCount == 0, "Step 4: Up command was triggered");
-  ok(cmdDown.callCount == 0, "Step 4: Down command was triggered");
-  ok(cmdLeft.callCount == 0, "Step 4: Left command was triggered");
-  ok(cmdRight.callCount == 1, "Step 4: Right command was not triggered");
+  Assert.equal(cmdUp.callCount, 0, "Step 4: Up command was triggered");
+  Assert.equal(cmdDown.callCount, 0, "Step 4: Down command was triggered");
+  Assert.equal(cmdLeft.callCount, 0, "Step 4: Left command was triggered");
+  Assert.equal(
+    cmdRight.callCount,
+    1,
+    "Step 4: Right command was not triggered"
+  );
 
   // Make sure combinations do not trigger events.
   let combos = [up | left, up | right, down | left, down | right];
@@ -808,11 +813,24 @@ async function test_swipeGestures() {
       0,
       0
     );
-    ok(cmdUp.callCount == 0, "Step 5-" + i + ": Up command was triggered");
-    ok(cmdDown.callCount == 0, "Step 5-" + i + ": Down command was triggered");
-    ok(cmdLeft.callCount == 0, "Step 5-" + i + ": Left command was triggered");
-    ok(
-      cmdRight.callCount == 0,
+    Assert.equal(
+      cmdUp.callCount,
+      0,
+      "Step 5-" + i + ": Up command was triggered"
+    );
+    Assert.equal(
+      cmdDown.callCount,
+      0,
+      "Step 5-" + i + ": Down command was triggered"
+    );
+    Assert.equal(
+      cmdLeft.callCount,
+      0,
+      "Step 5-" + i + ": Left command was triggered"
+    );
+    Assert.equal(
+      cmdRight.callCount,
+      0,
       "Step 5-" + i + ": Right command was triggered"
     );
   }

browser/base/content/test/general/browser_lastAccessedTab.js

@@ -8,7 +8,11 @@ const CURRENT_TIME_TOLERANCE_MS = 15;
 
 function isCurrent(tab, msg) {
   const DIFF = Math.abs(Date.now() - tab.lastAccessed);
-  ok(DIFF <= CURRENT_TIME_TOLERANCE_MS, msg + " (difference: " + DIFF + ")");
+  Assert.lessOrEqual(
+    DIFF,
+    CURRENT_TIME_TOLERANCE_MS,
+    msg + " (difference: " + DIFF + ")"
+  );
 }
 
 function nextStep(fn) {
@@ -41,15 +45,20 @@ function step2() {
 }
 
 function step3() {
-  ok(newTab.lastAccessed < Date.now(), "new tab hasn't been selected so far");
+  Assert.less(
+    newTab.lastAccessed,
+    Date.now(),
+    "new tab hasn't been selected so far"
+  );
   gBrowser.selectedTab = newTab;
   isCurrent(newTab, "new tab has the current timestamp after being selected");
   nextStep(step4);
 }
 
 function step4() {
-  ok(
-    originalTab.lastAccessed < Date.now(),
+  Assert.less(
+    originalTab.lastAccessed,
+    Date.now(),
     "original tab has old timestamp after being deselected"
   );
   isCurrent(

browser/base/content/test/notificationbox/browser_tabnotificationbox_switch_tabs.js

@@ -15,8 +15,9 @@ function assertNotificationBoxHidden(reason, browser) {
   ok(name, `Notification box has a name ${reason}`);
 
   let { selectedViewName } = notificationBox._stack.parentElement;
-  ok(
-    selectedViewName != name,
+  Assert.notEqual(
+    selectedViewName,
+    name,
     `Box is not shown ${reason} ${selectedViewName} != ${name}`
   );
 }

browser/base/content/test/pageinfo/browser_pageinfo_iframe_media.js

@@ -20,8 +20,9 @@ add_task(async function test_all_images_mentioned() {
       let imageRowsNum = imageTree.view.rowCount;
 
       ok(imageTree, "Image tree is null (media tab is broken)");
-      ok(
-        imageRowsNum == 2,
+      Assert.equal(
+        imageRowsNum,
+        2,
         "Number of media items listed: " + imageRowsNum + ", should be 2"
       );
 

browser/base/content/test/pageinfo/browser_pageinfo_images.js

@@ -21,8 +21,9 @@ add_task(async function test_all_images_mentioned() {
 
       ok(imageTree, "Image tree is null (media tab is broken)");
 
-      ok(
-        imageRowsNum == 7,
+      Assert.equal(
+        imageRowsNum,
+        7,
         "Number of images listed: " + imageRowsNum + ", should be 7"
       );
 

browser/base/content/test/performance/browser_startup_content_mainthreadio.js

@@ -410,7 +410,11 @@ add_task(async function () {
         } else {
           message += `${entry[op] * -1} more times than expected`;
         }
-        ok(entry[op] >= 0, `${message} in ${procName} process`);
+        Assert.greaterOrEqual(
+          entry[op],
+          0,
+          `${message} in ${procName} process`
+        );
       }
       if (!("_used" in entry) && !entry.ignoreIfUnused) {
         ok(