mozilla-central: changeset 219124:f9cf5afe311a8cd8d81a7f31b4cf2b9b132875d7

author	Jan-Ivar Bruaroey <jib@mozilla.com>
	Mon, 08 Dec 2014 10:18:38 -0600
changeset 219124	f9cf5afe311a8cd8d81a7f31b4cf2b9b132875d7
parent 219123	5bc1b5e7991415629e63f8e15f34f8b59a24202a
child 219125	34fd03c467e8df1841238f11bfd59ff51c94b7ad
push id	27956
push user	kwierso@gmail.com
push date	Fri, 12 Dec 2014 00:47:19 +0000
treeherder	mozilla-central@32a2c5bd2f68 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jesup
bugs	1091898
milestone	37.0a1
first release with	nightly linux32 5288b15d22de / 37.0a1 / 20141212030201 / files nightly linux64 5288b15d22de / 37.0a1 / 20141212030201 / files nightly mac 5288b15d22de / 37.0a1 / 20141212030201 / files nightly win32 5288b15d22de / 37.0a1 / 20141212030201 / files nightly win64 5288b15d22de / 37.0a1 / 20141212030201 / files
last release without	nightly linux32 0cf461e62ce5 / 37.0a1 / 20141211030206 / files nightly linux64 0cf461e62ce5 / 37.0a1 / 20141211030206 / files nightly mac 0cf461e62ce5 / 37.0a1 / 20141211030206 / files nightly win32 0cf461e62ce5 / 37.0a1 / 20141211030206 / files nightly win64 0cf461e62ce5 / 37.0a1 / 20141211030206 / files

--- a/dom/bindings/test/test_exceptions_from_jsimplemented.html
+++ b/dom/bindings/test/test_exceptions_from_jsimplemented.html
@@ -7,30 +7,44 @@ https://bugzilla.mozilla.org/show_bug.cg
   <meta charset="utf-8">
   <title>Test for Bug 923010</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
   /** Test for Bug 923010 **/
   try {
     var conn = new mozRTCPeerConnection();
-    var candidate = new mozRTCIceCandidate({candidate: null });
     try {
-      conn.addIceCandidate(candidate, function() {
-          ok(false, "The call to addIceCandidate succeeded when it should have thrown");
+      conn.updateIce(candidate, function() {
+          ok(false, "The call to updateIce succeeded when it should have thrown");
         }, function() {
-          ok(false, "The call to addIceCandidate failed when it should have thrown");
+          ok(false, "The call to updateIce failed when it should have thrown");
         })
-      ok(false, "That call to addIceCandidate should have thrown");
+      ok(false, "That call to updateIce should have thrown");
     } catch (e) {
-      is(e.lineNumber, 17, "Exception should have been on line 17");
+      is(e.lineNumber, 16, "Exception should have been on line 16");
       is(e.message,
-         "Invalid candidate passed to addIceCandidate!",
+         "updateIce not yet implemented",
          "Should have the exception we expect");
     }
+
+    var candidate = new mozRTCIceCandidate({candidate: null });
+
+    conn.addIceCandidate(candidate)
+    .then(function() {
+      ok(false, "addIceCandidate succeeded when it should have failed");
+    }, function(reason) {
+      is(reason.lineNumber, 31, "Rejection should have been on line 31");
+      is(reason.message,
+         "Invalid candidate passed to addIceCandidate!",
+         "Should have the rejection we expect");
+    })
+    .catch(function(reason) {
+      ok(false, "unexpected error: " + reason);
+    });
   } catch (e) {
     // b2g has no WebRTC, apparently
     todo(false, "No WebRTC on b2g yet");
   }
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=923010">Mozilla Bug 923010</a>