Chromium Code Reviews Chromium Code Reviews
Issue 231513003:
Convert Service Worker layout tests to W3C testharness-style tests (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| Index: LayoutTests/http/tests/serviceworker/indexeddb.html |
| diff --git a/LayoutTests/http/tests/serviceworker/indexeddb.html b/LayoutTests/http/tests/serviceworker/indexeddb.html |
| index 3766f376b11e49f23401cb7e069d48c658911a49..ae5dabad501d318e01b44826c9b178689c283f1f 100644 |
| --- a/LayoutTests/http/tests/serviceworker/indexeddb.html |
| +++ b/LayoutTests/http/tests/serviceworker/indexeddb.html |
| @@ -1,57 +1,35 @@ |
| <!DOCTYPE html> |
| -<script src="/js-test-resources/js-test.js"></script> |
| +<title>Service Worker: Indexed DB</title> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| <script> |
| +var test = async_test('Verify Indexed DB operation in a Service Worker'); |
| +test.step(function() { |
| -description("Verify that IndexedDB is functional in a ServiceWorker"); |
| -var jsTestIsAsync = true; |
| + navigator.serviceWorker.register('resources/indexeddb-worker.js').then( |
| + test.step_func(function(worker) { |
| + var messageChannel = new MessageChannel(); |
| + messageChannel.port1.onmessage = test.step_func(onMessage); |
| -evalAndLog("messageChannel = new MessageChannel()"); |
| -evalAndLog("messageChannel.port1.onmessage = onMessageHandler"); |
| + worker.postMessage({port: messageChannel.port2}, [messageChannel.port2]); |
| + }), |
| + test.step_func(function(reason) { |
|
dominicc (has gone to gerrit)
2014/04/09 20:09:08
In general it seems surprising to have the test in
jsbell
2014/04/09 23:04:40
Agreed. As you can see, the old testRunner version
|
| + assert_equals(reason.name, 'DisabledError'); |
|
dominicc (has gone to gerrit)
2014/04/09 20:09:08
These asserts should have a description in the thi
jsbell
2014/04/09 23:04:40
Done. And good advice for consistent phrasing. It'
|
| + test.done(); |
| + })); |
| -debug(""); |
| -evalAndLog("navigator.serviceWorker.register('indexeddb-worker.js')").then( |
| - function(result) { |
| - serviceWorker = result; |
| - evalAndLog("serviceWorker.postMessage({port: messageChannel.port2}, [messageChannel.port2])"); |
| - }, |
| - function(reason) { |
| - testFailed(reason.name); |
| - finishJSTest(); |
| - }); |
| - |
| -function onMessageHandler(e) { |
| - var prefix = "[ServiceWorker] "; |
| - message = e.data; |
| - switch (message.action) { |
| - case 'log': |
| - debug(prefix + message.text); |
| - break; |
| - case 'pass': |
| - testPassed(prefix + message.text); |
| - break; |
| - case 'fail': |
| - testFailed(prefix + message.text); |
| - break; |
| - case 'quit': |
| - verifyDatabase(); |
| - break; |
| + function onMessage() { |
| + var open_request = indexedDB.open('db'); |
|
dominicc (has gone to gerrit)
2014/04/09 20:09:08
Use camelCase. Also for get_request.
jsbell
2014/04/09 23:04:40
Done.
|
| + open_request.onsuccess = test.step_func(function() { |
| + var db = open_request.result; |
| + var tx = db.transaction('store'); |
| + var store = tx.objectStore('store'); |
| + var get_request = store.get('key'); |
| + get_request.onsuccess = test.step_func(function(e) { |
|
dominicc (has gone to gerrit)
2014/04/09 20:09:08
Delete unused parameter e? Or rename to _.
jsbell
2014/04/09 23:04:40
Done.
|
| + assert_equals(get_request.result, 'value'); |
| + test.done(); |
| + }); |
| + }); |
| } |
| -} |
| - |
| -function verifyDatabase() { |
| - debug(""); |
| - debug("Verifying the database from the page"); |
| - debug(""); |
| - evalAndLog("request = indexedDB.open('db')"); |
| - request.onsuccess = function() { |
| - evalAndLog("db = request.result"); |
| - evalAndLog("tx = db.transaction('store')"); |
| - evalAndLog("store = tx.objectStore('store')"); |
| - evalAndLog("request = store.get('key')"); |
| - request.onsuccess = function() { |
| - shouldBe("request.result", "'value'"); |
| - finishJSTest(); |
| - }; |
| - }; |
| -} |
| +}); |
| </script> |
