Merge 97c3ec1 into 30a6fdb

web-platform-tests · May 7, 2017 · 5805688 · 5805688
2 parents 30a6fdb + 97c3ec1
commit 5805688
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/webrtc/RTCDataChannel-id.html b/webrtc/RTCDataChannel-id.html
@@ -0,0 +1,60 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCDataChannel id attribute</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+'use strict';
+
+// This and the test below verify that after a description is set that
+// negotiates the DTLS role used by SCTP, data channels with unset IDs
+// have IDs set according to the rules in rtcweb-data-channel.
+promise_test(test => {
+  const pc = new RTCPeerConnection;
+  const channel = pc.createDataChannel('');
+  return pc.createOffer()
+  .then(offer => pc.setLocalDescription(offer))
+  .then(() => {
+    // Turn our own offer SDP into valid answer SDP by setting the DTLS role to
+    // "active".
+    const answer = {
+      type: "answer",
+      sdp: pc.localDescription.sdp.replace("actpass", "active")
+    };
+    return pc.setRemoteDescription(answer);
+  })
+  .then(() => {
+    // Since the remote description had an "active" DTLS role, we're the server
+    // and should use odd data channel IDs, according to rtcweb-data-channel.
+    assert_equals(channel.id % 2, 1, 'id');
+    const another_channel = pc.createDataChannel('another');
+    assert_equals(another_channel.id % 2, 1, 'id');
+    assert_not_equals(channel.id, another_channel.id);
+  })
+}, "DTLS client uses odd data channel IDs");
+
+promise_test(test => {
+  const pc = new RTCPeerConnection;
+  const channel = pc.createDataChannel('');
+  return pc.createOffer()
+  .then(offer => pc.setLocalDescription(offer))
+  .then(() => {
+    // Turn our own offer SDP into valid answer SDP by setting the DTLS role to
+    // "passive".
+    const answer = {
+      type: "answer",
+      sdp: pc.localDescription.sdp.replace("actpass", "passive")
+    };
+    return pc.setRemoteDescription(answer);
+  })
+  .then(() => {
+    // Since the remote description had a "passive" DTLS role, we're the client
+    // and should use even data channel IDs, according to rtcweb-data-channel.
+    assert_equals(channel.id % 2, 0, 'id');
+    const another_channel = pc.createDataChannel('another');
+    assert_equals(another_channel.id % 2, 0, 'id');
+    assert_not_equals(channel.id, another_channel.id);
+  })
+}, "DTLS server uses even data channel IDs");
+
+</script>
diff --git a/webrtc/RTCPeerConnection-createDataChannel.html b/webrtc/RTCPeerConnection-createDataChannel.html
@@ -29,8 +29,9 @@
   assert_equals(channel.maxRetransmits, null, 'maxRetransmits');
   assert_equals(channel.protocol, '', 'protocol');
   assert_equals(channel.negotiated, false, 'negotiated');
-  // Initial id value is not defined.
-  assert_equals(typeof channel.id, 'number', 'id type');
+  // Since no offer/answer exchange has occurred yet, the DTLS role is unknown
+  // and so the ID should be null.
+  assert_equals(channel.id, null, 'id');
   assert_equals(channel.priority, 'low', 'priority');
 }, 'createDataChannel defaults');