Upstream service worker `postMessage` tests to WPT

third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html

Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html
index a6f66517910eefd54abc722c7cf16a7d6f3794ac..3d6347311987fa6dfd95c4c42493263a81a47556 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/postmessage.https.html
@@ -4,57 +4,136 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
+promise_test(t => {
+    var script = 'resources/postmessage-worker.js';
     var scope = 'resources/blank.html';
     var registration;
     var worker;
-    service_worker_unregister_and_register(
-        t, 'resources/postmessage-worker.js', scope)
-      .then(function(r) {
+    var port;
+
+    return service_worker_unregister_and_register(t, script, scope)
+      .then(r => {
+          add_completion_callback(() => r.unregister());
           registration = r;
           worker = registration.installing;
+
           var messageChannel = new MessageChannel();
-          messageChannel.port1.onmessage = t.step_func(onMessage);
-          worker.postMessage({port: messageChannel.port2},
-                              [messageChannel.port2]);
-          worker.postMessage({value: 1});
-          worker.postMessage({value: 2});
-          worker.postMessage({done: true});
-        })
-      .catch(unreached_rejection(t));
-
-    var result = [];
-    var expected = [
-      'Acking value: 1',
-      'Acking value: 2',
-    ];
-
-    function onMessage(e) {
-      var message = e.data;
-      if (message === 'quit') {
-        assert_array_equals(result, expected,
-                            'Worker should post back expected values.');
-        postMessageToRedundantWorker();
-      } else {
-        result.push(message);
-      }
-    };
-
-    function postMessageToRedundantWorker() {
-      registration.unregister(scope)
-        .then(function() {
-            return wait_for_state(t, worker, 'redundant');
-          })
-        .then(function() {
-            assert_equals(worker.state, 'redundant');
-            assert_throws(
-              {name:'InvalidStateError'},
-              function() { worker.postMessage(''); },
-              'Calling postMessage on a redundant ServiceWorker should ' +
-                  'throw InvalidStateError.');
-            t.done();
-          })
-        .catch(unreached_rejection(t));
-    }
+          port = messageChannel.port1;
+          return new Promise(resolve => {
+              port.onmessage = resolve;
+              worker.postMessage({port: messageChannel.port2},
+                                 [messageChannel.port2]);
+              worker.postMessage({value: 1});
+              worker.postMessage({value: 2});
+              worker.postMessage({done: true});
+            });
+        })
+      .then(e => {
+          assert_equals(e.data, 'Acking value: 1');
+          return new Promise(resolve => { port.onmessage = resolve; });
+        })
+      .then(e => {
+          assert_equals(e.data, 'Acking value: 2');
+          return new Promise(resolve => { port.onmessage = resolve; });
+        })
+      .then(e => {
+          assert_equals(e.data, 'quit');
+          return registration.unregister(scope);
+        })
+      .then(() => { return wait_for_state(t, worker, 'redundant'); })
+      .then(() => {
+          assert_equals(worker.state, 'redundant');
+          assert_throws(
+            {name:'InvalidStateError'},
+            function() { worker.postMessage(''); },
+            'Calling postMessage on a redundant ServiceWorker should ' +
+                'throw InvalidStateError.');
+        });
   }, 'postMessage to a ServiceWorker (and back via MessagePort)');
+
+promise_test(t => {
+    var script = 'resources/postmessage-transferables-worker.js';
+    var scope = 'resources/blank.html';
+    var sw = navigator.serviceWorker;
+
+    var message = 'Hello, world!';
+    var text_encoder = new TextEncoder;
+    var text_decoder = new TextDecoder;
+
+    return service_worker_unregister_and_register(t, script, scope)
+      .then(r => {
+          add_completion_callback(() => r.unregister());

[falken, 2017/05/15 05:10:33]

t.add_cleanup?

[mike3, 2017/05/15 20:07:45]

Done.

+
+          var ab = text_encoder.encode(message);
+          assert_equals(ab.byteLength, message.length);
+          r.installing.postMessage(ab, [ab.buffer]);
+          assert_equals(text_decoder.decode(ab), '');
+          assert_equals(ab.byteLength, 0);
+
+          return new Promise(resolve => { sw.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify the integrity of the transferred array buffer.
+          assert_equals(e.data.content, message);
+          assert_equals(e.data.byteLength, message.length);
+          return new Promise(resolve => { sw.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify the integrity of the array buffer sent back from
+          // ServiceWorker via Client.postMessage.
+          assert_equals(text_decoder.decode(e.data), message);
+          assert_equals(e.data.byteLength, message.length);
+          return new Promise(resolve => { sw.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify that the array buffer on ServiceWorker is neutered.
+          assert_equals(e.data.content, '');
+          assert_equals(e.data.byteLength, 0);
+        });
+  }, 'postMessage a transferable ArrayBuffer between ServiceWorker and Client');
+
+promise_test(t => {
+    var script = 'resources/postmessage-transferables-worker.js';
+    var scope = 'resources/blank.html';
+    var message = 'Hello, world!';
+    var text_encoder = new TextEncoder;
+    var text_decoder = new TextDecoder;
+    var port;
+
+    return service_worker_unregister_and_register(t, script, scope)
+      .then(r => {
+          add_completion_callback(() => r.unregister());
+
+          var channel = new MessageChannel;
+          port = channel.port1;
+          r.installing.postMessage(undefined, [channel.port2]);
+
+          var ab = text_encoder.encode(message);
+          assert_equals(ab.byteLength, message.length);
+          port.postMessage(ab, [ab.buffer]);
+          assert_equals(text_decoder.decode(ab), '');
+          assert_equals(ab.byteLength, 0);
+
+          return new Promise(resolve => { port.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify the integrity of the transferred array buffer.
+          assert_equals(e.data.content, message);
+          assert_equals(e.data.byteLength, message.length);
+          return new Promise(resolve => { port.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify the integrity of the array buffer sent back from
+          // ServiceWorker via Client.postMessage.
+          assert_equals(text_decoder.decode(e.data), message);
+          assert_equals(e.data.byteLength, message.length);
+          return new Promise(resolve => { port.onmessage = resolve; });
+        })
+      .then(e => {
+          // Verify that the array buffer on ServiceWorker is neutered.
+          assert_equals(e.data.content, '');
+          assert_equals(e.data.byteLength, 0);
+        });
+  }, 'postMessage a transferable ArrayBuffer between ServiceWorker and Client' +
+     ' over MessagePort');
 </script>