Bug 404077: Annotate known assertions in mochitests.

accessible/tests/mochitest/actions/test_general.xul

@@ -21,6 +21,12 @@
 
   <script type="application/javascript">
   <![CDATA[
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    } else {
+      SimpleTest.expectAssertions(1);
+    }
+
     function doTest()
     {
       var actionsArray = [

accessible/tests/mochitest/actions/test_link.html

@@ -17,6 +17,14 @@
           src="../actions.js"></script>
 
   <script type="application/javascript">
+    if (navigator.platform.indexOf("Win") == 0) {
+      SimpleTest.expectAssertions(13);
+    } else if (navigator.platform.indexOf("Linux") == 0) {
+      SimpleTest.expectAssertions(18);
+    } else if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 14);
+    }
+
     function getAnchorTargetDocumentAcc()
     {
       var thisTabDocAcc = getTabDocAccessible();

accessible/tests/mochitest/attributes/test_obj.html

@@ -19,6 +19,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=558036
           src="../attributes.js"></script>
 
   <script type="application/javascript">
+    if (navigator.platform.indexOf("Linux") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    }
+
     function doTest()
     {
       // aria

accessible/tests/mochitest/editabletext/test_1.html

@@ -19,6 +19,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=452161
           src="editabletext.js"></script>
 
   <script type="application/javascript">
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 3);
+    } else {
+      SimpleTest.expectAssertions(3);
+    }
+
     function addTestEditable(aID, aTestRun, aTrailChar)
     {
       var et = new editableTextTest(aID);

accessible/tests/mochitest/events/test_focus_autocomplete.xul

@@ -32,6 +32,9 @@
 
   <script type="application/javascript">
   <![CDATA[
+    if (navigator.platform.indexOf("Mac") != 0) {
+      SimpleTest.expectAssertions(2);
+    }
     ////////////////////////////////////////////////////////////////////////////
     // Hacky stuffs
 

accessible/tests/mochitest/events/test_focus_browserui.xul

@@ -24,6 +24,9 @@
 
   <script type="application/javascript">
   <![CDATA[
+    if (navigator.platform.indexOf("Linux") == 0) {
+      SimpleTest.expectAssertions(1);
+    }
     ////////////////////////////////////////////////////////////////////////////
     // Helpers
 

accessible/tests/mochitest/events/test_focus_doc.html

@@ -21,6 +21,14 @@
       src="../states.js"></script>
 
   <script type="application/javascript">
+    if (navigator.platform.indexOf("Win") == 0) {
+      SimpleTest.expectAssertions(1, 2);
+    } else if (navigator.platform.indexOf("Linux") == 0) {
+      SimpleTest.expectAssertions(1);
+    } else if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    }
+
     var gQueue = null;
 
     //var gA11yEventDumpID = "eventdump";

accessible/tests/mochitest/relations/test_ui_modalprompt.html

@@ -22,6 +22,12 @@
           src="../browser.js"></script>
 
   <script type="application/javascript">
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    } else {
+      SimpleTest.expectAssertions(1);
+    }
+
     function hasTabModalPrompts() {
       try {
         return SpecialPowers.getBoolPref("prompts.tab_modal.enabled");

accessible/tests/mochitest/text/test_singleline.html

@@ -11,7 +11,12 @@
   <script type="application/javascript"
           src="../text.js"></script>
   <script type="application/javascript">
-    
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 23);
+    } else {
+      SimpleTest.expectAssertions(23);
+    }
+
     function doTest()
     {
       // __h__e__l__l__o__ __m__y__ __f__r__i__e__n__d__

accessible/tests/mochitest/text/test_whitespaces.html

@@ -13,7 +13,12 @@
   <script type="application/javascript"
           src="../text.js"></script>
   <script type="application/javascript">
-    
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 10);
+    } else {
+      SimpleTest.expectAssertions(10);
+    }
+
     function doTest()
     {
       // __B__r__a__v__e__ __S__i__r__ __ __R__o__b__i__n__ __ __ __r__a__n

accessible/tests/mochitest/text/test_words.html

@@ -12,7 +12,12 @@
   <script type="application/javascript"
           src="../text.js"></script>
   <script type="application/javascript">
-    
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    } else {
+      SimpleTest.expectAssertions(1);
+    }
+
     function doTest()
     {
       // "one two"

accessible/tests/mochitest/tree/test_dockids.html

@@ -16,6 +16,10 @@
           src="../states.js"></script>
 
   <script type="application/javascript">
+  if (navigator.platform.indexOf("Win") == 0) {
+    SimpleTest.expectAssertions(0, 1);
+  }
+
   function doTest()
   {
     var tree =

accessible/tests/mochitest/tree/test_txtctrl.xul

@@ -18,6 +18,11 @@
 
   <script type="application/javascript">
   <![CDATA[
+    if (navigator.platform.indexOf("Mac") == 0) {
+      SimpleTest.expectAssertions(0, 1);
+    } else {
+      SimpleTest.expectAssertions(1);
+    }
     ////////////////////////////////////////////////////////////////////////////
     // Test
 

caps/tests/mochitest/test_principal_extendedorigin_appid_appstatus.html

@@ -22,6 +22,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=758258
 
 var Ci = Components.interfaces;
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(2);
+}
+
 SimpleTest.waitForExplicitFinish();
 
 /*

content/base/test/test_bug527896.html

@@ -22,6 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=527896
 
 SimpleTest.waitForExplicitFinish();
 
+SimpleTest.expectAssertions(1);
+
 var docWrittenSrcExecuted = false;
 var scriptInsertedSrcExecuted = false;
 

content/base/test/test_bug548193.html

@@ -13,6 +13,8 @@
 <iframe style="width:200px;height:200px;" id='cspframe'></iframe>
 <script class="testbody" type="text/javascript">
 
+SimpleTest.expectAssertions(1);
+
 // This is used to watch requests go out so we can see if the report is
 // sent correctly
 function examiner() {

content/base/test/test_bug638112.html

@@ -16,6 +16,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=638112
 <pre id="test">
 <script type="text/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 638112 **/
 
 function run_test() {

content/base/test/test_mutationobservers.html

@@ -18,6 +18,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=641821
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  // for non-Windows
+  SimpleTest.expectAssertions(1);
+}
+
 /** Test for Bug 641821 **/
 
 var div = document.createElement("div");

content/events/test/test_bug457672.html

@@ -17,6 +17,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=457672
 <pre id="test">
 <script type="application/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 457672 **/
 
 var windowBlurCount = 0;

content/html/content/test/forms/test_meter_element.html

@@ -21,6 +21,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=657938
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+} else {
+  SimpleTest.expectAssertions(1);
+}
+
 /** Test for <meter> **/
 
 function checkFormIDLAttribute(aElement)

content/html/content/test/forms/test_progress_element.html

@@ -23,6 +23,8 @@ and
 <pre id="test">
 <script type="application/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for progress element content and layout **/
 
 function checkFormIDLAttribute(aElement)

content/html/content/test/test_bug242709.html

@@ -17,6 +17,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=242709
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 242709 **/
 
 SimpleTest.waitForExplicitFinish();

content/html/content/test/test_bug277890.html

@@ -17,6 +17,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=277890
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 277890 **/
 
 SimpleTest.waitForExplicitFinish();

content/html/content/test/test_bug523771.html

@@ -19,6 +19,13 @@ method="POST" enctype="multipart/form-data">
 </form>
 <pre id="test">
 <script class="testbody" type="text/javascript">
+
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+} else {
+  SimpleTest.expectAssertions(1);
+}
+
 var filesToKill = [];
 singleFileInput = document.getElementById('singleFile');
 multiFileInput = document.getElementById('multiFile');

content/html/content/test/test_iframe_sandbox_general.html

@@ -12,6 +12,9 @@ Implement HTML5 sandbox attribute for IFRAMEs - general tests
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <script type="application/javascript">
+
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs - general tests **/
 
 SimpleTest.waitForExplicitFinish();

content/html/content/test/test_iframe_sandbox_navigation.html

@@ -12,6 +12,9 @@ Implement HTML5 sandbox attribute for IFRAMEs
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <script type="application/javascript">
+
+SimpleTest.expectAssertions(1, 2);
+
 /** Test for Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs **/
 /** Navigation tests **/
 

content/html/document/test/test_bug391777.html

@@ -13,6 +13,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391777
 <p id="display"></p>
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  // not Windows
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 391777 **/
 var arg = {};
 arg.testVal = "foo";

content/html/document/test/test_bug402680.html

@@ -21,6 +21,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=402680
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 402680 **/
 
 ok(activeElementIsNull,

content/html/document/test/test_bug403868.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=403868
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 403868 **/
 function createSpan(id, insertionPoint) {
   var s = document.createElement("span");

content/html/document/test/test_bug446483.html

@@ -17,6 +17,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=446483
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  // not Windows
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 446483 **/
 
 function gc() {

content/html/document/test/test_bug448564.html

@@ -20,6 +20,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=448564
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+SimpleTest.expectAssertions(3);
+
 /** Test for Bug 448564 **/
 
 /**

content/html/document/test/test_bug478251.html

@@ -17,6 +17,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478251
 <pre id="test">
 <script type="application/javascript">
 
+SimpleTest.expectAssertions(10);
+
 /** Test for Bug 478251 **/
 var doc = $("t").contentDocument;
 doc.open();

content/html/document/test/test_bug741266.html

@@ -18,6 +18,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741266
 <pre id="test">
 <script type="application/javascript">
 
+SimpleTest.expectAssertions(1);
+
 /** Test for Bug 741266 **/
 var w = window.open("", "", "width=100,height=100");
 is(w.innerHeight, 100, "Popup height should be 100 when opened with window.open");

content/html/document/test/test_document-element-inserted.html

@@ -10,6 +10,11 @@
 </iframe>
 <pre id="test">
 <script class="testbody" type="text/javascript">
+
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 SimpleTest.waitForExplicitFinish();
 var loc;
 

content/media/test/test_bug495300.html

@@ -15,6 +15,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=495300
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") != 0) {
+  // not Mac
+  SimpleTest.expectAssertions(0, 1);
+}
+
 var manager = new MediaTestManager;
 
 function filename(uri) {

content/media/test/test_bug686942.html

@@ -15,6 +15,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=686942
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 var manager = new MediaTestManager;
 
 function onloaded(event) {

content/media/test/test_playback_rate.html

@@ -10,6 +10,10 @@
 <pre id="test">
 <script class="testbody" type='application/javascript;version=1.8'>
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 let manager = new MediaTestManager;
 
 function rangeCheck(lhs, rhs, threshold) {

content/media/test/test_seek.html

@@ -23,6 +23,8 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+SimpleTest.expectAssertions(120, 400);
+
 var manager = new MediaTestManager;
 
 const NUM_SEEK_TESTS = 13;

content/media/test/test_seek_out_of_range.html

@@ -10,6 +10,10 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 var manager = new MediaTestManager;
 
 // Test if the ended event works correctly.

content/xbl/test/test_bug378518.xul

@@ -45,6 +45,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=378518
   <!-- test code goes here -->
   <script type="application/javascript"> <![CDATA[
 
+    SimpleTest.expectAssertions(1);
+
     var myBoxClicked = false;
     var myCheckBoxClicked = false;
     var myExtendedBoxClicked = false;

content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul

@@ -49,6 +49,8 @@
 
 <script>
 <![CDATA[
+SimpleTest.expectAssertions(4);
+
 SimpleTest.waitForExplicitFinish();
 
 var testid ="listbox element";

content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul

@@ -26,6 +26,8 @@
 
 <script>
 <![CDATA[
+SimpleTest.expectAssertions(1, 2);
+
 SimpleTest.waitForExplicitFinish();
 
 copyToProfile('animals.sqlite');

docshell/test/chrome/test_bug303267.xul

@@ -28,6 +28,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=303267.xul
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
+SimpleTest.expectAssertions(0, 1);
+
 /** Test for Bug 303267 **/
 
 SimpleTest.waitForExplicitFinish();

docshell/test/chrome/test_bug456980.xul

@@ -20,6 +20,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=456980
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
+    SimpleTest.expectAssertions(1);
+
     SimpleTest.waitForExplicitFinish();
 
     addLoadEvent(function() {

docshell/test/chrome/test_bug608669.xul

@@ -39,6 +39,7 @@ function setCachePref(enabled) {
 }
 
 
+SimpleTest.expectAssertions(1);
 
     /** Test for Bug 608669 **/
 SimpleTest.waitForExplicitFinish();

docshell/test/chrome/test_mozFrameType.xul

@@ -27,6 +27,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=769771
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 769771 **/
 SimpleTest.waitForExplicitFinish();
 

docshell/test/navigation/test_child.html

@@ -9,6 +9,10 @@
       iframe { width: 90%; height: 50px; }
     </style>
 <script>
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 window.onload = function() {
   navigateByLocation(frames[0]);
   navigateByOpen("child1");

docshell/test/navigation/test_grandchild.html

@@ -9,6 +9,10 @@
       iframe { width: 90%; height: 200px; }
     </style>
 <script>
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 window.onload = function () {
   navigateByLocation(frames[0].frames[0]);
   navigateByOpen("child1_child0");

docshell/test/navigation/test_reserved.html

@@ -9,6 +9,10 @@
       iframe { width: 90%; height: 200px; }
     </style>
 <script>
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 function testTop() {
   window0 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#top,location", "_blank", "width=10,height=10");
 

docshell/test/test_bug580069.html

@@ -15,6 +15,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=580069
 <iframe id='iframe' src='file_bug580069_1.html'></iframe>
 
 <script type="application/javascript">
+
+SimpleTest.expectAssertions(1);
+
 SimpleTest.waitForExplicitFinish();
 
 var iframe = document.getElementById('iframe');

docshell/test/test_bug668513.html

@@ -8,6 +8,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=668513
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 <script>
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   function onload_test()
   {
     var win = frames[0];

dom/bindings/test/test_bug773326.html

@@ -5,6 +5,11 @@
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
 <script>
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+} else {
+  SimpleTest.expectAssertions(2);
+}
 test(function() {
   new Worker("data:text/javascript,new XMLHttpRequest(42)");
 }, "Should not crash")

dom/browser-element/mochitest/test_browserElement_inproc_PurgeHistory.html

@@ -7,6 +7,9 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
+<script type="application/javascript;version=1.7">
+SimpleTest.expectAssertions(1);
+</script>
 <script type="application/javascript;version=1.7" src="browserElement_PurgeHistory.js">
 </script>
 </body>

dom/encoding/test/test_TextDecoder.html

@@ -13,6 +13,8 @@
 <div id="log"></div>
 <script>
 
+SimpleTest.expectAssertions(0, 2);
+
 setup({explicit_done: true});
 runTest();
 

dom/encoding/test/test_TextEncoder.html

@@ -12,6 +12,12 @@
 <div id="log"></div>
 <script>
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+} else {
+  SimpleTest.expectAssertions(2);
+}
+
 setup({explicit_done: true});
 runTest();
 

dom/media/tests/mochitest/test_getUserMedia_basicAudio.html

@@ -20,6 +20,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an audio LocalMediaStream on an audio HTMLMediaElement.

dom/media/tests/mochitest/test_getUserMedia_basicVideo.html

@@ -20,6 +20,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an video LocalMediaStream on a video HTMLMediaElement.

dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html

@@ -20,6 +20,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for a video and audio LocalMediaStream on a video HTMLMediaElement.

dom/media/tests/mochitest/test_getUserMedia_exceptions.html

@@ -19,6 +19,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795367
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /**
   These tests verify that the appropriate exception is thrown when incorrect
   values are provided to the immediate mozGetUserMedia call.

dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html

@@ -20,6 +20,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
   /**
    * Run a test to verify that we can start a video+audio stream in a
    * media element, call stop() on the stream, and successfully get an

dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html

@@ -23,6 +23,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=796890
 </div>
 <pre id="test">
 <script type="application/javascript">
+
+if (navigator.platform.indexOf("Win") == 0) {
+  SimpleTest.expectAssertions(0, 9);
+} else {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   var audioLocal;
   var audioPCLocal;
   var audioPCRemote;

dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html

@@ -23,6 +23,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=796890
 </div>
 <pre id="test">
 <script type="application/javascript">
+
+if (navigator.platform.indexOf("Linux") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
   var audioLocal;
   var videoLocal;
   var videoPCLocal;

dom/network/tests/test_network_basics.html

@@ -12,6 +12,8 @@
 <pre id="test">
 <script type="application/javascript">
 
+SimpleTest.expectAssertions(11);
+
 /** Test for Network API **/
 
 function checkInterface(aInterface) {

dom/network/tests/test_tcpsocket_enabled_with_perm.html

@@ -12,6 +12,10 @@
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test to ensure TCPSocket permission being turned on enables 
   navigator.mozTCPSocket, and mozTCPSocket.open works when
   the tcp-socket permission has been granted.

dom/plugins/test/mochitest/test_GCrace.html

@@ -20,6 +20,12 @@
         return;
       }
       else {
+        if (navigator.platform.indexOf("Win") == 0) {
+          SimpleTest.expectAssertions(0, 66);
+        } else {
+          SimpleTest.expectAssertions(0, 1);
+        }
+
         setTimeout(checkGCRace, 1000);
       }
     }

dom/plugins/test/mochitest/test_cocoa_focus.html

@@ -6,6 +6,8 @@
 
 <body onload="runTests()">
   <script class="testbody" type="application/javascript">
+    SimpleTest.expectAssertions(1);
+
     SimpleTest.waitForExplicitFinish();
 
     var gOtherWindow;

dom/plugins/test/mochitest/test_cookies.html

@@ -7,6 +7,9 @@
 <body onload="runTests()">
   <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
   <script class="testbody" type="application/javascript">
+if (navigator.platform.indexOf("Mac") != 0) {
+  SimpleTest.expectAssertions(1);
+}
     SimpleTest.waitForExplicitFinish();
     function runTests() {
       var pluginElement = document.getElementById("plugin1");

dom/plugins/test/mochitest/test_pluginstream_seek_close.html

@@ -6,6 +6,10 @@
   <link rel="stylesheet" type="text/css" 
         href="/tests/SimpleTest/test.css" />
 <script>
+  if (navigator.platform.indexOf("Linux") == 0) {
+    SimpleTest.expectAssertions(0, 1);
+  }
+
   SimpleTest.waitForExplicitFinish();
 
   function frameLoaded() {

dom/plugins/test/mochitest/test_twostreams.html

@@ -10,6 +10,12 @@
   <p id="display"></p>
 
   <script type="text/javascript">
+  if (navigator.platform.indexOf("Win") == 0) {
+    SimpleTest.expectAssertions(1, 2);
+  } else {
+    SimpleTest.expectAssertions(1);
+  }
+
   SimpleTest.waitForExplicitFinish();
 
   var framesToLoad = 2;

dom/tests/mochitest/bugs/test_bug291653.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=291653
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 291653 **/
 SimpleTest.waitForExplicitFinish();
 

dom/tests/mochitest/bugs/test_bug304459.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=304459
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 304459 **/
 
 function iframeLoaded()

dom/tests/mochitest/bugs/test_bug308856.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=308856
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 308856 **/
 
 var monkey = 12;

dom/tests/mochitest/bugs/test_bug327891.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=327891
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 var pass = false;
 
 try {

dom/tests/mochitest/bugs/test_bug333983.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=333983
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 333983 **/
 HTMLElement.prototype.foopy = function () { return "foopy"; }
 

dom/tests/mochitest/bugs/test_bug342448.html

@@ -19,6 +19,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=342448
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 342448 **/
 SimpleTest.waitForExplicitFinish();
 try {

dom/tests/mochitest/bugs/test_bug346659.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=346659
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 346659 **/
 // do the tests in two batches, because otherwise the popup blocker kills off
 // our test because it opens too many windows.

dom/tests/mochitest/bugs/test_bug406375.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=406375
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(2, 3);
+}
+
 /** Test for Bug 406375 **/
 
 

dom/tests/mochitest/bugs/test_bug411103.html

@@ -23,6 +23,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=411103
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 SimpleTest.waitForExplicitFinish();
 
 /** Test for Bug 411103 **/

dom/tests/mochitest/bugs/test_bug414291.html

@@ -12,6 +12,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=414291
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=414291">Mozilla Bug 414291</a>
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 414291 **/
 
 var result1 = 0;

dom/tests/mochitest/bugs/test_bug427744.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=427744
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 427744 **/
 
 var found = false;

dom/tests/mochitest/bugs/test_bug42976.html

@@ -22,6 +22,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=42976
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {

dom/tests/mochitest/bugs/test_bug430276.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430276
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 430276 **/
 
 function startTest() {

dom/tests/mochitest/bugs/test_bug437361.html

@@ -10,6 +10,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=437361
   
   <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 3);
+}
+
   /** Test for Bug 437361 **/
 
   function testModalDialogBlockedCleanly() {

dom/tests/mochitest/bugs/test_bug440572.html

@@ -13,6 +13,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=440572
 
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+}
+
 /** Test for Bug 440572 **/
 
 var messages = [];

dom/tests/mochitest/bugs/test_bug456151.html

@@ -19,6 +19,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=456151
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 456151 **/
 var intercepted = false;
 

dom/tests/mochitest/bugs/test_bug458091.html

@@ -21,6 +21,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=458091
 <a id="testlink3" target="alreadyOpened" href="bug458091_child.html">Target Link</a>
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 458091 **/
 
 var gTestWin;

dom/tests/mochitest/bugs/test_bug459848.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=459848
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 3);
+}
+
 /** Test for Bug 459848 **/
 
 var ifr1, irf2;

dom/tests/mochitest/bugs/test_bug465263.html

@@ -22,6 +22,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=465263
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 465263 **/
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {

dom/tests/mochitest/bugs/test_bug479143.html

@@ -16,6 +16,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=479143
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
   SimpleTest.waitForExplicitFinish();
 
   setTimeout(function() {

dom/tests/mochitest/bugs/test_bug484775.html

@@ -18,6 +18,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=484775
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+} else if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 484775 **/
 
 var expectedTarget = null;

dom/tests/mochitest/bugs/test_bug492925.html

@@ -24,6 +24,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=492925
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 2);
+}
+
 /** Test for Bug 492925 **/
 
 var sheet = document.styleSheets[1];

dom/tests/mochitest/bugs/test_bug49312.html

@@ -37,6 +37,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=49312
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+}
+
 /** Test for Bug 49312 **/
 SimpleTest.waitForExplicitFinish();
 var opened = window.open("javascript:'<script>location=\\\'iframe_bug49312.html\\\'</" + "script>'", "", "width=100,height=100")

dom/tests/mochitest/bugs/test_bug495219.html

@@ -15,6 +15,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=495219
 <iframe onload="this.style.display='none'"></iframe>
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 1);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+}
+
 SimpleTest.waitForExplicitFinish();
 window.onload = function () {
   is(window.frames[0].innerWidth, 0, "width should be zero");

dom/tests/mochitest/bugs/test_bug504862.html

@@ -12,6 +12,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=504862
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=504862">Mozilla Bug 504862</a>
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Win") != 0) {
+  SimpleTest.expectAssertions(0, 5);
+}
+
 /** Test for Bug 504862 **/
 SimpleTest.waitForExplicitFinish();
 function onMsgRcv(event)

dom/tests/mochitest/bugs/test_bug529328.html

@@ -15,6 +15,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=529328
 </div>
 <pre id="test">
 <script type="application/javascript">
+
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 /** Test for Bug 529328 **/
 function testDOMTokenList() {
   is(document.body.classList[-1], undefined, "Wrong value for out of bounds access (DOMTokenList)");

dom/tests/mochitest/bugs/test_bug531176.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=531176
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 /** Test for Bug 531176 **/
 
 var errorCount = 0;

dom/tests/mochitest/bugs/test_bug531542.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=531542
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 /** Test for Bug 531542 **/
 
 var negativeTimeoutFired = false;

dom/tests/mochitest/bugs/test_bug534149.html

@@ -17,6 +17,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=534149
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 /** Test for Bug 534149 **/
 function getIDs(iframe) {
   var win = iframe.contentWindow;

dom/tests/mochitest/bugs/test_bug541530.html

@@ -16,6 +16,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=541530
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 3);
+} else if (navigator.platform.indexOf("Linux") == 0) {
+  SimpleTest.expectAssertions(0, 5);
+}
+
 var orig = window;
 window = {};
 

dom/tests/mochitest/bugs/test_bug545314.html

@@ -18,6 +18,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=545314
 <pre id="test">
 <script type="application/javascript">
 
+if (navigator.platform.indexOf("Mac") == 0) {
+  SimpleTest.expectAssertions(0, 4);
+}
+
 /** Test for Bug 545314 **/
 var frame = window.frames[0];
 frame.location.assign("http://localhost:8888/");