commit 2221fe343f0f4cb4e4e382bfd43bc8b1e69a98ba
author Byron Campen [:bwc] <docfaraday@gmail.com> Sun Apr 07 11:55:17 2019
committer moz-wptsync-bot <wptsync@mozilla.com> Sun Apr 07 19:29:54 2019
tree abf4234b23c7168ee55a605fe40fa88fdda6aa29
parent b624370228950fef1ecbf00a82be80246a1bde52

Part 2: Fix some test-cases for addIceCandidate.

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

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1535442
gecko-commit: 2ac346fc1029f4d129387648df85ab1b8380cc58
gecko-integration-branch: central
gecko-reviewers: jib

webrtc/RTCPeerConnection-addIceCandidate.html

diff --git a/webrtc/RTCPeerConnection-addIceCandidate.html b/webrtc/RTCPeerConnection-addIceCandidate.html
index 51a5677..3641252 100644
--- a/webrtc/RTCPeerConnection-addIceCandidate.html
+++ b/webrtc/RTCPeerConnection-addIceCandidate.html
@@ -176,12 +176,15 @@
     t.add_cleanup(() => pc.close());
 
     await pc.setRemoteDescription(sessionDesc);
-    await pc.addIceCandidate({usernameFragment: usernameFragment1});
+    await pc.addIceCandidate({
+      usernameFragment: usernameFragment1,
+      sdpMid: sdpMid1
+    });
     assert_candidate_line_between(pc.remoteDescription.sdp,
       mediaLine1, endOfCandidateLine, mediaLine2);
     assert_false(is_candidate_line_after(pc.remoteDescription.sdp,
       mediaLine2, endOfCandidateLine));
-  }, 'addIceCandidate({usernameFragment: usernameFragment1}) should work, and add a=end-of-candidates to the first m-section');
+  }, 'addIceCandidate({usernameFragment: usernameFragment1, sdpMid: sdpMid1}) should work, and add a=end-of-candidates to the first m-section');
 
   promise_test(async t => {
     const pc = new RTCPeerConnection();
@@ -189,12 +192,15 @@
     t.add_cleanup(() => pc.close());
 
     await pc.setRemoteDescription(sessionDesc);
-    await pc.addIceCandidate({usernameFragment: usernameFragment2});
+    await pc.addIceCandidate({
+      usernameFragment: usernameFragment2,
+      sdpMLineIndex: 1
+    });
     assert_false(is_candidate_line_between(pc.remoteDescription.sdp,
       mediaLine1, endOfCandidateLine, mediaLine2));
     assert_true(is_candidate_line_after(pc.remoteDescription.sdp,
       mediaLine2, endOfCandidateLine));
-  }, 'addIceCandidate({usernameFragment: usernameFragment2}) should work, and add a=end-of-candidates to the first m-section');
+  }, 'addIceCandidate({usernameFragment: usernameFragment2, sdpMLineIndex: 1}) should work, and add a=end-of-candidates to the first m-section');
 
   promise_test(async t => {
     const pc = new RTCPeerConnection();
@@ -202,12 +208,9 @@
     t.add_cleanup(() => pc.close());
 
     await pc.setRemoteDescription(sessionDesc);
-    await pc.addIceCandidate({usernameFragment: "no such ufrag"});
-    assert_false(is_candidate_line_between(pc.remoteDescription.sdp,
-      mediaLine1, endOfCandidateLine, mediaLine2));
-    assert_false(is_candidate_line_after(pc.remoteDescription.sdp,
-      mediaLine2, endOfCandidateLine));
-  }, 'addIceCandidate({usernameFragment: "no such ufrag"}) should work, but not add a=end-of-candidates');
+    await promise_rejects(t, 'OperationError',
+      pc.addIceCandidate({usernameFragment: "no such ufrag"}));
+  }, 'addIceCandidate({usernameFragment: "no such ufrag"}) should not work');
 
   promise_test(t => {
     const pc = new RTCPeerConnection();
@@ -316,7 +319,7 @@
       candidate: candidateStr1,
       sdpMid: sdpMid1,
       sdpMLineIndex: sdpMLineIndex1,
-      ufrag: null
+      usernameFragment: null
     }))
     .then(() => {
       assert_candidate_line_between(pc.remoteDescription.sdp,
@@ -539,7 +542,7 @@
           candidate: candidateStr1,
           sdpMid: sdpMid1,
           sdpMLineIndex: sdpMLineIndex1,
-          ufrag: 'invalid'
+          usernameFragment: 'invalid'
         })));
   }, 'Add candidate with invalid usernameFragment should reject with OperationError');
 
@@ -578,7 +581,7 @@
           candidate: candidateStr2,
           sdpMid: sdpMid2,
           sdpMLineIndex: sdpMLineIndex2,
-          usernameFragement: usernameFragment1
+          usernameFragment: usernameFragment1
         })));
   }, 'Add candidate with sdpMid belonging to different usernameFragment should reject with OperationError');