commit 87107b4eca6509afe6f672be2bcf770806722cb6
author Harald Alvestrand <hta@chromium.org> Fri Jan 17 00:42:12 2020
committer Blink WPT Bot <blink-w3c-test-autoroller@chromium.org> Fri Jan 17 01:29:02 2020
tree 56010bf429287aca061bb25e8bec56487773765e
parent 606da537b95e54f4f1d53774ec03634f5902bc01

Implement datachannel.onclosing event

Bug: chromium:1040584
Change-Id: Ic78ea01897ee3f8dd120ed6d638a1f70a288c26c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1991571
Auto-Submit: Harald Alvestrand <hta@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Reviewed-by: Henrik Boström <hbos@chromium.org>
Reviewed-by: Steve Anton <steveanton@chromium.org>
Commit-Queue: Harald Alvestrand <hta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732632}

webrtc/RTCDataChannel-close.html

diff --git a/webrtc/RTCDataChannel-close.html b/webrtc/RTCDataChannel-close.html
index 9f43dc9..a417d66 100644
--- a/webrtc/RTCDataChannel-close.html
+++ b/webrtc/RTCDataChannel-close.html
@@ -12,15 +12,23 @@
   let pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
   let [channel1, channel2] = await createDataChannelPair(pc1);
-  let close_handler = new Promise(resolve => {
+  let closeHandler = new Promise(resolve => {
     channel2.onclose = event => {
       resolve();
     };
   });
+  let closingSeen = false;
+  channel1.onclosing = t.unreached_func();
+  channel2.onclosing = event => {
+    assert_equals(channel2.readyState, 'closing');
+    closingSeen = true;
+  }
   channel2.addEventListener('error', t.unreached_func());
   channel1.close();
-  await close_handler;
-}, 'Close datachannel causes onclose to be called');
+  await closeHandler;
+  assert_equals(channel2.readyState, 'closed');
+  assert_true(closingSeen, 'Closing event was seen');
+}, 'Close datachannel causes onclosing and onclose to be called');
 
 promise_test(async t => {
   // This is the same test as above, but using addEventListener
@@ -28,15 +36,23 @@
   let pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
   let [channel1, channel2] = await createDataChannelPair(pc1);
-  let close_handler = new Promise(resolve => {
+  let closeHandler = new Promise(resolve => {
     channel2.addEventListener('close', event => {
       resolve();
     });
   });
+  let closingSeen = false;
+  channel1.addEventListener('closing', t.unreached_func());
+  channel2.addEventListener('closing', event => {
+    assert_equals(channel2.readyState, 'closing');
+    closingSeen = true;
+  });
   channel2.addEventListener('error', t.unreached_func());
   channel1.close();
-  await close_handler;
-}, 'Close datachannel causes close event to be called');
+  await closeHandler;
+  assert_equals(channel2.readyState, 'closed');
+  assert_true(closingSeen, 'Closing event was seen');
+}, 'Close datachannel causes closing and close event to be called');
 
 promise_test(async t => {
   let pc1 = new RTCPeerConnection();
@@ -44,13 +60,13 @@
   let [channel1, channel2] = await createDataChannelPair(pc1);
   let events = [];
   let error = null;
-  let close_handler = new Promise(resolve => {
+  let closeHandler = new Promise(resolve => {
     channel2.addEventListener('close', event => {
       events.push('close');
       resolve();
     });
   });
-  let error_handler = new Promise((resolve, reject) => {
+  let errorHandler = new Promise((resolve, reject) => {
     channel2.addEventListener('error', event => {
       events.push('error');
       try {
@@ -64,8 +80,8 @@
     });
   });
   pc1.close();
-  await error_handler;
-  await close_handler;
+  await errorHandler;
+  await closeHandler;
   // Error should fire before close.
   assert_array_equals(['error', 'close'], events);
   assert_true(error instanceof RTCError);