From f40d05881a24c45c39bee85e7022b1a98f5e4c56 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Wed, 27 Mar 2013 19:46:31 -0400
Subject: [PATCH] Bug 839650: Remove assertion suppression from
 dom/media/tests/mochitest r=jsmith

---
 .../tests/mochitest/test_getUserMedia_basicAudio.html     | 7 +------
 .../tests/mochitest/test_getUserMedia_basicVideo.html     | 7 +------
 .../mochitest/test_getUserMedia_basicVideoAudio.html      | 7 +------
 .../tests/mochitest/test_getUserMedia_exceptions.html     | 7 +------
 .../mochitest/test_getUserMedia_stopVideoAudioStream.html | 7 +------
 .../tests/mochitest/test_peerConnection_basicAudio.html   | 4 ----
 .../mochitest/test_peerConnection_basicAudioVideo.html    | 8 --------
 .../test_peerConnection_basicAudioVideoCombined.html      | 2 --
 .../tests/mochitest/test_peerConnection_bug825703.html    | 3 ---
 .../tests/mochitest/test_peerConnection_bug827843.html    | 4 ----
 .../tests/mochitest/test_peerConnection_bug834153.html    | 4 ----
 .../tests/mochitest/test_peerConnection_bug835370.html    | 4 ----
 .../tests/mochitest/test_peerConnection_bug840344.html    | 7 -------
 13 files changed, 5 insertions(+), 66 deletions(-)
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
index 7090e24f208..5080e344135 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=781534
@@ -19,11 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  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.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
index 309ec898232..99e75bea852 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=781534
@@ -19,11 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  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.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
index 2cf3083c98a..ee1c81a2d0e 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=781534
@@ -19,11 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  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.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_exceptions.html b/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
index 8534a31d2fa..0963f21e256 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=795367
@@ -18,11 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795367
 </div>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
-}
-
 /**
   These tests verify that the appropriate exception is thrown when incorrect
   values are provided to the immediate mozGetUserMedia call.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
index 487b7cd0a23..775b6fe83a7 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=822109
@@ -19,11 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  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
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudio.html b/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
index 5490d7ff6da..9fbafccdbcf 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
@@ -10,10 +10,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
-}
-
   createHTML({
     bug: "796892",
     title: "Basic audio-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
index 7cac507de21..55865e9b498 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
@@ -11,14 +11,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 41);
-} else if (navigator.platform.startsWith("Mac")) {
-  SimpleTest.expectAssertions(0, 2);
-} else if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(0, 6);
-}
-
   createHTML({
     bug: "796890",
     title: "Basic audio/video (separate) peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
index 9030a3957c6..00707a1190c 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
@@ -11,8 +11,6 @@
 <pre id="test">
 <script type="application/javascript">
 
-  SimpleTest.expectAssertions(0, 13);
-
   createHTML({
     bug: "796890",
     title: "Basic audio/video (combined) peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug825703.html b/dom/media/tests/mochitest/test_peerConnection_bug825703.html
index e2e437886b1..1dcfda8dfe8 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug825703.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug825703.html
@@ -14,9 +14,6 @@
   });
 
   runTest(function () {
-    if (navigator.platform.startsWith("Win")) {
-      SimpleTest.expectAssertions(0, 280);
-    }
     var pc;
     var pcs;
     var exception = null;
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug827843.html b/dom/media/tests/mochitest/test_peerConnection_bug827843.html
index 7fd4345bc4c..226a78405e5 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug827843.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug827843.html
@@ -9,10 +9,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  if (navigator.platform.startsWith("Win")) {
-    SimpleTest.expectAssertions(0, 200);
-  }
-
   createHTML({
     bug: "827843",
     title: "Ensure that localDescription and remoteDescription are null after close"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug834153.html b/dom/media/tests/mochitest/test_peerConnection_bug834153.html
index 034bd57530f..f501d4d53f0 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug834153.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug834153.html
@@ -8,10 +8,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 369);
-}
-
   createHTML({
     bug: "834153",
     title: "Queue CreateAnswer in PeerConnection.js"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug835370.html b/dom/media/tests/mochitest/test_peerConnection_bug835370.html
index 45a96763193..8f77bbd7673 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug835370.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug835370.html
@@ -8,10 +8,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 9);
-}
-
   createHTML({
     bug: "825703",
     title: "PeerConnection.createOffer valid/invalid constraints permutations"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug840344.html b/dom/media/tests/mochitest/test_peerConnection_bug840344.html
index 35016837da6..c9dd04e7322 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug840344.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug840344.html
@@ -9,13 +9,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-
-  if (navigator.platform.startsWith("Linux")) {
-    SimpleTest.expectAssertions(0, 1);
-  } else if (navigator.platform.startsWith("Win")) {
-    SimpleTest.expectAssertions(0, 125);
-  }
-
   createHTML({
     bug: "840344",
     title: "Prevent multiple creations of local SDP"
