Bug 683159: Remove SimpleTest.expectAssertions() calls no longer needed due to SpecialPowers.gc() added in changeset 67060725ec8d.

2013-02-28 21:35:26 -08:00 · 2013-02-28 21:35:26 -08:00 · 90cdff94bb
--- a/toolkit/content/tests/chrome/test_bug471776.xul
+++ b/toolkit/content/tests/chrome/test_bug471776.xul
@ -30,11 +30,6 @@

  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[
-
-    if (navigator.platform.startsWith("Mac")) {
-      SimpleTest.expectAssertions(0, 5);
-    }
-
    SimpleTest.waitForExplicitFinish();

    function doTest() {
--- a/toolkit/content/tests/chrome/test_bug509732.xul
+++ b/toolkit/content/tests/chrome/test_bug509732.xul
@ -17,9 +17,6 @@
  <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
-
-SimpleTest.expectAssertions(0, 7);
-
 var gNotificationBox;

 // Tests that a notification that is added in an hidden box didn't throw the animation
--- a/toolkit/content/tests/chrome/test_bug554279.xul
+++ b/toolkit/content/tests/chrome/test_bug554279.xul
@ -19,14 +19,6 @@
  
  <!-- test code goes here -->
  <script type="text/javascript"><![CDATA[
-    if (navigator.platform.startsWith("Mac")) {
-      SimpleTest.expectAssertions(0, 5);
-    } else if (navigator.platform.startsWith("Linux")) {
-      SimpleTest.expectAssertions(0, 3);
-    } else if (navigator.platform.startsWith("Win")) {
-      SimpleTest.expectAssertions(0, 1);
-    }
-
    var toolbar = $("tb1");

    ok(toolbar, "got the toolbar, triggering the xbl constructor");
--- a/toolkit/content/tests/chrome/test_bug557987.xul
+++ b/toolkit/content/tests/chrome/test_bug557987.xul
@ -22,10 +22,6 @@
 <script type="application/javascript">
 <![CDATA[

-if (!navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 5);
-}
-
 SimpleTest.waitForExplicitFinish();

 SimpleTest.waitForFocus(test);
--- a/toolkit/content/tests/chrome/test_bug562554.xul
+++ b/toolkit/content/tests/chrome/test_bug562554.xul
@ -26,12 +26,6 @@
 <script type="application/javascript">
 <![CDATA[

-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
-} else if (navigator.platform.startsWith("Mac")) {
-  SimpleTest.expectAssertions(0, 5);
-}
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(test);

--- a/toolkit/content/tests/chrome/test_bug570192.xul
+++ b/toolkit/content/tests/chrome/test_bug570192.xul
@ -35,14 +35,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=570192
  <script type="application/javascript">
    <![CDATA[

-    if (navigator.platform.startsWith("Mac")) {
-      SimpleTest.expectAssertions(0, 3);
-    } else if (navigator.platform.startsWith("Linux")) {
-      SimpleTest.expectAssertions(0, 5);
-    } else if (navigator.platform.startsWith("Win")) {
-      SimpleTest.expectAssertions(0, 1);
-    }
-
    addLoadEvent(function() {
      try {
        var content = document.getElementById("content");
--- a/toolkit/content/tests/chrome/test_bug585946.xul
+++ b/toolkit/content/tests/chrome/test_bug585946.xul
@ -23,10 +23,6 @@
  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[

-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 5);
-}
-
 SimpleTest.waitForExplicitFinish();

 function startTest() {
--- a/toolkit/content/tests/chrome/test_bug624329.xul
+++ b/toolkit/content/tests/chrome/test_bug624329.xul
@ -21,8 +21,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=624329
  <![CDATA[
  /** Test for Bug 624329 **/

-SimpleTest.expectAssertions(0, 5);
-
 SimpleTest.waitForExplicitFinish();

 var win;
--- a/toolkit/content/tests/chrome/test_bug792324.xul
+++ b/toolkit/content/tests/chrome/test_bug792324.xul
@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=792324

 <script class="testbody" type="application/javascript;version=1.7"><![CDATA[

-SimpleTest.expectAssertions(0, 7);
+SimpleTest.expectAssertions(0, 2);

 /** Test for Bug 792324 **/
 let after_click;
--- a/toolkit/content/tests/chrome/test_button.xul
+++ b/toolkit/content/tests/chrome/test_button.xul
@ -28,8 +28,6 @@
 <script type="application/javascript">
 <![CDATA[

-SimpleTest.expectAssertions(0, 7);
-
 SimpleTest.waitForExplicitFinish();

 function test_button()
--- a/toolkit/content/tests/chrome/test_chromemargin.xul
+++ b/toolkit/content/tests/chrome/test_chromemargin.xul
@ -17,10 +17,6 @@

 // Tests parsing of the chrome margin attrib on a window.

-if (!navigator.platform.startsWith("Mac")) {
-  SimpleTest.expectAssertions(0, 5);
-}
-
 SimpleTest.waitForExplicitFinish();
 function runTest()
 {
--- a/toolkit/content/tests/chrome/test_closemenu_attribute.xul
+++ b/toolkit/content/tests/chrome/test_closemenu_attribute.xul
@ -28,7 +28,7 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-SimpleTest.expectAssertions(0, 7);
+SimpleTest.expectAssertions(0, 2);

 SimpleTest.waitForExplicitFinish();

--- a/toolkit/content/tests/chrome/test_colorpicker_popup.xul
+++ b/toolkit/content/tests/chrome/test_colorpicker_popup.xul
@ -21,7 +21,7 @@
 var gTestPhase = -1;
 var gCp = null;

-SimpleTest.expectAssertions(0, 7);
+SimpleTest.expectAssertions(0, 2);

 SimpleTest.waitForExplicitFinish();

--- a/toolkit/content/tests/chrome/test_contextmenu_list.xul
+++ b/toolkit/content/tests/chrome/test_contextmenu_list.xul
@ -73,10 +73,8 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 5);
-} else {
-  SimpleTest.expectAssertions(0, 7);
+if (!navigator.platform.startsWith("Linux")) {
+  SimpleTest.expectAssertions(0, 2);
 }

 SimpleTest.waitForExplicitFinish();
--- a/toolkit/content/tests/chrome/test_datepicker.xul
+++ b/toolkit/content/tests/chrome/test_datepicker.xul
@ -37,8 +37,6 @@
 <script>
 <![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 var mouseScrolled = false;

 SimpleTest.waitForExplicitFinish();
--- a/toolkit/content/tests/chrome/test_deck.xul
+++ b/toolkit/content/tests/chrome/test_deck.xul
@ -27,8 +27,6 @@
  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 SimpleTest.waitForExplicitFinish();

 function test_deck()
--- a/toolkit/content/tests/chrome/test_dialogfocus.xul
+++ b/toolkit/content/tests/chrome/test_dialogfocus.xul
@ -23,8 +23,6 @@
 <script>
 <![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 SimpleTest.waitForExplicitFinish();

 var expected = [ "one", "_extra2", "tab", "one", "tabbutton2", "tabbutton", "two", "textbox-yes", "one" ];
--- a/toolkit/content/tests/chrome/test_findbar.xul
+++ b/toolkit/content/tests/chrome/test_findbar.xul
@ -28,8 +28,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=288254
 <script class="testbody" type="application/javascript">
 <![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 /** Test for Bug 288254 **/
 SimpleTest.waitForExplicitFinish();
 window.open("findbar_window.xul", "findbartest", 
--- a/toolkit/content/tests/chrome/test_findbar_events.xul
+++ b/toolkit/content/tests/chrome/test_findbar_events.xul
@ -30,12 +30,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=793275
  <script class="testbody" type="application/javascript">
    <![CDATA[

-      if (navigator.platform.startsWith("Mac")) {
-        SimpleTest.expectAssertions(0, 4);
-      } else {
-        SimpleTest.expectAssertions(0, 2);
-      }
-
      /** Test for Bug 793275 **/
      SimpleTest.waitForExplicitFinish();
      window.open("findbar_events_window.xul", "793275test",
--- a/toolkit/content/tests/chrome/test_focus_anons.xul
+++ b/toolkit/content/tests/chrome/test_focus_anons.xul
@ -24,8 +24,6 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 SimpleTest.waitForExplicitFinish();

 var gBlurs = 0, gFocuses = 0;
--- a/toolkit/content/tests/chrome/test_hiddenitems.xul
+++ b/toolkit/content/tests/chrome/test_hiddenitems.xul
@ -38,8 +38,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=317422
  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[

-SimpleTest.expectAssertions(0, 5);
-
 /** Test for Bug 317422 **/
 SimpleTest.waitForExplicitFinish();

--- a/toolkit/content/tests/chrome/test_hiddenpaging.xul
+++ b/toolkit/content/tests/chrome/test_hiddenpaging.xul
@ -64,8 +64,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=317422
  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[

-SimpleTest.expectAssertions(0, 2);
-
 /** Test for Bug 317422 **/
 SimpleTest.waitForExplicitFinish();

--- a/toolkit/content/tests/chrome/test_keys.xul
+++ b/toolkit/content/tests/chrome/test_keys.xul
@ -10,7 +10,6 @@
          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

 <script>
-SimpleTest.expectAssertions(0, 3);
 SimpleTest.waitForExplicitFinish();
 function runTest()
 {
--- a/toolkit/content/tests/chrome/test_largemenu.xul
+++ b/toolkit/content/tests/chrome/test_largemenu.xul
@ -12,12 +12,6 @@
          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>

 <script>
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 2);
-} else {
-  SimpleTest.expectAssertions(0, 4);
-}
-
 SimpleTest.waitForExplicitFinish();
 function runTest()
 {
--- a/toolkit/content/tests/chrome/test_menu.xul
+++ b/toolkit/content/tests/chrome/test_menu.xul
@ -27,10 +27,6 @@
  <script class="testbody" type="application/javascript">
  <![CDATA[

-  if (navigator.platform.startsWith("Mac")) {
-    SimpleTest.expectAssertions(0, 2);
-  }
-
  SimpleTest.waitForExplicitFinish();

  function runTests()
--- a/toolkit/content/tests/chrome/test_menuchecks.xul
+++ b/toolkit/content/tests/chrome/test_menuchecks.xul
@ -36,10 +36,6 @@
  <script class="testbody" type="application/javascript">
  <![CDATA[

-  if (!navigator.platform.startsWith("Linux")) {
-    SimpleTest.expectAssertions(0, 3);
-  }
-
  SimpleTest.waitForExplicitFinish();
  var gTestIndex = 0;

--- a/toolkit/content/tests/chrome/test_menuitem_blink.xul
+++ b/toolkit/content/tests/chrome/test_menuitem_blink.xul
@ -16,10 +16,6 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 2);
-}
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(startTest);

--- a/toolkit/content/tests/chrome/test_menuitem_commands.xul
+++ b/toolkit/content/tests/chrome/test_menuitem_commands.xul
@ -11,10 +11,6 @@

 <script>
 <![CDATA[
-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 2);
-}
-
 SimpleTest.waitForExplicitFinish();

 function checkAttributes(elem, label, accesskey, disabled, hidden, isAfter)
--- a/toolkit/content/tests/chrome/test_menulist.xul
+++ b/toolkit/content/tests/chrome/test_menulist.xul
@ -79,10 +79,6 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-if (!navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 2);
-}
-
 SimpleTest.waitForExplicitFinish();

 function testtag_menulists()
--- a/toolkit/content/tests/chrome/test_menulist_keynav.xul
+++ b/toolkit/content/tests/chrome/test_menulist_keynav.xul
@ -23,10 +23,6 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[

-if (!navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 2);
-}
-
 SimpleTest.waitForExplicitFinish();

 var gShowPopup = false;
--- a/toolkit/content/tests/chrome/test_mousecapture.xul
+++ b/toolkit/content/tests/chrome/test_mousecapture.xul
@ -11,11 +11,7 @@
 <script>
 <![CDATA[

-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(6);
-} else {
-  SimpleTest.expectAssertions(6, 8);
-}
+SimpleTest.expectAssertions(6);

 SimpleTest.waitForExplicitFinish();

--- a/toolkit/content/tests/chrome/test_notificationbox.xul
+++ b/toolkit/content/tests/chrome/test_notificationbox.xul
@ -18,8 +18,6 @@

  <!-- test code goes here -->
  <script type="application/javascript"><![CDATA[
-SimpleTest.expectAssertions(0, 5);
-
 SimpleTest.waitForExplicitFinish();

 var testtag_notificationbox_buttons = [
--- a/toolkit/content/tests/chrome/test_panel.xul
+++ b/toolkit/content/tests/chrome/test_panel.xul
@ -12,10 +12,6 @@
          src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>

 <script>
-if (navigator.platform.startsWith("Mac")) {
-  SimpleTest.expectAssertions(0, 2);
-}
-
 SimpleTest.waitForExplicitFinish();
 function runTest()
 {