| Index: third_party/WebKit/LayoutTests/imported/wpt/IndexedDB/idbobjectstore_createIndex14-exception_order.htm
|
| diff --git a/third_party/WebKit/LayoutTests/imported/wpt/IndexedDB/idbobjectstore_createIndex14-exception_order.htm b/third_party/WebKit/LayoutTests/imported/wpt/IndexedDB/idbobjectstore_createIndex14-exception_order.htm
|
| index 75d805a6d8bb48325feeaa3dd5078eabbd80a655..a0ec288cb3808d7e32e3100bb9c537d30895bbd5 100644
|
| --- a/third_party/WebKit/LayoutTests/imported/wpt/IndexedDB/idbobjectstore_createIndex14-exception_order.htm
|
| +++ b/third_party/WebKit/LayoutTests/imported/wpt/IndexedDB/idbobjectstore_createIndex14-exception_order.htm
|
| @@ -4,31 +4,10 @@
|
| <link rel="help" href="http://w3c.github.io/IndexedDB/#dom-idbobjectstore-createindex">
|
| <script src="/resources/testharness.js"></script>
|
| <script src="/resources/testharnessreport.js"></script>
|
| +<script src="support.js"></script>
|
| <script>
|
|
|
| -function indexeddb_test(description, upgrade_func, open_func = null) {
|
| - async_test(function(t) {
|
| - var dbname = document.location + "-" + t.name;
|
| - var del = indexedDB.deleteDatabase(dbname);
|
| - del.onerror = t.unreached_func("deleteDatabase should succeed");
|
| - var open = indexedDB.open(dbname, 1);
|
| - open.onerror = t.unreached_func("open should succeed");
|
| - open.onupgradeneeded = t.step_func(function() {
|
| - var db = open.result;
|
| - var tx = open.transaction;
|
| - upgrade_func(t, db, tx);
|
| - });
|
| - if (open_func) {
|
| - open.onsuccess = t.step_func(function() {
|
| - var db = open.result;
|
| - open_func(t, db);
|
| - });
|
| - }
|
| - }, description);
|
| -}
|
| -
|
| indexeddb_test(
|
| - "InvalidStateError(Incorrect mode) vs. TransactionInactiveError",
|
| function(t, db, txn) {
|
| var store = db.createObjectStore("s");
|
| },
|
| @@ -41,12 +20,12 @@ indexeddb_test(
|
| }, "Mode check should precede state check of the transaction");
|
| t.done();
|
| };
|
| - }
|
| + },
|
| + "InvalidStateError(Incorrect mode) vs. TransactionInactiveError"
|
| );
|
|
|
| var gDeletedObjectStore;
|
| indexeddb_test(
|
| - "InvalidStateError(Deleted ObjectStore) vs. TransactionInactiveError",
|
| function(t, db, txn) {
|
| gDeletedObjectStore = db.createObjectStore("s");
|
| db.deleteObjectStore("s");
|
| @@ -56,11 +35,12 @@ indexeddb_test(
|
| }, "Deletion check should precede transaction-state check");
|
| t.done();
|
| };
|
| - }
|
| + },
|
| + null,
|
| + "InvalidStateError(Deleted ObjectStore) vs. TransactionInactiveError"
|
| );
|
|
|
| indexeddb_test(
|
| - "TransactionInactiveError vs. ConstraintError",
|
| function(t, db, txn) {
|
| var store = db.createObjectStore("s");
|
| store.createIndex("index", "foo");
|
| @@ -70,11 +50,12 @@ indexeddb_test(
|
| }, "Transaction-state check should precede index name check");
|
| t.done();
|
| };
|
| - }
|
| + },
|
| + null,
|
| + "TransactionInactiveError vs. ConstraintError"
|
| );
|
|
|
| indexeddb_test(
|
| - "ConstraintError vs. SyntaxError",
|
| function(t, db) {
|
| var store = db.createObjectStore("s");
|
| store.createIndex("index", "foo");
|
| @@ -86,11 +67,12 @@ indexeddb_test(
|
| ["invalid key path 1", "invalid key path 2"]);
|
| }, "Index name check should precede syntax check of the key path");
|
| t.done();
|
| - }
|
| + },
|
| + null,
|
| + "ConstraintError vs. SyntaxError"
|
| );
|
|
|
| indexeddb_test(
|
| - "SyntaxError vs. InvalidAccessError",
|
| function(t, db) {
|
| var store = db.createObjectStore("s");
|
| assert_throws("SyntaxError", function() {
|
| @@ -99,7 +81,9 @@ indexeddb_test(
|
| { multiEntry: true });
|
| }, "Syntax check should precede multiEntry check of the key path");
|
| t.done();
|
| - }
|
| + },
|
| + null,
|
| + "SyntaxError vs. InvalidAccessError"
|
| );
|
|
|
| </script>
|
|
|