Move promise_test and assert_promise_rejects out of worker-test-harness.

These methods have nothing to do with service worker based tests, and are just
as useful in normal testharness based tests, so move them to a separate file.

Additionally rename worker-test-harness.js to worker-testharness.js for consistency.

Review URL: https://codereview.chromium.org/647493002

git-svn-id: svn://svn.chromium.org/blink/trunk@183557 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/http/tests/geofencing/resources/worker.js

-importScripts('../../serviceworker/resources/worker-test-harness.js');
+importScripts('../../serviceworker/resources/worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 
 promise_test(function(test) {
     return navigator.geofencing.registerRegion(

third_party/WebKit/LayoutTests/http/tests/resources/testharness-helpers.js

+/*
+ * testharness-helpers contains various useful extensions to testharness.js to
+ * allow them to be used across multiple tests before they have been
+ * upstreamed. This file is intended to be usable from both document and worker
+ * environments, so code should for example not rely on the DOM.
+ */
+
+// 'promise_test' is a new kind of testharness test that handles some
+// boilerplate for testing with promises.
+function promise_test(func, name, properties) {
+  properties = properties || {};
+  var test = async_test(name, properties);
+  Promise.resolve(test.step(func, test, test))
+    .then(function() { test.done(); })
+    .catch(test.step_func(function(value) {
+        throw value;
+      }));
+}
+
+// Returns a promise that fulfills after the provided |promise| is fulfilled.
+// The |test| succeeds only if |promise| rejects with an exception matching
+// |code|. Accepted values for |code| follow those accepted for assert_throws().
+// The optional |description| describes the test being performed.
+// E.g.:
+//   assert_promise_rejects(
+//       new Promise(...), // something that should throw an exception.
+//       'NotFoundError',
+//       'Should throw NotFoundError.');
+//
+//   assert_promise_rejects(
+//       new Promise(...),
+//       new TypeError(),
+//       'Should throw TypeError');
+function assert_promise_rejects(promise, code, description) {
+  return promise.then(
+    function() {
+      throw 'assert_promise_rejects: ' + description + ' Promise did not reject.';
+    },
+    function(e) {
+      if (code !== undefined) {
+        assert_throws(code, function() { throw e; }, description);
+      }
+    });
+}

third_party/WebKit/LayoutTests/http/tests/serviceworker/ServiceWorkerGlobalScope/resources/close-worker.js

 importScripts('../../resources/interfaces.js');
-importScripts('../../resources/worker-test-harness.js');
+importScripts('../../resources/worker-testharness.js');
 
 test(function() {
   assert_throws({name: 'InvalidAccessError'}, function() {

third_party/WebKit/LayoutTests/http/tests/serviceworker/chromium/resources/xhr-is-not-exposed-to-service-workers.js

-importScripts('../../resources/worker-test-harness.js');
+importScripts('../../resources/worker-testharness.js');
 
 test(function() {
     assert_false(

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/cache-storage-keys-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 
 var test_cache_list =
   ['', 'example', 'Another cache name', 'A', 'a', 'ex ample'];

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/cache-storage-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 
 promise_test(function(t) {
     var cache_name = 'cache-storage/foo';

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fail-on-fetch-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
 
 this.addEventListener('fetch', function(event) {
     event.respondWith(new Response('ERROR'));

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-cache-override-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 importScripts('test-helpers.js');
 
 promise_test(function() {

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
 importScripts('test-helpers.js');
 
 async_test(function(t) {

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/headers-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
 
 test(function() {
     function size(headers) {

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/interfaces-worker.js

 importScripts('interfaces.js');
-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
 
 test(function() {
     var EVENT_HANDLER = 'object';

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/request-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 importScripts('test-helpers.js');
 
 var URL = 'https://www.example.com/test.html';

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/response-content-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
+importScripts('../../resources/testharness-helpers.js');
 
 promise_test(function() {
     var response = new Response('test string');

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/response-worker.js

-importScripts('worker-test-harness.js');
+importScripts('worker-testharness.js');
 
 function size(headers) {
   var count = 0;

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/worker-test-harness.js → third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/worker-testharness.js

@@ -72,41 +72,3 @@ importScripts('/resources/testharness.js');
       }
     });
 })();
-
-// 'promise_test' is a new kind of testharness test that handles some
-// boilerplate for testing with promises.
-function promise_test(func, name, properties) {
-  properties = properties || {};
-  var test = async_test(name, properties);
-  Promise.resolve(test.step(func, test, test))
-    .then(function() { test.done(); })
-    .catch(test.step_func(function(value) {
-        throw value;
-      }));
-}
-
-// Returns a promise that fulfills after the provided |promise| is fulfilled.
-// The |test| succeeds only if |promise| rejects with an exception matching
-// |code|. Accepted values for |code| follow those accepted for assert_throws().
-// The optional |description| describes the test being performed.
-// E.g.:
-//   assert_promise_rejects(
-//       new Promise(...), // something that should throw an exception.
-//       'NotFoundError',
-//       'Should throw NotFoundError.');
-//
-//   assert_promise_rejects(
-//       new Promise(...),
-//       new TypeError(),
-//       'Should throw TypeError');
-function assert_promise_rejects(promise, code, description) {
-  return promise.then(
-    function() {
-      throw 'assert_promise_rejects: ' + description + ' Promise did not throw.';
-    },
-    function(e) {
-      if (code !== undefined) {
-        assert_throws(code, function() { throw e; }, description);
-      }
-    });
-}