ServiceWorker: Check the equality of JS-level SW/SWR objects

third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html

Index: third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html
index 63a6e5b23226e2cc655dd3473da658a965f77d2e..ceb2786de20c429846625e1ccd9db8dc19ab736f 100644
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html
+++ b/third_party/WebKit/LayoutTests/http/tests/serviceworker/synced-state.html
@@ -5,17 +5,26 @@
 <script src="resources/test-helpers.js"></script>
 <script>
 // Tests that ServiceWorker objects representing the same Service Worker
-// entity have the same state. JS object equality is not tested, since the spec
-// does not require it.
+// entity have the same state. JS-level equality is now required according to
+// the spec.
 promise_test(function(t) {
     var scope = 'resources/synced-state';
     var script = 'resources/empty-worker.js';
     return service_worker_unregister_and_register(t, script, scope)
       .then(function(registration) {
           return new Promise(function(resolve) {
-              var step = 0;
-              registration.installing.addEventListener('statechange',
-                                                       function(e) {
+            var step = 0;
+            registration.installing.addEventListener(
+                'statechange', function(e) {
+                  var state = e.currentTarget.state;

[nhiroki, 2016/04/11 06:15:24]

unused?

[shimazu (google), 2016/04/11 07:21:08]

Done.

+                  console.log(e.currentTarget.state);
+                  console.log(registration);

[nhiroki, 2016/04/11 06:15:24]

Can you remove console.log()s?

[shimazu (google), 2016/04/11 07:21:08]

Done.

+                  navigator.serviceWorker.getRegistration(scope)
+                    .then(function(r) {
+                        assert_equals(r, registration,
+                                      'Equality of registration should ' +
+                                      'be kept all the time: ' + step);

[nhiroki, 2016/04/11 06:15:24]

It's likely that the test step proceeds before this assertion is tested because
the next statechange event can be fired before getRegistration() returns. I'm
not sure how to stably test the equality of registrations here... just drop this
check?

[shimazu (google), 2016/04/11 07:21:08]

Done.

+                      });
                   step++;
                   if (step == 1) {
                     assert_equals(e.currentTarget.state, 'installed',
@@ -23,9 +32,13 @@ promise_test(function(t) {
                     assert_equals(registration.installing, null,
                                   'in installed, .installing should be null');
                     assert_equals(registration.waiting.state, 'installed',
-                                  'in installed, .waiting should be installed');
+                                  'in installed, the state of .waiting ' +
+                                  'should be installed');
                     assert_equals(registration.active, null,
                                   'in installed, .active should be null');
+                    assert_equals(registration.waiting, e.currentTarget,
+                                  'SW object should be kept the equality ' +

[nhiroki, 2016/04/11 06:15:24]

".waiting should be equal to the original SW." would sounds a bit simpler.

+                                  '(installed)');
                   } else if (step == 2) {
                     assert_equals(e.currentTarget.state, 'activating',
                                   'original SW should be activating');
@@ -33,9 +46,12 @@ promise_test(function(t) {
                                   'in activating, .installing should be null');
                     assert_equals(registration.waiting, null,
                                   'in activating, .waiting should be null');
-                    assert_equals(
-                        registration.active.state, 'activating',
-                        'in activating, .active should be activating');
+                    assert_equals(registration.active.state, 'activating',
+                                  'in activating, the state of .active ' +
+                                  'should be activating');
+                    assert_equals(registration.active, e.currentTarget,
+                                  'SW object should be kept the equality ' +
+                                  '(activating)');

[nhiroki, 2016/04/11 06:15:24]

ditto

                   } else if (step == 3) {
                     assert_equals(e.currentTarget.state, 'activated',
                                   'original SW should be activated');
@@ -44,11 +60,15 @@ promise_test(function(t) {
                     assert_equals(registration.waiting, null,
                                   'in activated, .waiting should be null');
                     assert_equals(registration.active.state, 'activated',
-                                  'in activated .active should be activated');
+                                  'in activated, the state of .active should ' +
+                                  'be activated');
+                    assert_equals(registration.active, e.currentTarget,
+                                  'SW object should be kept the equality ' +
+                                  '(activated)');

[nhiroki, 2016/04/11 06:15:24]

ditto.

                     resolve();
                   }
-                })
-            })
+                });
+          });
         })
       .then(function() {
           return service_worker_unregister_and_done(t, scope);