Upstream service worker indexedDB tests to WPT

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

Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/indexeddb.https.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/indexeddb.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/indexeddb.https.html
index 4de2bc43e177a5bd900884f331a00fd3a8518f05..93a514410cfdaec8de92293632db8ba0916bdb2f 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/indexeddb.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/indexeddb.https.html
@@ -4,32 +4,71 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-async_test(function(t) {
-    var scope = 'resources/blank.html';
-    service_worker_unregister_and_register(
-      t, 'resources/indexeddb-worker.js', scope)
-    .then(function(registration) {
-        var sw = registration.installing;
-        var messageChannel = new MessageChannel();
-        messageChannel.port1.onmessage = t.step_func(onMessage);
-        sw.postMessage({port: messageChannel.port2}, [messageChannel.port2]);
-      })
-    .catch(unreached_rejection(t));
-
-    function onMessage() {
+function readDB() {
+  return new Promise(function(resolve, reject) {
       var openRequest = indexedDB.open('db');
-      openRequest.onsuccess = t.step_func(function() {
+
+      openRequest.onerror = reject;
+      openRequest.onsuccess = function() {
           var db = openRequest.result;
           var tx = db.transaction('store');
           var store = tx.objectStore('store');
           var getRequest = store.get('key');
-          getRequest.onsuccess = t.step_func(function() {
-              assert_equals(
-                getRequest.result, 'value',
-                'The get() result should match what the worker put().');
-              service_worker_unregister_and_done(t, scope);
-            });
+
+          getRequest.onerror = function() {
+              db.close();
+              reject(getRequest.error);
+            };
+          getRequest.onsuccess = function() {
+              db.close();
+              resolve(getRequest.result);
+            };
+        };
+    });
+}
+
+function send(worker, action) {
+  return new Promise(function(resolve, reject) {
+      var messageChannel = new MessageChannel();
+      messageChannel.port1.onmessage = function(event) {
+          if (event.data.type === 'error') {
+            reject(event.data.reason);
+          }
+
+          resolve();
+        };
+
+      worker.postMessage(
+        {action: action, port: messageChannel.port2},
+        [messageChannel.port2]);
+    });
+}
+
+promise_test(function(t) {
+    var scope = 'resources/blank.html';
+    var cleanup, keyValue;
+
+    return service_worker_unregister_and_register(
+        t, 'resources/indexeddb-worker.js', scope)
+      .then(function(registration) {
+          var worker = registration.installing;
+
+          promise_test(function() {
+              return registration.unregister();
+            }, 'clean up: unregister worker');
+
+          return send(worker, 'create')
+            .then(function() {
+                promise_test(function() {
+                    return send(worker, 'cleanup');

[Marijn Kruisselbrink, 2017/05/16 18:17:44]

Does this work? The registration.unregister() from above should have processed
by the time this code executes, which means (I believe) that the worker should
be marked as "redundant" by here. And in that case calling postMessage should
throw InvalidStateError rather than actually sending a message.

(apparently either my analysis of what is supposed to happen, or chromes
implementation are wrong, since I assume you ran the test and it didn't fail)

I think it would be cleaner to just have a single cleanup, which both cleans up
IDB and unregisters the service worker; or alternatively don't rely on the
service worker to do the IDB cleanup, since the document can do it just directly
here.

[mike3, 2017/05/17 22:07:40]

It does indeed work, but I think the state we're discussing may be a result of
a spec bug. I'm going to file a report against the specification shortly. In
the mean time, we should certainly avoid entering this state.
I tried the former approach because I wanted to avoid duplicating database
deletion logic already available in the worker. Doing this correctly introduced
a surprising amount of complexity (the patch is attached if you're curious), so
I decided to bite the bullet and re-implement the 4-line function.

+                  }, 'clean up: delete database');
+              })
+            .then(readDB)
+            .then(function(value) {
+                assert_equals(
+                  value, 'value',
+                  'The get() result should match what the worker put().');
+              });
         });
-    }
   }, 'Verify Indexed DB operation in a Service Worker');
 </script>