[ServiceWorker] Tests for Cache

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

Index: LayoutTests/http/tests/resources/testharness-helpers.js
diff --git a/LayoutTests/http/tests/resources/testharness-helpers.js b/LayoutTests/http/tests/resources/testharness-helpers.js
index 5eee188edc58662d4b69f3db41f5792cb41c0d92..e3965ab4204b96d28437eb7647aeb1be492aab23 100644
--- a/LayoutTests/http/tests/resources/testharness-helpers.js
+++ b/LayoutTests/http/tests/resources/testharness-helpers.js
@@ -5,8 +5,26 @@
  * 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.
+// A testharness test that simplifies testing with promises.
+//
+// * The |func| argument should be a reference to a function that optionally
+//   takes a test object as an argument and returns a Promise (or really any
+//   thenable object).
+//
+// * Resolution of the promise completes the test. A rejection causes the test
+//   to fail. The test harness waits for the promise to resolve.
+//
+// * Assertions can be made at any point in the promise handlers. Assertions
+//   only need to be wrapped in test.step()s if the promise chain contains

[jsbell, 2014/10/20 18:20:40]

test.step_func() ?

[asanka, 2014/10/22 22:35:31]

Done.

+//   rejection handlers.
+//
+// E.g.:
+//   promise_test(function(t) {
+//       return method_that_returns_a_promise()
+//         .then(function(result) {
+//             assert_equals(result, expected_result, "Should be expected.");
+//           });
+//     }, 'Promise based test');
 function promise_test(func, name, properties) {
   properties = properties || {};
   var test = async_test(name, properties);
@@ -21,6 +39,7 @@ function promise_test(func, name, properties) {
 // 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.
@@ -42,3 +61,90 @@ function assert_promise_rejects(promise, code, description) {
       }
     });
 }
+
+// Asserts that two objects |actual| and |expected| are weakly equal under the
+// following definition:
+//
+// |a| and |b| are weakly equal if any of the following are true:
+//   1. If |a| is not an 'object', and |a| === |b|.
+//   2. If |a| is an 'object', and all of the following are true:
+//     2.1 |a.p| is weakly equal to |b.p| for all own properties |p| of |a|.
+//     2.2 Every own property of |b| is an own property of |a|.
+//
+// This is a replacement for the the version of assert_object_equals() in
+// testharness.js. The latter doesn't handle own properties correctly. I.e. if
+// |a.p| is not an own property, it still requires that |b.p| be an own
+// property.
+//
+// Note that |actual| must not contain cyclic references.
+self.assert_object_equals = function(actual, expected, description) {
+  var object_stack = [];
+
+  function _is_equal(actual, expected, prefix) {
+    if (typeof actual !== 'object') {
+      assert_equals(actual, expected, prefix);
+      return;
+    }
+    assert_true(typeof expected === 'object', prefix);
+    assert_equals(object_stack.indexOf(actual), -1,
+                  prefix + ' must not contain cyclic references.');
+
+    object_stack.push(actual);
+
+    Object.getOwnPropertyNames(expected).forEach(function(property) {
+        assert_own_property(actual, property, prefix);
+        _is_equal(actual[property], expected[property],
+                  prefix + '.' + property);
+      });
+    Object.getOwnPropertyNames(actual).forEach(function(property) {
+        assert_own_property(expected, property, prefix);
+      });
+
+    object_stack.pop();
+  }
+
+  _is_equal(actual, expected,
+            (description ? description + ' :' : '') + '[object]');
+};
+
+// Equivalent to assert_in_array, but uses a weaker equivalence relation
+// (assert_object_equals) than '==='.
+function assert_object_in_array(actual, expected_array, description) {
+  assert_true(expected_array.some(function(element) {
+      try {
+        assert_object_equals(actual, element);
+        return true;
+      } catch (e) {
+        return false;
+      }
+    }), description);
+}
+
+// Assert that the two arrays |actual| and |expected| contain the same set of
+// elements as determined by assert_object_equals. The order is not significant.
+//
+// |expected| is assumed to not contain any duplicates as determined by
+// assert_object_equals().
+function assert_array_equivalent(actual, expected, description) {
+  assert_true(Array.isArray(actual), description);
+  assert_equals(actual.length, expected.length, description);
+  expected.forEach(function(expected_element) {
+      // assert_in_array treats the first argument as being 'actual', and the
+      // second as being 'expected array'. We are switching them around becaus
+      // we want to be resilient against the |actual| array containing
+      // duplicates.
+      assert_object_in_array(expected_element, actual, description);
+    });
+}
+
+// Asserts that two arrays |actual| and |expected| contain the same set of
+// elements as determined by assert_object_equals. The corresponding elements
+// must occupy corresponding indices in their respective arrays.
+function assert_array_objects_equals(actual, expected, description) {
+  assert_true(Array.isArray(actual), description);
+  assert_equals(actual.length, expected.length, description);
+  actual.forEach(function(value, index) {
+      assert_object_equals(value, expected[index],
+                           description + ' : object[' + index + ']');
+    });
+}